diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-03-09 19:54:23 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-03-09 19:54:23 +0000 |
| commit | 6bc69cd448c899e6052935e5aab090e784f248bc (patch) | |
| tree | 02310a1a6a3764cd8889012c19b217e3751c7aeb /cpp | |
| parent | fixes for binary distributions (diff) | |
| download | ice-6bc69cd448c899e6052935e5aab090e784f248bc.tar.bz2 ice-6bc69cd448c899e6052935e5aab090e784f248bc.tar.xz ice-6bc69cd448c899e6052935e5aab090e784f248bc.zip | |
fixes to RPMs
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/RPMTools.py | 4 | ||||
| -rwxr-xr-x | cpp/newmakebindist.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index 125ed1f7795..1db34113082 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -54,6 +54,7 @@ class Package: ofile.write("Source2: http://www.zeroc.com/downloads/IcePy-%{version}.tar.gz\n") ofile.write("Source3: http://www.zeroc.com/downloads/IceCS-%{version}.tar.gz\n") ofile.write("Source4: http://www.zeroc.com/downloads/Ice-%{version}-demos.tar.gz\n") + ofile.write("Source5: http://www.zeroc.com/downloads/README.Linux-RPM\n") ofile.write("\n") if installDir <> "": ofile.write("BuildRoot: " + installDir + "\n") @@ -293,8 +294,6 @@ fileLists = [ ("dir", "share/doc/Ice-%version%/demo"), ("xdir", "share/doc/Ice-%version%/config"), ("file", "share/doc/Ice-%version%/config/Make.rules"), - ("file", "share/doc/Ice-%version%/config/makedepend.py"), - ("file", "share/doc/Ice-%version%/config/makeprops.py"), ("file", "share/doc/Ice-%version%/config/Make.rules.Linux"), ]), Subpackage("dotnet", @@ -556,6 +555,7 @@ 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 gmake NOGAC=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT/usr install +cp $RPM_SOURCE_DIR/README.Linux-RPM $RPM_BUILD_ROOT/usr/README """) def writeTransformCommands(ofile, version): diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index d6493e3b5c0..eafd9909193 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -696,6 +696,7 @@ def main(): if getPlatform() == 'linux' and not cvsMode: os.system('cp ' + installDir + '/Ice-' + version + '-demos.tar.gz /usr/src/redhat/SOURCES') os.system('cp ' + sources + '/Ice*.tar.gz /usr/src/redhat/SOURCES') + shutil.copy(installFiles + '/unix/README.Linux-RPM', '/usr/src/redhat/SOURCES/README.Linux-RPM') shutil.copy(installFiles + '/unix/README.Linux-RPM', installDir + '/Ice-' + version + '/README') RPMTools.createRPMSFromBinaries(buildDir, installDir, version, soVersion) |