Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-04-26 09:59:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-04-11 13:24:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-04-26 09:59:44.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Apr 24 11:23:43 CEST 2014 - jsmeix@suse.de + +- Split cups-browsed into a cups-filters-cups-browsed sub-package + so that cups-browsed can be installed without all the other + stuff from cups-filters (bnc#873204). +- Have libcupsfilters.so.* in the cups-filters-ghostscript + sub-package because gstoraster is linked with libcupsfilters + so that now cups-filters-foomatic-rip requires + cups-filters-ghostscript which is still o.k. because + cups-filters-ghostscript does not require cups-filters + (cf. the entry dated "Thu Apr 10 10:22:25 CEST 2014" below). +- Do no longer rename installed /usr/share/cups/banners/* files + and the installed /usr/share/cups/data/testprint + (cf. the entry dated "Fri Aug 30 12:53:57 CEST 2013" below) + because since CUPS 1.7.2 those files are no longer provided + in our cups RPM package because since CUPS >= 1.6 + the CUPS banners and testprint do no longer work because + there is no longer a filter for Linux that can convert + the CUPS banner files. Since CUPS >= 1.6 only the banners + and testprint in cups-filters work (bnc#873376). + For CUPS <= 1.5.4 (where CUPS banners and testprint works) + this does not make a difference because the cups-filters + main package conflicts with CUPS <= 1.5.4. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.A6hr06/_old 2014-04-26 09:59:45.000000000 +0200 +++ /var/tmp/diff_new_pack.A6hr06/_new 2014-04-26 09:59:45.000000000 +0200 @@ -92,28 +92,20 @@ %systemd_requires # test requires BuildRequires: dejavu-fonts -# Require the exact matching version-release of the cups-filters-ghostscript sub-package -# because all cups-filters software is built from one same source tar ball -# and there could be whatever subtle internal dependencies. -# The exact matching version-release of the cups-filters-ghostscript sub-package is available -# on the same package repository where the cups-filters main package is because -# all are built simulaneously from the same cups-filters source package -# and all required packages are provided on the same repository: -Requires: cups-filters-ghostscript = %{version}-%{release} -# Because foomatic-rip is linked with libcupsfilters.so -# that library is in the cups-filters-foomatic-rip sub-package -# (see the cups-filters-foomatic-rip sub-package file section). +# Because gstoraster is linked with libcupsfilters.so +# that library is in the cups-filters-ghostscript sub-package +# (see the cups-filters-ghostscript sub-package file section). # But many other filters in the cups-filters main package are also # linked with with libcupsfilters.so so that the cups-filters main package -# requires the cups-filters-foomatic-rip sub-package. To be on the safe side explicitly -# require the exact matching version-release of the cups-filters-foomatic-rip sub-package +# requires the cups-filters-ghostscript sub-package. To be on the safe side explicitly +# require the exact matching version-release of the cups-filters-ghostscript sub-package # because all cups-filters software is built from one same source tar ball # and there could be whatever subtle internal dependencies. -# The exact matching version-release of the cups-filters-foomatic-rip sub-package is available +# The exact matching version-release of the cups-filters-ghostscript sub-package is available # on the same package repository where the cups-filters main package is because # all are built simulaneously from the same cups-filters source package # and all required packages are provided on the same repository: -Requires: cups-filters-foomatic-rip = %{version}-%{release} +Requires: cups-filters-ghostscript = %{version}-%{release} # Conflict with CUPS < 1.6 because up to CUPS 1.5.4 # the following files are provided by the cups binary RPM package # /usr/lib/cups/filter/commandtoescpx @@ -130,6 +122,17 @@ # /usr/share/cups/ppdc/escp.h # /usr/share/cups/ppdc/pcl.h Conflicts: cups < 1.6 +# When a user installs the cups-filters main package, he usually expects +# to get "the whole cups-filters stuff" installed (i.e. also all sub-packages). +# To be on the safe side recommend the exact matching version-release +# of the cups-filters sub-packages because all cups-filters software +# is built from one same source tar ball and there could be whatever subtle internal dependencies. +# The exact matching version-release of the cups-filters sub-packages are available +# on the same package repository where the cups-filters main package is because +# all are built simulaneously from the same cups-filters source package +# and all required packages are provided on the same repository: +Recommends: cups-filters-foomatic-rip = %{version}-%{release} +Recommends: cups-filters-cups-browsed = %{version}-%{release} # /usr/bin/pdftops (provided by poppler-tools) # is needed (but not required for non-PostScript printers) # to print PDFs on PostScript printers because in this case @@ -174,6 +177,23 @@ %package foomatic-rip Summary: OpenPrinting CUPS filter foomatic-rip Group: Hardware/Printing +# Because gstoraster is linked with libcupsfilters.so +# that library is in the cups-filters-ghostscript sub-package +# (see the cups-filters-ghostscript sub-package file section). +# But foomatic-rip is also linked with libcupsfilters.so +# so that the cups-filters-foomatic-rip sub-package requires +# the cups-filters-ghostscript sub-package. To be on the safe side explicitly +# require the exact matching version-release of the cups-filters-ghostscript sub-package +# because all cups-filters software is built from one same source tar ball +# and there could be whatever subtle internal dependencies. +# The exact matching version-release of the cups-filters-ghostscript sub-package is available +# on the same package repository where the cups-filters main package is because +# all are built simulaneously from the same cups-filters source package +# and all required packages are provided on the same repository: +Requires: cups-filters-ghostscript = %{version}-%{release} +# Provide the well known generic name "foomatic-rip" so that it is easier for users +# to find the RPM package name "cups-filters-foomatic-rip" that actually provides it: +Provides: foomatic-rip # Provide foomatic-filters with the exact foomatic_rip_version # see https://bugzilla.novell.com/show_bug.cgi?id=870621 # and conflict with any other foomatic-filters version because @@ -193,6 +213,36 @@ is separated in the sub-package cups-filters-foomatic-rip and only that sub-package conflicts with foomatic-filters. +%package cups-browsed +Summary: OpenPrinting cups-browsed for CUPS Browsing +Group: Hardware/Printing +# Do not conflict with CUPS < 1.6 regardless that up to CUPS 1.5.4 +# the CUPS Browsing functionality is provided by the cupsd +# because it can be disabled for the cupsd up to CUPS 1.5.4. +# Provide the well known generic name "cups-browsed" so that it is easier for users +# to find the RPM package name "cups-filters-cups-browsed" that actually provides it: +Provides: cups-browsed + +%description cups-browsed +Since CUPS >= 1.6 the CUPS Browsing functionality +is dropped in CUPS. The OpenPrinting cups-browsed +is a daemon running in parallel to the CUPS daemon +to provide again basic CUPS Browsing functionality. +This way basic CUPS Browsing works on clients +with CUPS >= 1.6 when there are remote CUPS servers +of version 1.5 and older in the network. +For each reported remote CUPS queue cups-browsed creates +a local raw queue pointing to the remote queue so that +it appears in local print dialogs and is also available +for printing via the command line. +Also high availability with redundant print servers is +supported. If there is more than one server providing +a print queue with the same name, cups-browsed uses the +first queue which appears and if this queue disappears, +cups-browsed switches to the queue of another server. +Load-balancing (what CUPS <= 1.5 did via implicit classes) +is not supported with cups-browsed. + %package devel Summary: Development files for cups-filters Group: Development/Libraries/C and C++ @@ -240,18 +290,6 @@ %install make install DESTDIR=%{buildroot} -# Rename installed /usr/share/cups/banners/* files -# and the installed /usr/share/cups/data/testprint -# because those files are also provided by CUPS -# but CUPS provides them in a different format and -# I (jsmeix@suse.de) not want to overwrite CUPS files but -# I do not like to delete the cups-filters version of those files -# instead I like to provide them at least for now as well -# so that we could evaluate which ones we may use finally: -for B in classified confidential secret standard topsecret unclassified -do mv %{buildroot}%{_datadir}/cups/banners/$B %{buildroot}%{_datadir}/cups/banners/$B.cups-filters -done -mv %{buildroot}%{_datadir}/cups/data/testprint %{buildroot}%{_datadir}/cups/data/testprint.cups-filters # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc mkdir __doc mv %{buildroot}%{_datadir}/doc/cups-filters/* __doc @@ -272,22 +310,12 @@ # Not sure what is this good for rm -f %{buildroot}%{_bindir}/ttfread -%pre -%service_add_pre cups-browsed.service -exit 0 - %post /sbin/ldconfig -%service_add_post cups-browsed.service -exit 0 - -%preun -%service_del_preun cups-browsed.service exit 0 %postun /sbin/ldconfig -%service_del_preun cups-browsed.service exit 0 %pre ghostscript @@ -296,16 +324,16 @@ # The cups-filters main package contains them in /usr/share/cups/mime/cupsfilters.convs # but this contains all MIME conversion rules for the PDF printing workflow # that is used for CUPS since version 1.6 but not for traditional CUPS <= 1.5.4. -# The cups-filters-ghostscript sub-package is explicitly intended to be used +# The cups-filters-ghostscript sub-package is explicitly intended to be also used # for traditional CUPS <= 1.5.4 (see the cups-filters-ghostscript sub-package description) # so that we need to provide MIME conversion rules for gstoraster in a special way # that gets overwritten when the cups-filters main package is installed # after the cups-filters-ghostscript sub-package. Therefore we create # the traditional MIME conversion rules for gstoraster that were provided -# in Ghostscript up to version 9.07 in /etc/cups/gstoraster.convs but -# we use the MIME conversions file /usr/share/cups/mime/cupsfilters.convs +# in Ghostscript up to version 9.07 in /etc/cups/gstoraster.convs and +# we use the same file name /usr/share/cups/mime/cupsfilters.convs # that is also used by the cups-filters main package so that its installation -# will overwrite the traditional MIME conversion rules for gstoraster +# will overwrite the traditional MIME conversion rules for gstoraster in that file # by the new MIME conversion rules from cups-filters. To be on the safe side # do not overwrite an existing /usr/share/cups/mime/cupsfilters.convs file # (e.g. when cups-filters was installed before cups-filters-ghostscript). @@ -320,6 +348,30 @@ fi exit 0 +%post ghostscript +/sbin/ldconfig +exit 0 + +%postun ghostscript +/sbin/ldconfig +exit 0 + +%pre cups-browsed +%service_add_pre cups-browsed.service +exit 0 + +%post cups-browsed +%service_add_post cups-browsed.service +exit 0 + +%preun cups-browsed +%service_del_preun cups-browsed.service +exit 0 + +%postun cups-browsed +%service_del_preun cups-browsed.service +exit 0 + %files # The files sections list all mandatory files explicitly one by one. # In particular all executables are listed explicitly. @@ -334,10 +386,6 @@ %defattr(-,root,root) %doc __doc/README __doc/AUTHORS __doc/NEWS __doc/COPYING __doc/fontembed.README %config(noreplace) %{_sysconfdir}/fonts/conf.d/99pdftoopvp.conf -%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf -%{_sbindir}/cups-browsed -%{_sbindir}/rccups-browsed -%{_unitdir}/cups-browsed.service %dir /usr/lib/cups %dir /usr/lib/cups/backend %attr(0755,root,root) /usr/lib/cups/backend/parallel @@ -377,16 +425,13 @@ %dir %{_datadir}/ppd %{_datadir}/ppd/cupsfilters %attr(0755,root,root) %{_libdir}/libfontembed.so.* -%{_mandir}/man5/cups-browsed.conf.5.gz -%{_mandir}/man8/cups-browsed.8.gz %files ghostscript # "ldd /usr/lib/cups/filter/gstoraster | grep cups" shows that -# gstoraster is not linked with /usr/lib/libcupsfilters.so.* -# so that it is o.k. not to have libcupsfilters.so.* -# in the cups-filters-ghostscript sub-package and -# the cups-filters-ghostscript sub-package would still not -# have a RPM requirement for the cups-filters main package +# gstoraster is linked with /usr/lib/libcupsfilters.so.* so that +# it must be in the cups-filters-ghostscript sub-package to ensure +# the cups-filters-ghostscript sub-package can be installed on its own +# without a RPM requirement for the cups-filters main package # which would cause file conflicts with CUPS <= 1.5.4 # see the cups-filters-ghostscript sub-package description. # /usr/lib/cups/filter/gstopxl is a bash script. @@ -395,23 +440,23 @@ %dir /usr/lib/cups/filter %attr(0755,root,root) /usr/lib/cups/filter/gstoraster %attr(0755,root,root) /usr/lib/cups/filter/gstopxl +%attr(0755,root,root) %{_libdir}/libcupsfilters.so.* %files foomatic-rip -# "ldd /usr/lib/cups/filter/foomatic-rip | grep cups" shows that -# foomatic-rip is linked with /usr/lib/libcupsfilters.so.* -# so that /usr/lib/libcupsfilters.so.* must be -# in the cups-filters-foomatic-rip sub-package to ensure -# the cups-filters-foomatic-rip sub-package can be installed on its own -# without a RPM requirement for the cups-filters main package -# which would cause conflicts with CUPS <= 1.5.4 in particular -# when building packages with CUPS <= 1.5.4 that have foomatic-rip -# as build requirement (e.g. hplip via "BuildRequires: foomatic-filters"). -%{_mandir}/man1/foomatic-rip.1.gz %defattr(-,root,root) %dir /usr/lib/cups %dir /usr/lib/cups/filter %attr(0755,root,root) /usr/lib/cups/filter/foomatic-rip -%attr(0755,root,root) %{_libdir}/libcupsfilters.so.* +%{_mandir}/man1/foomatic-rip.1.gz + +%files cups-browsed +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf +%{_sbindir}/cups-browsed +%{_sbindir}/rccups-browsed +%{_unitdir}/cups-browsed.service +%{_mandir}/man5/cups-browsed.conf.5.gz +%{_mandir}/man8/cups-browsed.8.gz %files devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org