Changed srpm generation to get a distrubution neutral srpm.

castor.spec.in.head

@@ -13,12 +13,20 @@
 %define compile_server @COMPILE_SERVER@
 %endif
 
+# Neutral packaging (for srpm)
+#-----------------------------
+%if 0%{?neutralpackage:1} > 0
+%define mydist %{nil}
+%else
+%define mydist %{?dist}
+%endif
+
 # General settings
 #-----------------
 Summary: Cern Advanced mass STORage
 Name: %{name}
 Version: %{castorVersion}
-Release: %{castorRelease}%{?dist}
+Release: %{castorRelease}%{mydist}
 Source: %{name}-%{castorVersion}-%{castorRelease}.tar.gz
 URL: http://cern.ch/castor
 License: http://cern.ch/castor/DIST/CONDITIONS

cmake/UseRPMTools.cmake

@@ -161,7 +161,7 @@ rm -rf build_tree
       ADD_CUSTOM_TARGET(${RPMNAME}_srpm
 	COMMAND cpack -G TGZ --config CPackSourceConfig.cmake
 	COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${RPM_ROOTDIR}/SOURCES
-	COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bs --define=\"_topdir ${RPM_ROOTDIR}\"  --define '_source_filedigest_algorithm md5' --define '_binary_filedigest_algorithm md5' --nodeps --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME} 
+	COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bs --define=\"_topdir ${RPM_ROOTDIR}\"  --define '_source_filedigest_algorithm md5' --define '_binary_filedigest_algorithm md5' --define 'neutralpackage 1' --nodeps --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME} 
 	)
       
       ADD_CUSTOM_TARGET(${RPMNAME}_rpm