Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.547.2.2 diff -u -2 -0 -r1.547.2.2 ChangeLog --- xc/ChangeLog 26 Nov 2004 04:35:16 -0000 1.547.2.2 +++ xc/ChangeLog 26 Nov 2004 07:41:05 -0000 @@ -1,22 +1,30 @@ 2004-11-25 Roland Mainz * 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 + * 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 * xc/Imakefile * xc/config/cf/host.def * xc/config/cf/xprint_host.def * xc/doc/Imakefile * xc/doc/hardcopy/Imakefile * xc/fonts/Imakefile * xc/lib/Imakefile * xc/packager/Imakefile * xc/packager/mozilla_xpi/Imakefile * xc/packager/mozilla_xpi/K98xprint_xpi.sh * xc/packager/mozilla_xpi/S98xprint_xpi.sh * xc/packager/mozilla_xpi/install.js * xc/packager/mozilla_xpi/make_mozilla_xpi.sh * xc/packager/rpm/Imakefile Index: xc/list_files_not_used_by_xp.ksh =================================================================== RCS file: /cvs/xorg/xc/Attic/list_files_not_used_by_xp.ksh,v retrieving revision 1.1.2.1 diff -u -2 -0 -r1.1.2.1 list_files_not_used_by_xp.ksh --- xc/list_files_not_used_by_xp.ksh 26 Nov 2004 04:35:16 -0000 1.1.2.1 +++ xc/list_files_not_used_by_xp.ksh 26 Nov 2004 07:41:06 -0000 @@ -1,70 +1,80 @@ #!/bin/ksh # List files not used by the Xprint standalone config list_files() { ( # extras find \ - xc/extras/fontconfig -type f + xc/extras/fontconfig \ + xc/extras/drm \ + xc/extras/fonts \ + -type f # libs find \ xc/lib/FS \ xc/lib/GLU \ xc/lib/GLw \ xc/lib/ICE \ xc/lib/SM \ xc/lib/XTrap \ xc/lib/Xaw \ xc/lib/Xaw6 \ xc/lib/Xaw7 \ xc/lib/Xcomposite \ xc/lib/Xcursor \ xc/lib/Xfontcache \ xc/lib/Xft \ xc/lib/Xft1 \ xc/lib/Xi \ xc/lib/Xinerama \ xc/lib/Xmu \ xc/lib/Xmuu \ xc/lib/Xrandr \ xc/lib/Xrender \ xc/lib/Xss \ xc/lib/Xt \ xc/lib/Xtst \ xc/lib/Xv \ xc/lib/XvMC \ xc/lib/Xxf86dga \ xc/lib/Xxf86misc \ xc/lib/Xxf86rush \ xc/lib/Xxf86vm \ xc/lib/apple \ xc/lib/dmx \ xc/lib/dps \ xc/lib/dpstk \ xc/lib/fontconfig \ xc/lib/oldX \ xc/lib/psres \ xc/lib/xkbfile \ - xc/lib/xkbui -type f + xc/lib/xkbui \ + -type f + + find \ + xc/lib/X11 \ + -type f | + egrep -v "/Quarks.c|/Xresource.h|/Xresinternal.h|/Xlibint.h|/Xlib.h" | + egrep -v "/XrmI.h|/Xlcint.h|/Xrm.c" # programs find \ xc/programs/appres \ xc/programs/bdftopcf \ xc/programs/beforelight \ xc/programs/bitmap \ xc/programs/cxpm \ xc/programs/dpsexec \ xc/programs/dpsinfo \ xc/programs/editres \ xc/programs/fc-cache \ xc/programs/fc-lang \ xc/programs/fc-list \ xc/programs/fonttosfnt \ xc/programs/fslsfonts \ xc/programs/fstobdf \ xc/programs/glxinfo \ xc/programs/iceauth \ xc/programs/ico \ @@ -124,85 +134,108 @@ xc/programs/xman \ xc/programs/xmessage \ xc/programs/xmh \ xc/programs/xmodmap \ xc/programs/xmore \ xc/programs/xprop \ xc/programs/xrandr \ xc/programs/xrdb \ xc/programs/xrefresh \ xc/programs/xrx \ xc/programs/xset \ xc/programs/xsetmode \ xc/programs/xsetpointer \ xc/programs/xsetroot \ xc/programs/xsm \ xc/programs/xstdcmap \ xc/programs/xterm \ xc/programs/xtrap \ xc/programs/xvidtune \ xc/programs/xvinfo \ - xc/programs/xwininfo -type f + xc/programs/xwininfo \ + -type f + + # Xserver + find \ + xc/programs/Xserver/hw/darwin \ + xc/programs/Xserver/hw/dmx \ + xc/programs/Xserver/hw/kdrive \ + xc/programs/Xserver/hw/sun \ + xc/programs/Xserver/hw/sunLynx \ + xc/programs/Xserver/hw/vfb \ + xc/programs/Xserver/hw/xfree86 \ + xc/programs/Xserver/hw/xnest \ + xc/programs/Xserver/hw/xwin \ + -type f | + egrep -v "/xf86_ansic.h|common/compiler.h" | + egrep -v "/xf86_libc.h|/xf86Version.h|/xf86Date.h" # fonts find \ xc/fonts/bdf \ xc/fonts/scaled -type f # doc find \ xc/doc/misc \ xc/doc/specs \ xc/doc/man \ xc/doc/hardcopy/BDF \ xc/doc/hardcopy/CTEXT \ xc/doc/hardcopy/FSProtocol \ xc/doc/hardcopy/ICCCM \ xc/doc/hardcopy/ICE \ xc/doc/hardcopy/RX \ xc/doc/hardcopy/SM \ xc/doc/hardcopy/X11 \ xc/doc/hardcopy/XDMCP \ xc/doc/hardcopy/XIM \ xc/doc/hardcopy/XKB \ xc/doc/hardcopy/XLFD \ xc/doc/hardcopy/XProtocol \ xc/doc/hardcopy/Xaw \ xc/doc/hardcopy/Xext \ xc/doc/hardcopy/Xi \ xc/doc/hardcopy/Xmu \ xc/doc/hardcopy/Xserver \ xc/doc/hardcopy/Xt \ xc/doc/hardcopy/Xv \ xc/doc/hardcopy/i18n \ xc/doc/hardcopy/man \ xc/doc/hardcopy/rstart \ xc/doc/hardcopy/saver \ xc/doc/hardcopy/xfs \ xc/doc/hardcopy/xterm \ xc/doc/hardcopy/xtrans -type f + + # misc + echo "xc/README" + echo "xc/README.crypto" + echo "xc/BUILD" + echo "xc/LABEL" + echo "xc/RELNOTES" ) | egrep -v "/CVS/|_xp_disabled$" } case "$1" in 'list') list_files ;; 'rename') list_files | while read i ; do echo "# $i" ; - echo mv "$i" "${i}_xp_disabled" ; + mv "$i" "${i}_xp_disabled" ; done ;; 'delete') list_files | while read i ; do echo "# $i" ; - echo rm "$i" + rm "$i" done ;; *) echo "${0}: Usage: ${0} [list] [rename] [delete]" ;; esac # EOF. Index: xc/packager/rpm/xprint.spec =================================================================== RCS file: /cvs/xorg/xc/packager/rpm/Attic/xprint.spec,v retrieving revision 1.1.4.1 diff -u -2 -0 -r1.1.4.1 xprint.spec --- xc/packager/rpm/xprint.spec 26 Nov 2004 03:29:51 -0000 1.1.4.1 +++ xc/packager/rpm/xprint.spec 26 Nov 2004 07:41:10 -0000 @@ -1,50 +1,53 @@ %define name xprint %define version 20041125trunk %define release 1.0.000 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 -Patch0: xprint_rpmpackage.patch %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 -%patch0 -p0 %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/ # ${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 Index: xc/packager/rpm/xprint_rpmpackage.patch =================================================================== RCS file: xc/packager/rpm/xprint_rpmpackage.patch diff -N xc/packager/rpm/xprint_rpmpackage.patch --- xc/packager/rpm/xprint_rpmpackage.patch 26 Nov 2004 03:29:51 -0000 1.1.4.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Index: src/xprint_main/xc/config/cf/site.def -=================================================================== -RCS file: /cvs/xprint/src/xprint_main/xc/config/cf/site.def,v -retrieving revision 1.23 -diff -u -r1.23 site.def ---- src/xprint_main/xc/config/cf/site.def 27 Jan 2003 00:58:05 -0000 1.23 -+++ src/xprint_main/xc/config/cf/site.def 17 Nov 2003 23:44:55 -0000 -@@ -1,4 +1,6 @@ - -+#define BuildXprintRPMPackage YES -+ - /* Include xprint.org defaults */ - #include "xprint_site.def" -