Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2012-04-23 16:09:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2012-02-16 16:12:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2012-04-23 16:10:24.000000000 +0200 @@ -1,0 +2,33 @@ +Thu Apr 12 10:53:55 CEST 2012 - [email protected] + +- No longer require Ghostscript but only "Recommends: ghostscript" + because the Ghostscript device "cups" is needed by several CUPS + filters (in particular the "rasterto..." filters) but those + filters are not used on all systems (e.g. on a print server + with only "raw" queues) so that a weak Recommends fits better. + Furthermore this avoids a build dependency cycle between the + main-packages cups and ghostscript. +- No longer require /usr/bin/pdftops but only a "Recommends" + because the CUPS filter /usr/lib/cups/filter/pdftops + (which calls /usr/bin/pdftops) is not used on all systems + (e.g. on a print server with only "raw" queues) so that + a weak Recommends fits better. + +------------------------------------------------------------------- +Tue Apr 10 16:25:24 CEST 2012 - [email protected] + +- In cups.spec only "Requires: ghostscript" but no longer require + ghostscript-fonts-std in cups.spec because in ghostscript.spec + there is already "Requires: ghostscript-fonts-std" + (related to openSUSE Bugzilla bnc#735824). +- In cups.spec remove the Obsoletes/Provides cups-SUSE-ppds-dat + because cups-SUSE-ppds-dat.rpm existed only up to SLE10 + but it does no longer exist since 11.1/SLE11 + and CUPS 1.5.x is not provided for SLE10. +- Use traditional bash scriptlets for post/postun with + an explicite "exit 0" line at the end to be fail safe and + therefore also "PreReq: /sbin/ldconfig" explicitly for the + cups-libs sub-package, see the "Shared_libraries" section in + http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.cHKls1/_old 2012-04-23 16:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.cHKls1/_new 2012-04-23 16:10:25.000000000 +0200 @@ -40,13 +40,16 @@ %{?systemd_requires} %define have_systemd 1 %endif -PreReq: textutils, fileutils, sh-utils, /usr/sbin/groupadd PreReq: %insserv_prereq PreReq: %fillup_prereq # sysvinit(syslog) is first provided in openSUSE:Factory (i.e. openSUSE 11.4): %if 0%{?suse_version} > 1130 PreReq: sysvinit(syslog) %endif +PreReq: /usr/sbin/groupadd +PreReq: fileutils +PreReq: sh-utils +PreReq: textutils Url: http://www.cups.org/ Summary: The Common UNIX Printing System License: GPL-2.0+ ; LGPL-2.1+ @@ -68,24 +71,30 @@ # and all required packages are provided on the same repository: Requires: cups-libs = %{version}-%{release} Requires: cups-client = %{version} -# The Ghostscript device "cups" is needed by several CUPS filters -# (in particular the "rasterto..." filters) which justifies a RPM Requires: -Requires: ghostscript_any, ghostscript-fonts-std -# Inherited RPM Requires from the past but I ([email protected]) do not know an exact reason for it: +# Inherited RPM Requires from the past but I ([email protected]) do not know the reason for it: Requires: util-linux +# The Ghostscript device "cups" is needed by several CUPS filters +# (in particular the "rasterto..." filters) which might justify a RPM Requires. +# But a RPM requirement for ghostscript would cause a build dependency cycle because +# cups Requires ghostscript which BuildRequires cups-devel which Requires cups-libs +# and cups-libs is a sub-package of cups so that there is an implicit build dependency +# cycle between the main-packages cups and ghostscript. +# Furthermore Ghostscript is not needed on a system where those CUPS filters are not used +# (e.g. on a print server with only "raw" queues) so that a weak Recommends fits better: +Recommends: ghostscript # The CUPS filter /usr/lib/cups/filter/pdftops is a wrapper which calls /usr/bin/pdftops -# (see the configure setting '--with-pdftops=/usr/bin/pdftops') so that this is required: -Requires: /usr/bin/pdftops +# (see the configure setting '--with-pdftops=/usr/bin/pdftops') so that this +# might justify a RPM Requires but this CUPS filter is not used on all systems +# (e.g. on a print server with only "raw" queues) so that a weak Recommends is sufficient: +Recommends: /usr/bin/pdftops # Our Source105 PSLEVEL1.PPD.bz2 and Source106 PSLEVEL2.PPD.bz2 need foomatic-rip # but this does not justify a RPM Requires so that a weak Recommends is sufficient: Recommends: foomatic-filters # Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on # or which may listen on the same port (e.g. cups-lpd versus traditional lpd on port 515): -Conflicts: plp lprold lprng -# Our cups-SUSE-ppds-dat.rpm exist at least from SLE9 up to SLE10 -# but it does no longer exist at least since 11.1/SLE11: -Obsoletes: cups-SUSE-ppds-dat -Provides: cups-SUSE-ppds-dat +Conflicts: lprng +Conflicts: lprold +Conflicts: plp # Patch0...Patch9 is for patches from upstream: # Source10...Source99 is for sources from Novell/openSUSE which are intended for upstream: # Patch10...Patch99 is for patches from Novell/openSUSE which are intended for upstream: @@ -139,6 +148,8 @@ Summary: Libraries for CUPS License: GPL-2.0+ ; LGPL-2.1+ Group: Hardware/Printing +# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: +PreReq: /sbin/ldconfig # https://bugzilla.novell.com/show_bug.cgi?id=437293 %ifarch ppc64 Obsoletes: cups-libs-64bit @@ -159,7 +170,9 @@ License: GPL-2.0+ Group: Hardware/Printing # Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on: -Conflicts: plp lprold lprng +Conflicts: lprng +Conflicts: lprold +Conflicts: plp # Require the exact matching version-release of the cups-libs sub-package because # non-matching CUPS libraries may let CUPS software crash (e.g. segfault) # because all CUPS software is built from the one same CUPS source tar ball @@ -262,7 +275,6 @@ libtoolize --force aclocal autoconf - export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -O2 -fstack-protector" export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -DLDAP_DEPRECATED" export CXX=g++ @@ -275,7 +287,7 @@ # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments # so that the new default could be used as is but upstream may accept # cups-1.4.3-default-webcontent-path.patch in general but change its default -# so that with-docdir is explicitely set here to be future proof: +# so that with-docdir is explicitly set here to be future proof: ./configure \ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ @@ -300,7 +312,6 @@ --with-systemdsystemunitdir=%{_unitdir} \ %endif --prefix=/ - make %{?_smp_mflags} CXX=g++ %install @@ -373,18 +384,21 @@ %if 0%{?have_systemd} %service_add_pre cups.service cups.socket cups.path %endif +exit 0 %post %{fillup_and_insserv -ny cups cups} %if 0%{?have_systemd} %service_add_post cups.service cups.socket cups.path %endif +exit 0 %preun %stop_on_removal cups %if 0%{?have_systemd} %service_del_preun cups.service cups.socket cups.path %endif +exit 0 %postun %restart_on_update cups @@ -392,14 +406,19 @@ %if 0%{?have_systemd} %service_del_postun cups.service cups.socket cups.path %endif +exit 0 -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +exit 0 + +%postun libs +/sbin/ldconfig +exit 0 %files -# The files sections list all mandatory files explicitely one by one. -# In particular all executables are listed explicitely. +# The files sections list all mandatory files explicitly one by one. +# In particular all executables are listed explicitly. # This avoids that CUPS' configure magic might silently # not build and install an executable when whatever condition # for configure's automated tests is not fulfilled in the build system. @@ -409,7 +428,7 @@ # installed in the build system regardless of an explicite # configure setting '--with-pdftops=/usr/bin/pdftops', # see also http://www.cups.org/str.php?L3278). -# When all mandatory files are explicitely listed, +# When all mandatory files are explicitly listed, # the build fails intentionally if a mandatory file was not built # which ensures that already existing correctly built binary RPMs # are not overwritten by broken RPMs where mandatory files are missing. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
