Remove pstoraster stuff from dist files.

Add libcupsimage.a to cups.list.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@2001 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups.list.in b/cups.list.in
index 055e12c09161d80a77926f1d83020e83a2e8f44e..d65bd6490692f7bc2cda00dc767063f6595f4c11 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.13.2.1 2001/12/26 16:52:05 mike Exp $"
+# "$Id: cups.list.in,v 1.13.2.2 2001/12/29 21:44:30 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -29,14 +29,18 @@
 %vendor Easy Software Products
 %license LICENSE.txt
 %readme README.txt
-%version 1.1.13
-%provides cups
+%version 1.3.0a1
+%description The Common UNIX Printing System provides a portable printing
+%description layer for UNIX® operating systems.  It has been developed by
+%description Easy Software Products to promote a standard printing solution
+%description for all UNIX vendors and users.  CUPS provides the System V and
+%description Berkeley command-line interfaces. 
 %provides cupsys
 %provides cups-devel
 %provides cupsys-devel
 %provides cups-pstoraster
 %provides libcups1
-%provides libcups.so.2
+%provides libcups.so.3
 
 #
 # GNU variables...
@@ -123,7 +127,6 @@ d 0555 root sys $SERVERBIN/daemon -
 f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
 f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
 d 0555 root sys $SERVERBIN/filter -
-f 0555 root sys $SERVERBIN/filter/pstoraster pstoraster/pstoraster
 f 0555 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
 f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
 f 0555 root sys $SERVERBIN/filter/pstops filter/pstops
@@ -169,18 +172,18 @@ l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
 
 # DSOs
 %system hpux
-f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
-l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
-f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2
-l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
+f 0555 root sys $LIBDIR/libcups.sl.3 cups/libcups.sl.3
+l 0555 root sys $LIBDIR/libcups.sl libcups.sl.3
+f 0555 root sys $LIBDIR/libcupsimage.sl.3 filter/libcupsimage.sl.3
+l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.3
 %system aix
 f 0555 root sys $LIBDIR/libcups_s.a cups/libcups_s.a
 f 0555 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a
 %system !hpux !aix
-f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2
-l 0555 root sys $LIBDIR/libcups.so libcups.so.2
-f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2
-l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
+f 0555 root sys $LIBDIR/libcups.so.3 cups/libcups.so.3
+l 0555 root sys $LIBDIR/libcups.so libcups.so.3
+f 0555 root sys $LIBDIR/libcupsimage.so.3 filter/libcupsimage.so.3
+l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.3
 %system all
 
 # Directories
@@ -235,13 +238,6 @@ f 0444 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
 f 0444 root sys $DATADIR/data/psglyphs data/psglyphs
 f 0444 root sys $DATADIR/data/testprint.ps data/testprint.ps
 
-d 0555 root sys $DATADIR/fonts -
-f 0444 root sys $DATADIR/fonts fonts/*
-
-d 0555 root sys $DATADIR/pstoraster -
-f 0444 root sys $DATADIR/pstoraster/Fontmap pstoraster/Fontmap
-f 0444 root sys $DATADIR/pstoraster pstoraster/gs*.ps
-
 d 0555 root sys $DATADIR/model -
 f 0444 root sys $DATADIR/model ppd/*.ppd
 
@@ -279,6 +275,7 @@ f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
 f 0444 root sys $INCLUDEDIR/cups/raster.h filter/raster.h
 
 f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
+f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
 
 # Documentation files
 d 0555 root sys $DOCDIR -
@@ -369,5 +366,5 @@ f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.13.2.1 2001/12/26 16:52:05 mike Exp $".
+# End of "$Id: cups.list.in,v 1.13.2.2 2001/12/29 21:44:30 mike Exp $".
 #

diff --git a/cups.spec b/cups.spec
index 5d321ee6b9f9ca2e8c83f0ecefaca90e2bef42bf..fbf4090d5f0b37fa9b8bc21c271f8406f76b3c34 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec,v 1.30.2.2 2001/12/26 16:52:05 mike Exp $"
+# "$Id: cups.spec,v 1.30.2.3 2001/12/29 21:44:30 mike Exp $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -26,7 +26,7 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2
+Version: 1.2.0a1
 Release: 0
 Copyright: GPL
 Group: System Environment/Daemons
@@ -38,38 +38,22 @@ Vendor: Easy Software Products
 # Use buildroot so as not to disturb the version already installed
 BuildRoot: /var/tmp/%{name}-root
 
-# Dependencies...
-Conflicts: lpr, LPRng
-Provides: libcups.so.2
-Provides: libcupsimage.so.2
-Provides: cups
-
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 Provides: libcups1
 
-%package pstoraster
-Summary: Common Unix Printing System - PostScript RIP
-Group: System Environment/Daemons
-Provides: pstoraster
-
 %description
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. It has been developed by Easy Software Products 
-to promote a standard printing solution for all UNIX vendors and users. 
-CUPS provides the System V and Berkeley command-line interfaces. 
+The Common UNIX Printing System provides a portable printing layer for
+UNIX® operating systems.  It has been developed by Easy Software Products
+to promote a standard printing solution for all UNIX vendors and users.
+CUPS provides the System V and Berkeley command-line interfaces.
 
 %description devel
 The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the development package for creating
+UNIX® operating systems.  This is the development package for creating
 additional printer drivers and other CUPS services.
 
-%description devel
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the PostScript RIP package for
-supporting non-PostScript printer drivers.
-
 %prep
 %setup
 
@@ -164,14 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/cups/cgi-bin
 /usr/lib/cups/cgi-bin/*
 %dir /usr/lib/cups/filter
-/usr/lib/cups/filter/hpgltops
-/usr/lib/cups/filter/imagetops
-/usr/lib/cups/filter/imagetoraster
-/usr/lib/cups/filter/pdftops
-/usr/lib/cups/filter/pstops
-/usr/lib/cups/filter/rastertoepson
-/usr/lib/cups/filter/rastertohp
-/usr/lib/cups/filter/texttops
+/usr/lib/cups/filter/*
 /usr/sbin/*
 %dir /usr/share/cups
 %dir /usr/share/cups/banners
@@ -213,14 +190,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/man/man3
 /usr/share/man/man1/*
 
-%files pstoraster
-%dir /usr/lib/cups/filter
-/usr/lib/cups/filter/pstoraster
-%dir /usr/share/cups/fonts
-/usr/share/cups/fonts/*
-%dir /usr/share/cups/pstoraster
-/usr/share/cups/pstoraster/*
-
 #
-# End of "$Id: cups.spec,v 1.30.2.2 2001/12/26 16:52:05 mike Exp $".
+# End of "$Id: cups.spec,v 1.30.2.3 2001/12/29 21:44:30 mike Exp $".
 #