Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.547.2.6
diff -u -2 -0 -r1.547.2.6 ChangeLog
--- xc/ChangeLog	26 Nov 2004 10:02:41 -0000	1.547.2.6
+++ xc/ChangeLog	26 Nov 2004 11:24:17 -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 7:
+        (Hopefully) final round of RPM build fixes.
+
+2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/config/cf/xprint_host.def
         * xc/programs/Xserver/miext/damage/damagestr.h
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923):
         Build fixes for Solaris 8.
 
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/list_files_not_used_by_xp.ksh
         * xc/doc/Imakefile
         * xc/doc/man/Imakefile
         * xc/doc/man/general/Imakefile
         * xc/doc/man/general/Xprint.html
         * xc/doc/man/general/Xprint.man
         * xc/doc/man/general/Xprint.sgml
         * xc/programs/Xserver/Xprint/Imakefile
         * xc/programs/Xserver/Xprint/Xprint.html
         * xc/programs/Xserver/Xprint/Xprint.man
         * xc/programs/Xserver/Xprint/Xprint.sgml
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923)
         and Bugzilla #811 (https://freedesktop.org/bugzilla/show_bug.cgi?id=811):
         Fixing build bustage caused by first patch of bug 811.
Index: xc/packager/rpm/xprint.spec
===================================================================
RCS file: /cvs/xorg/xc/packager/rpm/Attic/xprint.spec,v
retrieving revision 1.1.4.3
diff -u -2 -0 -r1.1.4.3 xprint.spec
--- xc/packager/rpm/xprint.spec	26 Nov 2004 08:50:33 -0000	1.1.4.3
+++ xc/packager/rpm/xprint.spec	26 Nov 2004 11:24:23 -0000
@@ -49,47 +49,47 @@
     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
 rm -f xprint/run_xprint_from_tarball.sh
 rm -f xprint/README
 mv xprint/install/* .
 rmdir xprint/install
 rmdir xprint
 
 # remove obsolete README and SECURITY extension config "SecurityPolicy"
-rm -f ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xserver/README
-rm -f ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xserver/SecurityPolicy
+rm -f ${RPM_BUILD_ROOT}/etc/X11/xserver/xserver/README
+rm -f ${RPM_BUILD_ROOT}/etc/X11/xserver/xserver/SecurityPolicy
 
 mv ${RPM_BUILD_ROOT}/usr/X11R6/bin/Xprt ${RPM_BUILD_ROOT}/usr/X11R6/bin/Xprt_xprint_org
 
-if [ ! -f ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xserver/C/print/models/PSdefault/model-config ] ; then
-    echo "# ERROR: ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xserver/C/print/models/PSdefault/model-config missing."
+if [ ! -f ${RPM_BUILD_ROOT}/etc/X11/xserver/C/print/models/PSdefault/model-config ] ; then
+    echo "# ERROR: ${RPM_BUILD_ROOT}/etc/X11/xserver/C/print/models/PSdefault/model-config missing."
     exit 1
 fi
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
 if [ -x /usr/lib/lsb/install_initd ] ; then
     # (hopefully) LSB-compliant distribution
     /usr/lib/lsb/install_initd /etc/init.d/xprint
 else
     if [ -f /etc/redhat-release ] ; then
         if [ $1 = 1 ]; then
             /sbin/chkconfig --add xprint
         fi
     else
         # SuSE(-like) ?
         if [ -d /etc/rc.d/rc2.d/ ] ; then
             echo "# Detected SuSE(-like) distribution"
             echo "# Creating links..."
@@ -168,40 +168,40 @@
                 rm -f /etc/rc.d/rc2.d/S61xprint
                 rm -f /etc/rc.d/rc3.d/S61xprint
                 rm -f /etc/rc.d/rc4.d/S61xprint
                 rm -f /etc/rc.d/rc5.d/S61xprint
                 rm -f /etc/rc.d/rc6.d/K61xprint
             else
                 echo "# Unsupported version of Linux, cannot remove links for /etc/init.d/."
                 exit 1
             fi
         fi
     fi
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
     /sbin/service xprint condrestart >/dev/null 2>&1
 fi
 
 %files 
 %defattr(-,root,root) 
-%doc src/xprint_main/xc/doc/hardcopy/XPRINT/Xprint_FAQ.html
-%doc src/xprint_main/xc/doc/hardcopy/XPRINT/Xprint_FAQ.txt
-%doc src/xprint_main/xc/doc/hardcopy/XPRINT/dtprint_fspec.ps
+%doc doc/hardcopy/XPRINT/Xprint_FAQ.html
+%doc doc/hardcopy/XPRINT/Xprint_FAQ.txt
+%doc doc/hardcopy/XPRINT/dtprint_fspec.ps
 /etc/init.d/*
 /etc/profile.d/*
 /etc/X11/Xsession.d/92xprint-xpserverlist.sh
 /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
 /usr/X11R6/bin/Xprt_xprint_org
 /usr/X11R6/bin/xplsprinters
 /usr/X11R6/bin/xprehashprinterlist
 /usr/X11R6/bin/xphelloworld
 /usr/X11R6/bin/xpxthelloworld
 /usr/X11R6/bin/xpsimplehelloworld
 /usr/X11R6/bin/pclcomp
 /usr/X11R6/bin/xdpr
 /usr/X11R6/bin/xpr
-/usr/X11R6/lib/X11/xserver/*
+/etc/X11/xserver/*
 /usr/X11R6/man/man1/*
 /usr/X11R6/man/man7/*
 # EOF.