Merged R3_1_branch after 3.1.1 release

1 files changed, 17 insertions, 10 deletions

diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py
index 369d1bfaef3..bbfc26a349e 100644
--- a/cpp/RPMTools.py
+++ b/cpp/RPMTools.py
@@ -71,6 +71,8 @@ class Package:
 	ofile.write('Source2: http://www.zeroc.com/download/Ice/' + minorVer + '/IcePy-%{version}.tar.gz\n')
 	ofile.write('Source3: http://www.zeroc.com/download/Ice/' + minorVer + '/IceCS-%{version}.tar.gz\n')
 	ofile.write('Source4: http://www.zeroc.com/download/Ice/' + minorVer + '/README.Linux-RPM\n')
+        ofile.write('Source4: http://www.zeroc.com/download/Ice/' + minorVer + '/SOURCES\n')
+        ofile.write('Source4: http://www.zeroc.com/download/Ice/' + minorVer + '/THIRD_PARTY_LICENSE\n')
 	ofile.write('Source5: http://www.zeroc.com/download/Ice/' + minorVer + '/ice.ini\n')
 	ofile.write('Source6: http://www.zeroc.com/download/Ice/' + minorVer + '/configure.gz\n')
 	ofile.write('Source7: http://www.zeroc.com/download/Ice/' + minorVer + '/php-5.1.4.tar.bz2\n')
@@ -301,7 +303,9 @@ transforms = [ ('file', 'ice.ini', 'etc/php.d/ice.ini'),
                ('dir', 'doc', 'usr/share/doc/Ice-%version%/doc'),
                ('file', 'README', 'usr/share/doc/Ice-%version%/README'),
                ('file', 'ICE_LICENSE', 'usr/share/doc/Ice-%version%/ICE_LICENSE'),
-               ('file', 'LICENSE', 'usr/share/doc/Ice-%version%/LICENSE')
+               ('file', 'LICENSE', 'usr/share/doc/Ice-%version%/LICENSE'),
+               ('file', 'THIRD_PARTY_LICENSE', 'usr/share/doc/Ice-%version%/THIRD_PARTY_LICENSE'),
+               ('file', 'SOURCES', 'usr/share/doc/Ice-%version%/SOURCES')
                ]
 
 fileLists = [
@@ -315,6 +319,8 @@ fileLists = [
              ('doc', 'share/doc/Ice-%version%/ICE_LICENSE'),
              ('doc', 'share/doc/Ice-%version%/LICENSE'),
              ('doc', 'share/doc/Ice-%version%/README'),
+             ('doc', 'share/doc/Ice-%version%/SOURCES'),
+             ('doc', 'share/doc/Ice-%version%/THIRD_PARTY_LICENSE'),
              ('exe', 'bin/dumpdb'),
              ('exe', 'bin/transformdb'),
              ('exe', 'bin/glacier2router'),
@@ -328,7 +334,7 @@ fileLists = [
              ('exe', 'bin/slice2docbook'), 
              ('exe', 'bin/icegridadmin'), 
              ('exe', 'bin/icegridnode'), 
-             ('exe', 'bin/icegridregistry'), 
+             ('exe', 'bin/icegridregistry'),
              ('lib', '%{icelibdir}/libFreeze.so.VERSION'),
              ('lib', '%{icelibdir}/libGlacier2.so.VERSION'),
              ('lib', '%{icelibdir}/libIceBox.so.VERSION'),
@@ -341,7 +347,8 @@ fileLists = [
              ('lib', '%{icelibdir}/libIceXML.so.VERSION'),
              ('lib', '%{icelibdir}/libSlice.so.VERSION'),
              ('lib', '%{icelibdir}/libIceGrid.so.VERSION'),
-	     ('dir', 'lib/Ice-%version%/IceGridGUI.jar'),
+             ('xdir', 'lib/Ice-%version%'),
+	     ('file', 'lib/Ice-%version%/IceGridGUI.jar'),
              ('dir', 'share/slice'),
              ('dir', 'share/doc/Ice-%version%/doc'),
 	     ('xdir', 'share/doc/Ice-%version%/config'),
@@ -349,6 +356,7 @@ fileLists = [
 	     ('exe', 'share/doc/Ice-%version%/config/convertssl.py'),
              ('exe', 'share/doc/Ice-%version%/config/upgradeicegrid.py'),
              ('file', 'share/doc/Ice-%version%/config/icegrid-slice.3.0.ice.gz'),
+             ('xdir', 'share/doc/Ice-%version%/config/ca'),
 	     ('exe', 'share/doc/Ice-%version%/config/ca/cautil.py'),
 	     ('exe', 'share/doc/Ice-%version%/config/ca/ImportKey.class'),
 	     ('exe', 'share/doc/Ice-%version%/config/ca/import.py'),
@@ -439,8 +447,9 @@ fileLists = [
 		     iceDescription,
 		     '',
 		     [ ('xdir', 'lib/Ice-%version%'),
-		     ('dir', 'lib/Ice-%version%/Ice.jar'),
-		     ('dir', 'lib/Ice-%version%/java5/Ice.jar')
+		     ('file', 'lib/Ice-%version%/Ice.jar'),
+                     ('xdir', 'lib/Ice-%version%/java5'),
+		     ('file', 'lib/Ice-%version%/java5/Ice.jar')
 		     ]),
     NoarchSubpackage('dotnet',
                      'ice = %version%, mono-core >= 1.1.13',
@@ -603,7 +612,7 @@ 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}
+cd $RPM_BUILD_DIR/Ice-%{version}/src
 gmake OPTIMIZE=yes RPM_BUILD_ROOT=$RPM_BUILD_ROOT embedded_runpath_prefix=""
 cd $RPM_BUILD_DIR/IcePy-%{version}
 gmake  OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT embedded_runpath_prefix=""
@@ -618,10 +627,6 @@ echo "EXTRA_CXXFLAGS= -DCOMPILE_DL_ICE" > Makefile
 cat Makefile.tmp >> Makefile
 escbr=`echo $RPM_BUILD_DIR | sed -e 's/\//\\\\\\\\\//g'`
 sed -i -e "s/^ICE_SHARED_LIBADD.*$/ICE_SHARED_LIBADD = -L$escbr\/Ice-%{version}\/lib -lIce -lSlice -lIceUtil/" Makefile
-if test "$RPM_ARCH" == "x86_64"; 
-then 
-    sed -i -e 's/Ice-%{version}\/lib/Ice-%{version}\/lib64/g' Makefile ;  
-fi
 gmake
 """)
 
@@ -650,6 +655,8 @@ 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 install
 cp $RPM_SOURCE_DIR/README.Linux-RPM $RPM_BUILD_ROOT/README
+cp $RPM_SOURCE_DIR/THIRD_PARTY_LICENSE $RPM_BUILD_ROOT/THIRD_PARTY_LICENSE
+cp $RPM_SOURCE_DIR/SOURCES $RPM_BUILD_ROOT/SOURCES
 cp $RPM_SOURCE_DIR/ice.ini $RPM_BUILD_ROOT/ice.ini
 if test ! -d $RPM_BUILD_ROOT/%{icelibdir};
 then