cups-1.7.0, cups-filters-1.0.43

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8110 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cups-filters/cups-filters-vl.spec

@@ -0,0 +1,448 @@
+# we build CUPS also with relro
+%global _hardened_build 1
+
+Summary: OpenPrinting CUPS filters and backends
+Name:    cups-filters
+Version: 1.0.43
+Release: 1%{?_dist_release}
+
+# For a breakdown of the licensing, see COPYING file
+# GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
+#                   imagetopdf, pstopdf, texttopdf
+#         backends: parallel, serial
+# GPLv2+:  filters: gstopxl, textonly, texttops, imagetops
+# GPLv3:   filters: bannertopdf
+# GPLv3+:  filters: urftopdf
+# LGPLv2+:   utils: cups-browsed
+# MIT:     filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster
+License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT
+
+Group:   System Environment/Base
+Url:     http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
+Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
+
+#Patch1: cups-filters-pdf-landscape.patch
+Patch2: cups-filters-dbus.patch
+#Patch3: cups-filters-memory-leaks.patch
+#Patch4: cups-filters-filter-costs.patch
+
+Requires: cups
+Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
+
+# Obsolete cups-php (bug #971741)
+Obsoletes: cups-php < 1:1.6.0-1
+# Don't Provide it because we don't build the php module
+#Provides: cups-php = 1:1.6.0-1
+
+BuildRequires: cups-devel
+# pdftopdf
+BuildRequires: qpdf-devel
+# pdftops
+BuildRequires: poppler-utils
+# pdftoijs, pdftoopvp, pdftoraster, gstoraster
+BuildRequires: poppler-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig dbus-devel
+# libijs
+BuildRequires: ghostscript-devel
+BuildRequires: freetype2-devel
+BuildRequires: fontconfig-devel
+BuildRequires: lcms2-devel
+# cups-browsed
+BuildRequires: avahi-devel avahi-glib-devel
+
+# Make sure we get postscriptdriver tags.
+BuildRequires: python-cups
+
+# Testing font for test scripts.
+BuildRequires: TrueType-dejavu
+
+# autogen.sh
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+
+Requires: poppler-utils
+# pstopdf
+Requires: bc grep sed
+
+# cups-browsed
+#Requires(post): systemd
+#Requires(preun): systemd
+#Requires(postun): systemd
+
+# Ghostscript CUPS filters live here since Ghostscript 9.08.
+Provides: ghostscript-cups = 9.08
+Obsoletes: ghostscript-cups < 9.08
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: tomop
+
+%package libs
+Summary: OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries
+Group:   System Environment/Libraries
+# LGPLv2: libcupsfilters
+# MIT:    libfontembed
+License: LGPLv2 and MIT
+
+%package devel
+Summary: OpenPrinting CUPS filters and backends - development environment
+Group:   Development/Libraries
+License: LGPLv2 and MIT
+Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
+
+%description
+Contains backends, filters, and other software that was
+once part of the core CUPS distribution but is no longer maintained by
+Apple Inc. In addition it contains additional filters developed
+independently of Apple, especially filters for the PDF-centric printing
+workflow introduced by OpenPrinting.
+
+%description libs
+This package provides cupsfilters and fontembed libraries.
+
+%description devel
+This is the development package for OpenPrinting CUPS filters and backends.
+
+%prep
+%setup -q
+
+# Fix PDF landscape printing (bug #768811).
+#%patch1 -p1 -b .pdf-landscape
+
+# Include dbus so that colord support works (bug #1026928).
+%patch2 -p1 -b .dbus
+
+# Fix memory leaks in cups-browsed (bug #1027317).
+#%patch3 -p1 -b .memory-leaks
+
+# Adjust filter costs so application/vnd.adobe-read-postscript input
+# doesn't go via pstotiff (bug #1008166).
+#%patch4 -p1 -b .filter-costs
+
+%build
+# work-around Rpath
+./autogen.sh
+
+# --with-pdftops=hybrid - use Poppler's pdftops instead of Ghostscript for
+#                         Brother, Minolta, and Konica Minolta to work around
+#                         bugs in the printer's PS interpreters
+# --with-rcdir=no - don't install SysV init script
+export IJS_CFLAGS="-I/usr/include/ijs"
+export IJS_LIBS="-lijs"
+%configure --disable-static \
+           --disable-silent-rules \
+           --with-pdftops=hybrid \
+           --enable-dbus \
+           --with-rcdir=%{_sysconfdir} \
+           --with-test-font-path=/usr/share/fonts/TrueType-dejavu/DejaVuSans.ttf
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=%{buildroot}
+
+# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
+mkdir __doc
+mv  %{buildroot}%{_datadir}/doc/cups-filters/* __doc
+rm -rf %{buildroot}%{_datadir}/doc/cups-filters
+
+# Don't ship libtool la files.
+rm -f %{buildroot}%{_libdir}/lib*.la
+
+# Not sure what is this good for.
+rm -f %{buildroot}%{_bindir}/ttfread
+
+# systemd unit file
+#mkdir -p %{buildroot}%{_unitdir}
+#install -p -m 644 utils/cups-browsed.service %{buildroot}%{_unitdir}
+
+# SysV initscripts
+rm -rf %{buildroot}%{_sysconfdir}/rc{0,2,3,5}.d
+rm -rf %{buildroot}%{_sysconfdir}/rc.d
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d
+mv -f %{buildroot}%{_sysconfdir}/init.d %{buildroot}%{_sysconfdir}/rc.d/
+
+%check
+make check
+
+%post
+#%systemd_post cups-browsed.service
+
+# Initial installation
+if [ $1 -eq 1 ] ; then
+    IN=%{_sysconfdir}/cups/cupsd.conf
+    OUT=%{_sysconfdir}/cups/cups-browsed.conf
+    keyword=BrowsePoll
+
+    # We can remove this after few releases, it's just for the introduction of cups-browsed.
+    if [ -f "$OUT" ]; then
+        echo -e "\n# NOTE: This file is not part of CUPS. You need to start & enable cups-browsed service." >> "$OUT"
+    fi
+
+    # move BrowsePoll from cupsd.conf to cups-browsed.conf
+    if [ -f "$IN" ] && grep -iq ^$keyword "$IN"; then
+        if ! grep -iq ^$keyword "$OUT"; then
+            (cat >> "$OUT" <<EOF
+
+# Settings automatically moved from cupsd.conf by RPM package:
+EOF
+            ) || :
+            (grep -i ^$keyword "$IN" >> "$OUT") || :
+            #systemctl enable cups-browsed.service >/dev/null 2>&1 || :
+        fi
+        sed -i -e "s,^$keyword,#$keyword directive moved to cups-browsed.conf\n#$keyword,i" "$IN" || :
+    fi
+fi
+
+%preun
+#%systemd_preun cups-browsed.service
+
+%postun
+#%systemd_postun_with_restart cups-browsed.service 
+
+%post libs
+/sbin/ldconfig
+
+%postun libs
+/sbin/ldconfig
+
+
+%files
+%doc __doc/README __doc/AUTHORS __doc/NEWS
+%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf
+%config(noreplace) %{_sysconfdir}/fonts/conf.d/99pdftoopvp.conf
+%attr(0755,root,root) %{_cups_serverbin}/filter/*
+%exclude %{_cups_serverbin}/filter/foomatic-rip
+%exclude %{_cups_serverbin}/filter/pdftoraster
+%exclude %{_cups_serverbin}/filter/textonly
+%attr(0755,root,root) %{_cups_serverbin}/backend/parallel
+# Serial backend needs to run as root (bug #212577#c4).
+%attr(0700,root,root) %{_cups_serverbin}/backend/serial
+%{_datadir}/cups/banners
+%{_datadir}/cups/charsets
+%{_datadir}/cups/data/*
+# this needs to be in the main package because of cupsfilters.drv
+%{_datadir}/cups/ppdc/pcl.h
+%{_datadir}/cups/drv/cupsfilters.drv
+%{_datadir}/cups/mime/cupsfilters.types
+%{_datadir}/cups/mime/cupsfilters.convs
+%{_datadir}/ppd/cupsfilters
+%{_sbindir}/cups-browsed
+#%{_unitdir}/cups-browsed.service
+%{_initdir}/cups-browsed
+%{_mandir}/man8/cups-browsed.8.gz
+%{_mandir}/man5/cups-browsed.conf.5.gz
+
+%files libs
+%doc __doc/COPYING fontembed/README
+%{_libdir}/libcupsfilters.so.*
+%{_libdir}/libfontembed.so.*
+
+%files devel
+%{_includedir}/cupsfilters
+%{_includedir}/fontembed
+%{_datadir}/cups/ppdc/escp.h
+%{_libdir}/pkgconfig/libcupsfilters.pc
+%{_libdir}/pkgconfig/libfontembed.pc
+%{_libdir}/libcupsfilters.so
+%{_libdir}/libfontembed.so
+
+%changelog
+* Sat Jan 04 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.43-1
+- new upstream release.
+- initial build for Vine Linux.
+
+* Tue Nov 19 2013 Tim Waugh <twaugh@redhat.com> - 1.0.41-4
+- Adjust filter costs so application/vnd.adobe-read-postscript input
+  doesn't go via pstotiff (bug #1008166).
+
+* Thu Nov 14 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.41-3
+- Fix memory leaks in cups-browsed (bug #1027317).
+
+* Wed Nov  6 2013 Tim Waugh <twaugh@redhat.com> - 1.0.41-2
+- Include dbus so that colord support works (bug #1026928).
+
+* Wed Oct 30 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.41-1
+- 1.0.41 - PPD-less printing support
+
+* Mon Oct 21 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-4
+- Fix socket leaks in the BrowsePoll code (bug #1021512).
+
+* Wed Oct 16 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-3
+- Ship the gstoraster MIME conversion rule now we provide that filter
+  (bug #1019261).
+
+* Fri Oct 11 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-2
+- Fix PDF landscape printing (bug #768811).
+
+* Fri Oct 11 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.40-1
+- 1.0.40
+- Use new "hybrid" pdftops renderer.
+
+* Thu Oct 03 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.39-1
+- 1.0.39
+- Removed obsolete patches "pdf-landscape" and "browsepoll-notifications"
+
+* Tue Oct  1 2013 Tim Waugh <twaugh@redhat.com> - 1.0.38-4
+- Use IPP notifications for BrowsePoll when possible (bug #975241).
+
+* Tue Oct  1 2013 Tim Waugh <twaugh@redhat.com> - 1.0.38-3
+- Fixes for some printf-type format mismatches (bug #1014093).
+
+* Tue Sep 17 2013 Tim Waugh <twaugh@redhat.com> - 1.0.38-2
+- Fix landscape printing for PDFs (bug #768811).
+
+* Wed Sep 04 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.38-1
+- 1.0.38
+
+* Thu Aug 29 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.37-1
+- 1.0.37.
+
+* Tue Aug 27 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.36-5
+- Added build dependency - font required for running tests
+
+* Tue Aug 27 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.36-4
+- Added checking phase (make check)
+
+* Wed Aug 21 2013 Tim Waugh <twaugh@redhat.com> - 1.0.36-3
+- Upstream patch to re-work filter costs (bug #998977). No longer need
+  text filter costs patch as paps gets used by default now if
+  installed.
+
+* Mon Aug 19 2013 Marek Kasik <mkasik@redhat.com> - 1.0.36-2
+- Rebuild (poppler-0.24.0)
+
+* Tue Aug 13 2013 Tim Waugh <twaugh@redhat.com> - 1.0.36-1
+- 1.0.36.
+
+* Tue Aug 13 2013 Tim Waugh <twaugh@redhat.com> - 1.0.35-7
+- Upstream patch to move in filters from ghostscript.
+
+* Tue Jul 30 2013 Tim Waugh <twaugh@redhat.com> - 1.0.35-6
+- Set cost for text filters to 200 so that the paps filter gets
+  preference for the time being (bug #988909).
+
+* Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> - 1.0.35-5
+- Handle page-label when printing n-up as well.
+
+* Tue Jul 23 2013 Tim Waugh <twaugh@redhat.com> - 1.0.35-4
+- Added support for page-label (bug #987515).
+
+* Thu Jul 11 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.35-3
+- Rebuild (qpdf-5.0.0)
+
+* Mon Jul 01 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.35-2
+- add cups-browsed(8) and cups-browsed.conf(5)
+- don't reverse lookup IP address in URI (#975822)
+
+* Wed Jun 26 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.35-1
+- 1.0.35
+
+* Mon Jun 24 2013 Marek Kasik <mkasik@redhat.com> - 1.0.34-9
+- Rebuild (poppler-0.22.5)
+
+* Wed Jun 19 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-8
+- fix the note we add in cups-browsed.conf
+
+* Wed Jun 12 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-7
+- Obsolete cups-php (#971741)
+
+* Wed Jun 05 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-6
+- one more cups-browsed leak fixed (#959682)
+
+* Wed Jun 05 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-5
+- perl is actually not required by pstopdf, because the calling is in dead code
+
+* Mon Jun 03 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-4
+- fix resource leaks and other problems found by Coverity & Valgrind (#959682)
+
+* Wed May 15 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-3
+- ship ppdc/pcl.h because of cupsfilters.drv
+
+* Tue May 07 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-2
+- pstopdf requires bc (#960315)
+
+* Thu Apr 11 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.34-1
+- 1.0.34
+
+* Fri Apr 05 2013 Fridolin Pokorny <fpokorny@redhat.com> - 1.0.33-1
+- 1.0.33
+- removed cups-filters-1.0.32-null-info.patch, accepted by upstream
+
+* Thu Apr 04 2013 Fridolin Pokorny <fpokorny@redhat.com> - 1.0.32-2
+- fixed segfault when info is NULL
+
+* Thu Apr 04 2013 Fridolin Pokorny <fpokorny@redhat.com> - 1.0.32-1
+- 1.0.32
+
+* Fri Mar 29 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.31-3
+- add note to cups-browsed.conf
+
+* Thu Mar 28 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.31-2
+- check cupsd.conf existence prior to grepping it (#928816)
+
+* Fri Mar 22 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.31-1
+- 1.0.31
+
+* Tue Mar 19 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.30-4
+- revert previous change
+
+* Wed Mar 13 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.30-3
+- don't ship banners for now (#919489)
+
+* Tue Mar 12 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.30-2
+- move BrowsePoll from cupsd.conf to cups-browsed.conf in %%post
+
+* Fri Mar 08 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.30-1
+- 1.0.30: CUPS browsing and broadcasting in cups-browsed
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jan 19 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.29-3
+- backport upstream buildfix for poppler-0.22.x
+
+* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.0.29-2
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Thu Jan 03 2013 Jiri Popelka <jpopelka@redhat.com> 1.0.29-1
+- 1.0.29
+
+* Wed Jan 02 2013 Jiri Popelka <jpopelka@redhat.com> 1.0.28-1
+- 1.0.28: cups-browsed daemon and service
+
+* Thu Nov 29 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.25-1
+- 1.0.25
+
+* Fri Sep 07 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.24-1
+- 1.0.24
+
+* Wed Aug 22 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.23-1
+- 1.0.23: old pdftopdf removed
+
+* Tue Aug 21 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.22-1
+- 1.0.22: new pdftopdf (uses qpdf instead of poppler)
+
+* Wed Aug 08 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.20-4
+- rebuild
+
+* Thu Aug 02 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.20-3
+- commented multiple licensing breakdown (#832130)
+- verbose build output
+
+* Thu Aug 02 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.20-2
+- BuildRequires: poppler-cpp-devel (to build against poppler-0.20)
+
+* Mon Jul 23 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.20-1
+- 1.0.20
+
+* Tue Jul 17 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.19-1
+- 1.0.19
+
+* Wed May 30 2012 Jiri Popelka <jpopelka@redhat.com> 1.0.18-1
+- initial spec file

c/cups/cups-vl.spec

@@ -2,13 +2,13 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define initdir %{_sysconfdir}/rc.d/init.d
 %define use_alternatives 1
-%define use_dbus 1
+
-%define use_avahi 1
+%define _unpackaged_files_terminate_build 1
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.8
+Version: 1.7.0
-Release: 6%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
 
@@ -16,7 +16,7 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, tomop
 
-Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
+Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
 # Our initscript
 Source1: cups.init
 # Pixmap for desktop file
@@ -53,9 +53,9 @@ Source207: pxlcolor.ppd.gz
 Source208: cups.conf
 
 Patch1: cups-no-gzip-man.patch
-Patch2: cups-1.1.16-system-auth.patch
+Patch2: cups-system-auth.patch
 Patch3: cups-multilib.patch
-Patch4: cups-serial.patch
+Patch4: cups-dbus-utf8.patch
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
@@ -63,46 +63,47 @@ Patch8: cups-direct-usb.patch
 Patch9: cups-lpr-help.patch
 Patch10: cups-peercred.patch
 Patch11: cups-pid.patch
-Patch12: cups-page-label.patch
+Patch12: cups-eggcups.patch
-Patch13: cups-eggcups.patch
+Patch13: cups-driverd-timeout.patch
-Patch14: cups-getpass.patch
+Patch14: cups-strict-ppd-line-length.patch
-Patch15: cups-driverd-timeout.patch
+Patch15: cups-logrotate.patch
-Patch16: cups-strict-ppd-line-length.patch
+Patch16: cups-usb-paperout.patch
-Patch17: cups-logrotate.patch
+Patch17: cups-res_init.patch
-Patch18: cups-usb-paperout.patch
+Patch18: cups-filter-debug.patch
-Patch19: cups-build.patch
+Patch19: cups-uri-compat.patch
-Patch20: cups-res_init.patch
+Patch20: cups-str3382.patch
-Patch21: cups-filter-debug.patch
+Patch21: cups-0755.patch
-Patch22: cups-uri-compat.patch
+Patch22: cups-hp-deviceid-oid.patch
-Patch23: cups-cups-get-classes.patch
+Patch23: cups-dnssd-deviceid.patch
-Patch24: cups-str3382.patch
+Patch24: cups-ricoh-deviceid-oid.patch
-Patch25: cups-force-gnutls.patch
+Patch25: cups-systemd-socket.patch
-Patch26: cups-serialize-gnutls.patch
+Patch26: cups-lpd-manpage.patch
-Patch27: cups-0755.patch
+Patch27: cups-avahi-address.patch
-Patch28: cups-snmp-quirks.patch
+Patch28: cups-usb-timeout.patch
-Patch29: cups-hp-deviceid-oid.patch
+Patch29: cups-enum-all.patch
-Patch30: cups-dnssd-deviceid.patch
+Patch30: cups-stringpool-rdar15382819.patch
-Patch31: cups-ricoh-deviceid-oid.patch
+Patch31: cups-dymo-deviceid.patch
-Patch32: cups-texttops-rotate-page.patch
+Patch32: cups-freebind.patch
-Patch33: cups-usb-parallel.patch
+Patch33: cups-no-gcry.patch
-Patch34: cups-str3535.patch
+Patch34: cups-libusb-quirks.patch
-Patch35: cups-polld-busy-loop.patch
+Patch35: cups-use-ipp1.1.patch
-Patch36: cups-CVE-2011-2896.patch
+Patch36: cups-avahi-no-threaded.patch
-Patch37: cups-str3947.patch
+Patch37: cups-gz-crc.patch
-
+Patch39: cups-ipp-multifile.patch
-Patch40: cups-avahi-1-config.patch
+Patch40: cups-full-relro.patch
-Patch41: cups-avahi-2-backend.patch
+Patch41: cups-web-devices-timeout.patch
-Patch42: cups-avahi-3-timeouts.patch
+Patch43: cups-final-content-type.patch
-Patch43: cups-avahi-4-poll.patch
+Patch44: cups-jobhistory.patch
-Patch44: cups-avahi-5-services.patch
+Patch45: cups-journal.patch
-
+Patch46: cups-synconclose.patch
-Patch45: cups-icc.patch
+Patch47: cups-dbus-notifier.patch
-
+
-Patch100: cups-1.4.6-fix-template-ja.patch
+Patch100: cups-1.7.0-fix-ja-template.patch
 Patch101: cups-1.4.6-pstext-utf8.patch
 Patch102: cups-serverbin-compat2.patch
 Patch103: cups-serverbin-compat3.patch
 Patch104: cups-serverbin-compat4.patch
+Patch105: cups-1.7.0-cups-config.patch
 
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -117,35 +118,34 @@ Requires(pre): alternatives
 Obsoletes: lpd lpr LPRng printtool
 Provides: lpd lpr LPRng
 %endif
-BuildRequires: pam-devel pkgconfig
-BuildRequires: gnutls-devel
-BuildRequires: libacl-devel
-BuildRequires: openldap-devel
 BuildRequires: aspell-devel
+BuildRequires: avahi-devel >= 0.6.20
+BuildRequires: dbus-devel >= 0.90
+BuildRequires: e2fsprogs-devel
+BuildRequires: krb5-devel
+BuildRequires: libacl-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: krb5-devel
+BuildRequires: libusb1-devel
-BuildRequires: e2fsprogs-devel
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
 BuildRequires: poppler-utils
-%if %use_dbus
+BuildRequires: python-cups
-BuildRequires: dbus-devel >= 0.90
+
-Requires: dbus >= 0.90
-%endif
 
-%if %use_avahi
-BuildRequires: avahi-devel >= 0.6.20
 Requires: avahi >= 0.6.20
 Requires: avahi-tools
-%endif
+Requires: dbus >= 0.90
-
 Requires: poppler-utils
 
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: gnutls-devel
+Requires: openssl-devel
 Requires: krb5-devel
 Requires: zlib-devel
 License: LGPL
@@ -228,8 +228,8 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch2 -p1 -b .system-auth
 # Prevent multilib conflict in cups-config script.
 %patch3 -p1 -b .multilib
-# Fix compilation of serial backend.
+# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
-%patch4 -p1 -b .serial
+%patch4 -p1 -b .dbus-utf8
 # Ignore rpm save/new files in the banners directory.
 %patch5 -p1 -b .banners
 # Use compatibility fallback path for ServerBin.
@@ -244,81 +244,83 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch10 -p1 -b .peercred
 # Maintain a cupsd.pid file.
 %patch11 -p1 -b .pid
-# Fix orientation of page labels.
-%patch12 -p1 -b .page-label
 # Fix implementation of com.redhat.PrinterSpooler D-Bus object.
-%patch13 -p1 -b .eggcups
+%patch12 -p1 -b .eggcups
-# More sophisticated implementation of cupsGetPassword than getpass.
+# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
-%patch14 -p1 -b .getpass
+%patch13 -p1 -b .driverd-timeout
-# Increase driverd timeout to 70s to accommodate foomatic.
-%patch15 -p1 -b .driverd-timeout
 # Only enforce maximum PPD line length when in strict mode.
-%patch16 -p1 -b .strict-ppd-line-length
+%patch14 -p1 -b .strict-ppd-line-length
 # Re-open the log if it has been logrotated under us.
-%patch17 -p1 -b .logrotate
+%patch15 -p1 -b .logrotate
 # Support for errno==ENOSPACE-based USB paper-out reporting.
-%patch18 -p1 -b .usb-paperout
+%patch16 -p1 -b .usb-paperout
-# Simplify the DNSSD parts so they can build using the compat library.
+# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
-%patch19 -p1 -b .build
+%patch17 -p1 -b .res_init
-# Re-initialise the resolver on failure in httpAddrGetList().
-%patch20 -p1 -b .res_init
 # Log extra debugging information if no filters are available.
-%patch21 -p1 -b .filter-debug
+%patch18 -p1 -b .filter-debug
 # Allow the usb backend to understand old-style URI formats.
-%patch22 -p1 -b .uri-compat
+%patch19 -p1 -b .uri-compat
-# Fix support for older CUPS servers in cupsGetDests.
-%patch23 -p1 -b .cups-get-classes
 # Fix temporary filename creation.
-%patch24 -p1 -b .str3382
+%patch20 -p1 -b .str3382
-# Force the use of gnutls despite thread-safety concerns (bug #607159).
-%patch25 -p1 -b .force-gnutls
-# Perform locking for gnutls and avoid libgcrypt's broken
-# locking (bug #607159).
-%patch26 -p1 -b .serialize-gnutls
 # Use mode 0755 for binaries and libraries where appropriate.
-%patch27 -p1 -b .0755
+%patch21 -p1 -b .0755
-# Handle SNMP supply level quirks (bug #581825).
-%patch28 -p1 -b .snmp-quirks
 # Add an SNMP query for HP's device ID OID (STR #3552).
-%patch29 -p1 -b .hp-deviceid-oid
+%patch22 -p1 -b .hp-deviceid-oid
 # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch30 -p1 -b .dnssd-deviceid
+%patch23 -p1 -b .dnssd-deviceid
 # Add an SNMP query for Ricoh's device ID OID (STR #3552).
-%patch31 -p1 -b .ricoh-deviceid-oid
+%patch24 -p1 -b .ricoh-deviceid-oid
-# Adjust texttops output to be in natural orientation (STR #3563).
+# Add support for systemd socket activation (patch from Lennart
-# This fixes page-label orientation when texttops is used in the
+# Poettering).
-# filter chain (bug #572338).
+%patch25 -p1 -b .systemd-socket
-%patch32 -p1 -b .texttops-rotate-page
+# Talk about systemd in cups-lpd manpage (part of bug #884641).
-# Use numeric addresses for interfaces unless HostNameLookups are
+%patch26 -p1 -b .lpd-manpage
-# turned on (bug #583054).
+# Use IP address when resolving DNSSD URIs (bug #948288).
-# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
+%patch27 -p1 -b .avahi-address
-%patch33 -p1 -b .usb-parallel
+# Prevent USB timeouts causing incorrect print output (bug #1026914).
-# Set the default RIPCache to 128m (STR #3535, bug #549901).
+%patch28 -p1 -b .usb-timeout
-%patch34 -p1 -b .str3535
+# Return from cupsEnumDests() once all records have been returned.
-# Avoid busy loop in cups-polld (bug #720921).
+%patch29 -p1 -b .enum-all
-%patch35 -p1 -b .polld-busy-loop
+# Prevent stringpool damage leading to memory leaks (bug #974048).
-# Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
+%patch30 -p1 -b .stringpool-rdar15382819
-%patch36 -p1 -b .CVE-2011-2896
+# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
-# Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
+%patch31 -p1 -b .dymo-deviceid
-%patch37 -p1 -b .str3947
+# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
-
+%patch32 -p1 -b .freebind
-# Avahi support:
+# Don't link against libgcrypt needlessly.
-# - discovery in the dnssd backend
+%patch33 -p1 -b .no-gcry
-# - service announcement in the scheduler
+# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
-%patch40 -p1 -b .avahi-1-config
+%patch34 -p1 -b .libusb-quirks
-%patch41 -p1 -b .avahi-2-backend
+# Default to IPP/1.1 for now (bug #977813).
-%patch42 -p1 -b .avahi-3-timeouts
+%patch35 -p1 -b .use-ipp1.1
-%patch43 -p1 -b .avahi-4-poll
+# Don't use D-Bus from two threads (bug #979748).
-%patch44 -p1 -b .avahi-5-services
+%patch36 -p1 -b .avahi-no-threaded
-
+# Avoid sign-extending CRCs for gz decompression (bug #983486).
-# ICC colord support.
+%patch37 -p1 -b .gz-crc
-%patch45 -p1 -b .icc
+# Fixes for jobs with multiple files and multiple formats.
+%patch39 -p1 -b .ipp-multifile
+# Full relro (bug #996740).
+%patch40 -p1 -b .full-relro
+# Increase web interface get-devices timeout to 10s (bug #996664).
+%patch41 -p1 -b .web-devices-timeout
+# Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
+# printing to remote CUPS servers (bug #1010580).
+%patch43 -p1 -b .final-content-type
+# Fix job history logging.
+%patch44 -p1 -b .jobhistory
+# Allow "journal" log type for log output to system journal.
+%patch45 -p1 -b .journal
+# Set the default for SyncOnClose to Yes.
+%patch46 -p1 -b .synconclose
+# Avoid stale lockfile in dbus notifier (bug #1026949).
+%patch47 -p1 -b .dbus-notifier
 
 %patch100 -p1 -b .template-ja
-%patch101 -p1 -b .pstext
+#%patch101 -p1 -b .pstext
 %patch102 -p0 -b .serverbin-compat2
 %patch103 -p0 -b .serverbin-compat3
 %patch104 -p1 -b .serverbin-compat4
+%patch105 -p1 -b .cups-config
 
 # make to use cjktexttops instead texttops.
 perl -pi -e 's/texttops$/cjktexttops/' conf/mime.convs.in
@@ -336,9 +338,6 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
 # Let's look at the compilation command lines.
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
-# Fix locale code for Norwegian (bug #520379).
-mv locale/cups_no.po locale/cups_nb.po
-
 f=CREDITS.txt
 mv "$f" "$f"~
 iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
@@ -353,17 +352,18 @@ autoconf -I config-scripts
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 # --enable-debug to avoid stripping binaries
 %configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \
+	--with-cupsd-file-perm=0755 \
 	--with-log-file-perm=0600 --enable-relro \
 	--with-pdftops=pdftops \
 	--with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--with-php=/usr/bin/php5-cgi \
 	--enable-avahi \
 	--enable-threads \
-	--enable-gnutls \
+	--enable-openssl \
+	--enable-webif \
 	--disable-slp \
 	localedir=%{_datadir}/locale
 
-	##--enable-lspp \
-
 perl -pi -e "s,^DSO	=.*,DSO=gcc -fpic," Makedefs
 
 # If we got this far, all prerequisite libraries must be here.
@@ -374,9 +374,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make BUILDROOT=$RPM_BUILD_ROOT install 
 
-# Serial backend needs to run as root (bug #212577).
-chmod 700 $RPM_BUILD_ROOT%{_libdir}/%{name}/backend/serial
-
 rm -rf	$RPM_BUILD_ROOT%{initdir} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/init.d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/rc?.d
@@ -434,9 +431,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
 # LSB 3.2 printer driver directory
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
 
-# Handle https:// device URIs (bug #478677, STR #3122).
-ln -s ipp $RPM_BUILD_ROOT%{_libdir}/cups/backend/https
-
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -447,11 +441,32 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 install -m644 %{SOURCE3} \
 	%{buildroot}/lib/udev/rules.d/70-cups-libusb.rules
 
+# there are pdf-banners shipped with cups-filters (#919489)
+rm -rf $RPM_BUILD_ROOT%{_datadir}/cups/banners
+rm -f $RPM_BUILD_ROOT%{_datadir}/cups/data/testprint
+
 # install /etc/tmpfiles.d/cups.conf (bug #656566)
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d
 cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/cups.conf <<EOF
-d %{_localstatedir}/run/cups 0755 root lp -
+# See tmpfiles.d(5) for details
-d %{_localstatedir}/run/cups/certs 0511 lp sys -
+
+d /run/cups 0755 root lp -
+d /run/cups/certs 0511 lp sys -
+
+d /var/spool/cups/tmp - - - 30d
+EOF
+
+# /usr/lib/tmpfiles.d/cups-lp.conf (bug #812641)
+cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/cups-lp.conf <<EOF
+# Legacy parallel port character device nodes, to trigger the
+# auto-loading of the kernel module on access.
+#
+# See tmpfiles.d(5) for details
+
+c /dev/lp0 0660 root lp - 6:0
+c /dev/lp1 0660 root lp - 6:1
+c /dev/lp2 0660 root lp - 6:2
+c /dev/lp3 0660 root lp - 6:3
 EOF
 
 # Ship a PCL XL/PCL 6 filter file from ESP gs-7.07.1
@@ -576,13 +591,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/cups.conf
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/cups*.conf
 %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf
 %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default
-%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
 %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf
-%config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf
+%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
+%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/cups-files.conf
 #%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/pdftops.conf
+%config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/subscriptions.conf
 %{_sysconfdir}/cups/interfaces
@@ -597,29 +613,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
-%dir %{_datadir}/%{name}/www
-%dir %{_datadir}/%{name}/www/es
-%dir %{_datadir}/%{name}/www/eu
-%dir %{_datadir}/%{name}/www/ja
-%dir %{_datadir}/%{name}/www/pl
-%dir %{_datadir}/%{name}/www/ru
-%{_datadir}/%{name}/www/images
-%{_datadir}/%{name}/www/*.css
-%doc %{_datadir}/%{name}/www/index.html
-%doc %{_datadir}/%{name}/www/help
-%doc %{_datadir}/%{name}/www/robots.txt
-%doc %{_datadir}/%{name}/www/de/index.html
-%doc %{_datadir}/%{name}/www/es/index.html
-%doc %{_datadir}/%{name}/www/eu/index.html
-%doc %{_datadir}/%{name}/www/id/index.html
-%doc %{_datadir}/%{name}/www/it/index.html
-%doc %{_datadir}/%{name}/www/ja/index.html
-%doc %{_datadir}/%{name}/www/pl/index.html
-%doc %{_datadir}/%{name}/www/ru/index.html
 %config(noreplace) %{initdir}/cups
 %{_bindir}/cupstestppd
 %{_bindir}/cupstestdsc
 %{_bindir}/cancel*
+%{_bindir}/ippfind
+%{_bindir}/ipptool
 %{_bindir}/lp.cups
 %{_bindir}/lpoptions
 %attr(4755,root,root) %{_bindir}/lppasswd
@@ -632,7 +631,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cups/backend
 %{_libdir}/cups/cgi-bin
 %dir %{_libdir}/cups/daemon
-%{_libdir}/cups/daemon/cups-polld
+%{_libdir}/cups/daemon/cups-exec
 %{_libdir}/cups/daemon/cups-deviced
 %{_libdir}/cups/daemon/cups-driverd
 %{_libdir}/cups/daemon/cups-lpd
@@ -646,19 +645,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_mandir}/man1/cancel*
 %{_mandir}/man1/cupstest*
+%{_mandir}/man1/ipp*
 %{_mandir}/man1/lp*
 %{_mandir}/man1/ppd*
 %{_mandir}/man[578]/*
 %{_sbindir}/*
-%dir %{_datadir}/cups
+%{_datadir}/cups
-%dir %{_datadir}/cups/banners
-%config(noreplace) %{_datadir}/cups/banners/*
-%{_datadir}/cups/charsets
-%{_datadir}/cups/charmaps
-%{_datadir}/cups/data
-%{_datadir}/cups/fonts
-%{_datadir}/cups/model
-%{_datadir}/cups/templates
 %{_datadir}/locale/*/*
 %{_datadir}/ppd
 %dir %attr(1770,root,lp) /var/spool/cups/tmp
