summaryrefslogtreecommitdiff
path: root/cpp/RPMTools.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2006-07-07 18:54:55 +0000
committerBrent Eagles <brent@zeroc.com>2006-07-07 18:54:55 +0000
commitc84c1d17d4439f476bcaf8d986d23e8e7073968c (patch)
treea136f5959c33a1c6c0b56fd3a76f8cd154b9e977 /cpp/RPMTools.py
parentmoving PHP instructions from vc80 to vc60 (diff)
downloadice-c84c1d17d4439f476bcaf8d986d23e8e7073968c.tar.bz2
ice-c84c1d17d4439f476bcaf8d986d23e8e7073968c.tar.xz
ice-c84c1d17d4439f476bcaf8d986d23e8e7073968c.zip
fixing typo in HP component selection and readding missing slice directory
in RPMs
Diffstat (limited to 'cpp/RPMTools.py')
-rw-r--r--cpp/RPMTools.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py
index 36f817360a8..be5ca39057e 100644
--- a/cpp/RPMTools.py
+++ b/cpp/RPMTools.py
@@ -350,6 +350,7 @@ fileLists = [
('lib', '%{icelibdir}/libSlice.so.VERSION'),
('lib', '%{icelibdir}/libIceGrid.so.VERSION'),
('dir', 'lib/Ice-%version%/IceGridGUI.jar'),
+ ('dir', 'share/slice'),
('dir', 'share/doc/Ice-%version%/doc'),
('xdir', 'share/doc/Ice-%version%/certs'),
('file', 'share/doc/Ice-%version%/certs/cacert.pem'),
@@ -682,9 +683,9 @@ gzip -dc $RPM_SOURCE_DIR/configure.gz > $RPM_BUILD_DIR/php-5.1.4/configure
def writeBuildCommands(ofile, version):
ofile.write("""
cd $RPM_BUILD_DIR/Ice-%{version}
-gmake OPTIMIZE=yes RPM_BUILD_ROOT=$RPM_BUILD_ROOT
+gmake OPTIMIZE=yes RPM_BUILD_ROOT=$RPM_BUILD_ROOT ADD_LIBDIR_TO_RPATH=no
cd $RPM_BUILD_DIR/IcePy-%{version}
-gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT
+gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT ADD_LIBDIR_TO_RPATH=no
cd $RPM_BUILD_DIR/IceCS-%{version}
export PATH=$RPM_BUILD_DIR/Ice-%{version}/bin:$PATH
export LD_LIBRARY_PATH=$RPM_BUILD_DIR/Ice-%{version}/lib:$LD_LIBRARY_PATH