Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2017-11-02 10:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups" Thu Nov 2 10:23:22 2017 rev:142 rq:537070 version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2017-09-25 13:53:05.320252504 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2017-11-02 10:23:22.522335628 +0100 @@ -1,0 +2,38 @@ +Fri Oct 20 14:01:23 CEST 2017 - jsm...@suse.de + +- Use again the baselibs.conf from Fri Oct 13 11:11:10 UTC 2017 + that got broken by the change on Wed Oct 18 06:11:10 UTC 2017. +- Version upgrade to 2.2.5: + CUPS 2.2.5 is a general bug fix release. + For details see https://github.com/apple/cups/releases +- Version upgrade to 2.2.4: + CUPS 2.2.4 is a general bug fix release. + For details see https://github.com/apple/cups/releases +- Removed + 0001-Update-cupsEnumDests-implementation-to-return-early-if-all.patch + 0002-Save-work-on-Avahi-code.patch + 0003-Avahi-fixes-for-cupsEnumDests.patch + because since CUPS 2.2.4 it is fixed in the upstream code + via https://github.com/apple/cups/pull/4989 more precisely via + https://github.com/apple/cups/commit/a2187a63425a3d6c05de1e1cbf8c26fd39a1aced + https://github.com/apple/cups/commit/657c5b5f91e6d5120c4ad7b118cf9098dd27f03d + https://github.com/apple/cups/commit/3fae3b337df0be1a766857be741173d8a9915da7 + +------------------------------------------------------------------- +Wed Oct 18 06:11:10 UTC 2017 - opens...@dstoecker.de + +- Fix typo in requires + +------------------------------------------------------------------- +Fri Oct 13 11:11:10 UTC 2017 - jeng...@inai.de + +- Implement shared library packaging guideline [boo#862112] +- Update package descriptions. + +------------------------------------------------------------------- +Sat Sep 30 08:52:42 UTC 2017 - jeng...@inai.de + +- Remove redundant Requires(pre) line — the use of %post -p + already implies it. + +------------------------------------------------------------------- Old: ---- 0001-Update-cupsEnumDests-implementation-to-return-early-if-all.patch 0002-Save-work-on-Avahi-code.patch 0003-Avahi-fixes-for-cupsEnumDests.patch cups-2.2.3-source.tar.gz cups-2.2.3-source.tar.gz.sig New: ---- cups-2.2.5-source.tar.gz cups-2.2.5-source.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.QUpA12/_old 2017-11-02 10:23:23.862286790 +0100 +++ /var/tmp/diff_new_pack.QUpA12/_new 2017-11-02 10:23:23.866286644 +0100 @@ -19,18 +19,18 @@ # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d } Name: cups -Version: 2.2.3 +Version: 2.2.5 Release: 0 Summary: The Common UNIX Printing System License: GPL-2.0 and LGPL-2.1 Group: Hardware/Printing Url: http://www.cups.org/ # To download it use e.g. -# wget --no-check-certificate -O cups-2.2.3-source.tar.gz https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz -Source0: https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz +# wget --no-check-certificate -O cups-2.2.5-source.tar.gz https://github.com/apple/cups/releases/download/v2.2.5/cups-2.2.5-source.tar.gz +Source0: https://github.com/apple/cups/releases/download/v2.2.5/cups-2.2.5-source.tar.gz # To download it use e.g. -# wget --no-check-certificate -O cups-2.2.3-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz.sig -Source1: https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz.sig +# wget --no-check-certificate -O cups-2.2.5-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.2.5/cups-2.2.5-source.tar.gz.sig +Source1: https://github.com/apple/cups/releases/download/v2.2.5/cups-2.2.5-source.tar.gz.sig Source2: cups.keyring Source102: Postscript.ppd.gz Source105: Postscript-level1.ppd.gz @@ -49,12 +49,6 @@ Patch11: cups-2.1.0-default-webcontent-path.patch # Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: Patch12: cups-2.1.0-cups-systemd-socket.patch -# Patch13 0001-Update-cupsEnumDests-implementation-to-return-early-if-all.patch bsc#955432 -- React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -Patch13: 0001-Update-cupsEnumDests-implementation-to-return-early-if-all.patch -# Patch14 0002-Save-work-on-Avahi-code.patch bsc#955432 -- React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -Patch14: 0002-Save-work-on-Avahi-code.patch -# Patch15 0003-Avahi-fixes-for-cupsEnumDests.patch bsc#955432 -- React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -Patch15: 0003-Avahi-fixes-for-cupsEnumDests.patch # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: Patch100: cups-pam.diff @@ -104,7 +98,7 @@ # all are built simulaneously from the same cups source package # and all required packages are provided on the same repository: Requires: cups-client = %{version}-%{release} -Requires: cups-libs = %{version}-%{release} +Requires: cups-config = %{version}-%{release} Requires(pre): %{_sbindir}/groupadd Requires(pre): coreutils # Since CUPS 1.6 all non-Mac filters are dropped @@ -115,12 +109,12 @@ # 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 +# cups Requires ghostscript which BuildRequires cups-devel which Requires libcups2 +# and libcups2 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 +# Furthermore, Ghostscript is not needed on a system where those CUPS filters are not used # (e.g. on client systems in the network where the filtering hapens on a CUPS server -# or on a CUPS server with only "raw" queues) so that a weak Recommends fits better: +# or on a CUPS server with only "raw" queues), so that a weak Recommends fits better: Recommends: ghostscript BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -132,76 +126,123 @@ Conflicts: plp %description -The Common UNIX Printing System (CUPS) is the -standards-based, open source printing system. +CUPS is a modular printing system which allows a computer to act as a +print server. A computer running CUPS is a host that can accept print +jobs from client computers, process them, and send them to the +appropriate printer. + +CUPS consists of a print spooler and scheduler, a filter system that +converts the print data to a format that the printer will understand, +and a backend system that sends this data to the print device. CUPS +uses the Internet Printing Protocol (IPP) as the basis for managing +print jobs and queues. It also provides the traditional command line +interfaces for the System V and Berkeley print systems, and provides +support for the Berkeley print system's Line Printer Daemon protocol +and limited support for the server message block (SMB) protocol. -See http://www.cups.org +CUPS comes with a built-in web-based interface. -Starting with cups 1.6 there were major changes as the filters -were split to cups-filters package developed independently and -default standard was changed. +%package -n libcups2 +Summary: HTTP/IPP communication and printer queue and job library +License: GPL-2.0 and LGPL-2.1 +Group: System/Libraries +Requires: cups-config +Obsoletes: cups-libs < %{version}-%{release} +Provides: cups-libs = %{version}-%{release} + +%description -n libcups2 +The CUPS library contains all of the core HTTP and IPP communications +code as well as convenience functions for queuing print jobs, getting +printer information, accessing resources via HTTP and IPP, and +manipulating PPD files. The scheduler and all commands, filters, and +backends use this library. + +%package -n libcupscgi1 +Summary: CUPS web interface support function library +License: GPL-2.0 and LGPL-2.1 +Group: System/Libraries + +%description -n libcupscgi1 +The CUPS CGI library provides all of the web interface support +functions. It is used by the CGI programs to provide the CUPS web +interface. + +%package -n libcupsimage2 +Summary: CUPS library for working with large images +License: GPL-2.0 and LGPL-2.1 +Group: System/Libraries + +%description -n libcupsimage2 +The CUPS imaging library provides functions for managing large +images, doing colorspace conversion and color management, scaling +images for printing, and managing raster page streams. It is used by +the CUPS image file filters, the PostScript RIP, and all raster +printers drivers. + +%package -n libcupsmime1 +Summary: MIME database file routines for CUPS +License: GPL-2.0 and LGPL-2.1 +Group: System/Libraries -Cups 1.6 and newer also no longer supports automatic remote printers or -implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network -browsing". This is now handled by cups-browsed service. +%description -n libcupsmime1 +The CUPS MIME library provides file typing and conversion functions +and is used by the scheduler and cupsfilter(8) command to auto-type +and convert print files to a printable format. -%package libs -Summary: Libraries for CUPS +%package -n libcupsppdc1 +Summary: CUPS PostScript Printer Description (PPD) file compiler library +License: GPL-2.0 and LGPL-2.1 +Group: System/Libraries + +%description -n libcupsppdc1 +The CUPS PPD compiler library provides access to driver information +files and is used by the PPD compiler tools as well as the +cups-driverd(8) helper program to generate PPD files and message +catalogs for localization. + +%package config +Summary: CUPS library configuration files License: GPL-2.0 and LGPL-2.1 Group: Hardware/Printing -# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: -Requires(pre): /sbin/ldconfig %if 0%{?suse_version} >= 1330 Requires(pre): user(lp) Requires(pre): group(lp) %endif -%description libs -The Common UNIX Printing System (CUPS) is the -standards-based, open source printing system. - -See http://www.cups.org - -Starting with cups 1.6 there were major changes as the filters -were split to cups-filters package developed independently and -default standard was changed. - -Cups 1.6 and newer also no longer supports automatic remote printers or -implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network -browsing". This is now handled by cups-browsed service. +%description config +CUPS is a modular printing system which allows a computer to act as a +print server. + +This subpackage contains some basic configuration files for its +operation. %package client Summary: CUPS Client Programs License: GPL-2.0 Group: Hardware/Printing -# Require the exact matching version-release of the cups-libs sub-package because +# Require the exact matching version-release of the libcups* sub-packages 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 +# because all CUPS software is built from the one same CUPS source tarball # so that there are CUPS-internal dependencies via CUPS private API calls # (which do not happen for third-party software which uses only the CUPS public API). -# The exact matching version-release of the cups-libs sub-package is available +# The exact matching version-release of the libcups* sub-packages is available # on the same package repository where the cups package is because -# all are built simulaneously from the same cups source package +# all are built simultaneously from the same cups source package # and all required packages are provided on the same repository: -Requires: cups-libs = %{version}-%{release} +Requires: libcups2 = %{version}-%{release} # Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on: Conflicts: lprng Conflicts: lprold Conflicts: plp %description client -The Common UNIX Printing System (CUPS) is the -standards-based, open source printing system. - -See http://www.cups.org +CUPS is a modular printing system which allows a computer to act as a +print server. A computer running CUPS is a host that can accept print +jobs from client computers, process them, and send them to the +appropriate printer. -Starting with cups 1.6 there were major changes as the filters -were split to cups-filters package developed independently and -default standard was changed. - -Cups 1.6 and newer also no longer supports automatic remote printers or -implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network -browsing". This is now handled by cups-browsed service. +This package contains the traditional command line interfaces for the +System V and Berkeley print systems. %package devel Summary: Development Environment for CUPS @@ -212,22 +253,19 @@ # for building third-party software which uses only the CUPS public API # there are no CUPS-internal dependencies via CUPS private API calls # (the latter would require the exact matching cups-libs version-release): -Requires: cups-libs = %{version} Requires: glibc-devel +Requires: libcups2 = %{version} +Requires: libcupscgi1 = %{version} +Requires: libcupsimage2 = %{version} +Requires: libcupsmime1 = %{version} +Requires: libcupsppdc1 = %{version} %description devel -The Common UNIX Printing System (CUPS) is the -standards-based, open source printing system. +CUPS is a modular printing system which allows a computer to act as a +print server. -See http://www.cups.org - -Starting with cups 1.6 there were major changes as the filters -were split to cups-filters package developed independently and -default standard was changed. - -Cups 1.6 and newer also no longer supports automatic remote printers or -implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network -browsing". This is now handled by cups-browsed service. +This subpackage contains the header files for developing applications +that want to make use of libcups for adding print support. %package ddk Summary: CUPS Driver Development Kit @@ -242,24 +280,11 @@ Obsoletes: cupsddk < %{version} %description ddk -The Common UNIX Printing System (CUPS) is the -standards-based, open source printing system. - -See http://www.cups.org - The CUPS Driver Development Kit (DDK) provides a suite of standard drivers, a PPD file compiler, and other utilities that can be used to develop printer drivers for CUPS. -Starting with cups 1.6 there were major changes as the filters -were split to cups-filters package developed independently and -default standard was changed. - -Cups 1.6 and newer also no longer supports automatic remote printers or -implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network -browsing". This is now handled by cups-browsed service. - %prep %setup -q # Patch0...Patch9 is for patches from upstream: @@ -273,12 +298,6 @@ %patch11 -b default-webcontent-path.orig # Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: #patch12 -b cups-systemd-socket.orig -# Patch13 0001-Update-cupsEnumDests-implementation-to-return-early-if-all.patch React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -#patch13 -p1 -# Patch14 0002-Save-work-on-Avahi-code.patch React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -#patch14 -p1 -# Patch15 0003-Avahi-fixes-for-cupsEnumDests.patch React properly to avahi's ALL_FOR_NOW signal to reduce unneeded delay -#patch15 -p1 # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: %patch100 -b cups-pam.orig @@ -324,8 +343,6 @@ # --enable-debug - avoids stripping of binaries # --enable-relro - force relro sections in binaries/libs %configure \ - --enable-debug \ - --enable-relro \ --enable-option-checking \ --with-docdir=%{_datadir}/cups/webcontent \ --with-cups-user=lp \ @@ -338,7 +355,6 @@ --enable-libusb \ --disable-static \ --without-rcdir \ - --enable-dbus \ --with-cachedir=%{_localstatedir}/cache/cups \ --with-rundir=/run/cups \ --with-domainsocket=/run/cups/cups.sock \ @@ -392,9 +408,10 @@ install -d -m755 %{buildroot}%{_localstatedir}/cache/cups # Add conf/pam.suse regarding support for PAM (see Patch100: cups-pam.diff): install -m 644 -D conf/pam.suse %{buildroot}%{_sysconfdir}/pam.d/cups -# Add missing usual documentation: +# Add missing usual documentation. +# (since CUPS-2.2.5 it is no longer CREDITS.txt INSTALL.txt README.txt but CREDITS.md INSTALL.md README.md): install -d -m755 %{buildroot}/%{_defaultdocdir}/cups -for f in CHANGES*.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt +for f in CHANGES*.txt CREDITS.md INSTALL.md LICENSE.txt README.md do install -m 644 "$f" %{buildroot}%{_defaultdocdir}/cups/ done # Add generic PostScript printer PPDs: @@ -451,7 +468,7 @@ %fdupes -s %{buildroot}/%{_datadir}/cups/templates %pre -p /bin/bash -getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin 2>/dev/null +getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin %service_add_pre cups.service cups-lpd@.service cups-lpd.socket cups.socket %post -p /bin/bash @@ -508,9 +525,16 @@ done exit 0 -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%post -n libcups2 -p /sbin/ldconfig +%postun -n libcups2 -p /sbin/ldconfig +%post -n libcupscgi1 -p /sbin/ldconfig +%postun -n libcupscgi1 -p /sbin/ldconfig +%post -n libcupsimage2 -p /sbin/ldconfig +%postun -n libcupsimage2 -p /sbin/ldconfig +%post -n libcupsmime1 -p /sbin/ldconfig +%postun -n libcupsmime1 -p /sbin/ldconfig +%post -n libcupsppdc1 -p /sbin/ldconfig +%postun -n libcupsppdc1 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -680,7 +704,27 @@ %doc %{_mandir}/man1/ppdpo.1.gz %doc %{_mandir}/man5/ppdcfile.5.gz -%files libs +%files -n libcups2 +%defattr(-,root,root) +%{_libdir}/libcups.so.2 + +%files -n libcupscgi1 +%defattr(-,root,root) +%{_libdir}/libcupscgi.so.1 + +%files -n libcupsimage2 +%defattr(-,root,root) +%{_libdir}/libcupsimage.so.2 + +%files -n libcupsmime1 +%defattr(-,root,root) +%{_libdir}/libcupsmime.so.1 + +%files -n libcupsppdc1 +%defattr(-,root,root) +%{_libdir}/libcupsppdc.so.1 + +%files config %defattr(-,root,root) %if 0%{?suse_version} >= 1330 %dir %attr(0755,root,lp) /etc/cups @@ -691,11 +735,6 @@ %dir %attr(0755,lp,lp) %{_var}/log/cups/ %dir %attr(0775,lp,lp) %{_var}/cache/cups %{_bindir}/cups-config -%{_libdir}/libcups.so.* -%{_libdir}/libcupscgi.so.* -%{_libdir}/libcupsimage.so.* -%{_libdir}/libcupsmime.so.* -%{_libdir}/libcupsppdc.so.* %{_datadir}/locale/*/cups_* %doc %{_mandir}/man1/cups-config.1.gz ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.QUpA12/_old 2017-11-02 10:23:23.938284020 +0100 +++ /var/tmp/diff_new_pack.QUpA12/_new 2017-11-02 10:23:23.938284020 +0100 @@ -1,2 +1,6 @@ -cups-libs +libcups2 +libcupscgi1 +libcupsimage2 +libcupsmime1 +libcupsppdc1 cups-devel ++++++ cups-2.2.3-source.tar.gz -> cups-2.2.5-source.tar.gz ++++++ /work/SRC/openSUSE:Factory/cups/cups-2.2.3-source.tar.gz /work/SRC/openSUSE:Factory/.cups.new/cups-2.2.5-source.tar.gz differ: char 5, line 1
