From Christian Holm:

some last fixes for rmp generation.


git-svn-id: http://root.cern.ch/svn/root/trunk@14157 27541ba8-7e3a-0410-8455-c3a389f83636

build/package/debian/rules

@@ -268,7 +268,7 @@ clean:  $(TEMPLATES:%.in=%)
 pkglists:
 	-rm -rf debian/*.files 	debian/*.install	
 	-rm -rf debian/libroot*$(SOVERS).*
-	build/package/lib/makelists.sh debian \
+	build/package/lib/makelists.sh debian debian/tmp \
 		$(VERSION) $(PREFIX) $(SYSCONFDIR) $(PKGDOCDIR)
 	@for i in debian/libroot* ; do \
 	  if test -d $$i ; then continue ; fi ; \

build/package/lib/makebuilddepend.sh

@@ -38,7 +38,7 @@ if test "x$1" = "xrpm" ; then
 	    *pythia5)	echo -n ", pythia5-devel"			;;
 	    *pythia6)	echo -n ", pythia6-devel"			;;
 	    *python)	echo -n ", python-devel >= 2.1"			;;
-	    *qt)	echo -n ", qt-devel >= 3.3.3 or qt3-devel or libqt3-devel"			;;
+	    *qt)	echo -n ", qt-devel >= 3.3.3"			;;
 	    *quadp)							;;
 	    *roofit)							;;
 	    *ruby)	echo -n ", ruby-devel >= 1.8"			;;

build/package/lib/makelist

@@ -61,21 +61,21 @@ endif # $(LIB) = $(DEV)
 liblist:
 	@for f in $(PKGLIBS)  ; do echo $$f ; done >> $(OUT)/$(LIB).install
 ifneq ($(LIB),$(DEV))
-	@(cd debian/tmp/usr/lib/root && \
+	@(cd $(BUILD)/$(PREFIX)/lib/root && \
 	   for i in $(ALLLIBS) ; do \
 	      b=`basename $$i` ; \
 	      ln -fs $(SOVER)/$$b . ; \
 	      ln -fs $(SOVER)/$$b.$(SOVER) .; done)
 else 
 ifeq ($(DIRS), cint)
-	@(cd debian/tmp/usr/lib/root && \
+	@(cd $(BUILD)/$(PREFIX)/lib/root && \
 	   for i in $(ALLLIBS) ; do \
 	      b=`basename $$i` ; \
 	      ln -fs $(SOVER)/$$b . ; \
 	      ln -fs $(SOVER)/$$b.$(SOVER) .; done)
 else 
 ifneq ($(DIRS), xrootd) 
-	@(cd debian/tmp/usr/lib/root && \
+	@(cd $(BUILD)/$(PREFIX)/lib/root && \
 	   for i in $(ALLLIBS) ; do \
 	      b=`basename $$i` ; \
 	      ln -fs $(SOVER)/$$b.$(SOVER) .; done)

build/package/lib/makelists.sh

 #!/bin/sh
 
 outdir=$1  	; shift
+build=$1        ; shift
 version=$1 	; shift
 prefix=$1  	; shift
 sysconfdir=$1	; shift
@@ -73,7 +74,7 @@ for d in * ; do
     # echo "Making list for $d (dev=$dev lib=$lib bin=$bin extra=$extra)"
     echo "Making list for $d"
     build/package/lib/makelist DIRS=$d DEV=$dev LIB=$lib BIN=$bin  \
-	VERSION=$version PREFIX=$prefix OUT=$outdir $extra  \
+	VERSION=$version PREFIX=$prefix OUT=$outdir BUILD=$build $extra  \
 	--no-print-directory all
 done
 

build/package/rpm/spec.in

@@ -27,7 +27,7 @@ Source:       ftp://root.cern.ch/root/root_v%{ver}.source.tar.gz
 Group:        Applications/Physics
 BuildRoot:    /tmp/rootrpm
 Summary:      Numerical data analysis framework (OO)
-BuildRequires: XFree86-devel@builddepends@
+BuildRequires: xorg-x11-devel@builddepends@
 Requires:     @pkglist@
 #
 # Over all description - not used, but required
@@ -114,17 +114,14 @@ for i in proofserv xrdgsiproxy xrdpwdadmin ; do
     mv ${RPM_BUILD_ROOT}%{_prefix}/bin/$i 		\
 	 ${RPM_BUILD_ROOT}%{_prefix}/bin/$i.bin 
     sed -e 's,@prefix@,%{_prefix},g'			\
-	-e 's,@libvers@,$(SOVERS),g'			\
-	< build/package/common/$$i.in			\
+	-e 's,@libvers@,${sovers},g'			\
+	< build/package/common/$i.in			\
 	> ${RPM_BUILD_ROOT}%{_prefix}/bin/$i
     chmod 755 ${RPM_BUILD_ROOT}%{_prefix}/bin/$i 
   fi
 done 
 
 
-#sed 's|Unix\(.*\)DynamicPath:\( *\)\.:/usr/lib/root|Unix\1DynamicPath:\2.:/usr/lib/root/$sover|' < debian/tmp/etc/root/system.rootrc > tmp.systemrc 
-#	mv tmp.systemrc debian/tmp/etc/root/system.rootrc
-
 # Prepare SYSV init scripts 
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rc.d/init.d
 sed -e "s,/usr/local,%_prefix,g" \
@@ -137,7 +134,8 @@ touch ${RPM_BUILD_ROOT}/%{_prefix}/share/root/proof/log/proof.log
 
 # Make package lists 
 mkdir -p rpm
-build/package/lib/makelists.sh rpm %ver %_prefix %_sysconfdir %_defaultdocdir
+build/package/lib/makelists.sh rpm ${RPM_BUILD_ROOT} \
+    %ver %_prefix %_sysconfdir %_defaultdocdir
 echo "%attr(0755, root, root) %{_sysconfdir}/rc.d/init.d/rootd" \
     >> rpm/root-rootd.install