Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.547.2.3
diff -u -2 -0 -r1.547.2.3 ChangeLog
--- xc/ChangeLog	26 Nov 2004 07:44:11 -0000	1.547.2.3
+++ xc/ChangeLog	26 Nov 2004 08:45:16 -0000
@@ -1,21 +1,27 @@
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/packager/rpm/xprint.spec
+        Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923):
+        Testing standalone package system for Xprint server, part 4:
+        Fixing RPM build bustage.
+
+2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/list_files_not_used_by_xp.ksh
         * xc/packager/rpm/xprint.spec
         * xc/packager/rpm/xprint_rpmpackage.patch
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923):
         Testing standalone package system for Xprint server, part 3:
         Misc fixes (more file stripping and RPM adjustments)
 
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/list_files_not_used_by_xp.ksh
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923):
         Testing standalone package system for Xprint server, part 2:
         Adding file stripper script to create a stripped source tarball on
         demand.
 
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/Imakefile
         * xc/config/cf/host.def 
         * xc/config/cf/xprint_host.def 
         * xc/doc/Imakefile
         * xc/doc/hardcopy/Imakefile
Index: xc/packager/rpm/xprint.spec
===================================================================
RCS file: /cvs/xorg/xc/packager/rpm/Attic/xprint.spec,v
retrieving revision 1.1.4.2
diff -u -2 -0 -r1.1.4.2 xprint.spec
--- xc/packager/rpm/xprint.spec	26 Nov 2004 07:44:11 -0000	1.1.4.2
+++ xc/packager/rpm/xprint.spec	26 Nov 2004 08:45:21 -0000
@@ -5,59 +5,57 @@
 Summary:	Xprint
 Name:		%{name}
 Version: 	%{version}
 Release: 	%{release}
 Copyright: 	MIT
 Group: 		X11/Applications
 URL: 		http://xprint.mozdev.org/
 Source: 	xprint-%{version}.tar.gz
 #BuildPrereq:    XFree86-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 Prefix:		%{_prefix}
 Packager:       Roland Mainz <roland.mainz@nrubsig.org>
 
 %description
 Xprint provides an advanched print API for X11-based
 (incl. CDE, Xt/Motif-, Xt/LessTif-, Xt/Athena-, Qt- and
 Mozilla-based) applications.
 
 %prep
 
-%setup -q -n xprint
+%setup -q -n xc
 
 %build
-cd src/xprint_main/xc/
-
 rm -f config/cf/host.def
 echo '#define BuildXprintRPMPackage YES' >config/cf/host.def
 echo '#include "xprint_host.def"'        >>config/cf/host.def
 
 make World
 
 %install
 if [ -d ${RPM_BUILD_ROOT} ] ; then
     rm -rf ${RPM_BUILD_ROOT}
 fi
 mkdir -p ${RPM_BUILD_ROOT}
 
 # Create and test tarball of files which should be in the final RPM...
-cd src/xprint_main/xc/packager/
+cd packager/
 # ${XPDESTTARFILE} is used by "make make_xprint_tarball"
 XPDESTTARFILE="/tmp/xprint_rpm_`date +%y%m%d%H%M%S`.tar.gz"
 export XPDESTTARFILE
 make make_xprint_tarball
 
 # Check if the temp. tarball was being build
 if [ ! -f "${XPDESTTARFILE}" ] ; then
     echo "# temp. tarball missing."
     exit 1
 fi
 
 # ... and then unpack the temp. tarball in the ${RPM_BUILD_ROOT} dir
 cd ${RPM_BUILD_ROOT}
 gunzip -c ${XPDESTTARFILE} | tar -xvf -
 rm -f ${XPDESTTARFILE}
 
 # the tarball generation script puts the files which should be installed
 # in the "install/" subdir. we strip the tarball README and the
 # tarball-specific "run_xprint_from_tarball.sh" and then move all stuff
 # in install/* to $PWD