@@ -667,14 +659,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/cupsprinter.png
 %{_sysconfdir}/cron.daily/cups
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/cups.conf
-%{_datadir}/cups/drv
-%{_datadir}/cups/examples
-%dir %{_datadir}/cups/mime
-%{_datadir}/cups/mime/mime.types
-%{_datadir}/cups/mime/mime.convs
-%dir %{_datadir}/cups/ppdc
-%{_datadir}/cups/ppdc/*.defs
-%{_datadir}/cups/ppdc/*.h
 
 %files libs
 %defattr(-,root,root)
@@ -701,6 +685,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Jan 04 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-1
+- new upstream release.
+
 * Tue Apr 17 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-6
 - modified initscript and added Patch104 to deal with wrong drivers.
 
@@ -914,10 +901,10 @@ rm -rf $RPM_BUILD_ROOT
 - added cups-1.1.17-sanity.patch
 - added Japanese descriptions
 
-* Sat Jun 06 2003 Satoshi MACHINO <machino@vinelinux.org> 1.1.19-0vl1
+* Fri Jun 06 2003 Satoshi MACHINO <machino@vinelinux.org> 1.1.19-0vl1
 - fixed spec file
 
-* Fri Jun 05 2003 Satoshi MACHINO <machino@vinelinux.org> 1.1.19-0vl0.1
+* Thu Jun 05 2003 Satoshi MACHINO <machino@vinelinux.org> 1.1.19-0vl0.1
 - new upstream vrsion
 - remade spec file