|
|
@@ -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
|
|
|
-Release: 6%{?_dist_release}
|
|
|
+Version: 1.7.0
|
|
|
+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
|
|
|
-Patch13: cups-eggcups.patch
|
|
|
-Patch14: cups-getpass.patch
|
|
|
-Patch15: cups-driverd-timeout.patch
|
|
|
-Patch16: cups-strict-ppd-line-length.patch
|
|
|
-Patch17: cups-logrotate.patch
|
|
|
-Patch18: cups-usb-paperout.patch
|
|
|
-Patch19: cups-build.patch
|
|
|
-Patch20: cups-res_init.patch
|
|
|
-Patch21: cups-filter-debug.patch
|
|
|
-Patch22: cups-uri-compat.patch
|
|
|
-Patch23: cups-cups-get-classes.patch
|
|
|
-Patch24: cups-str3382.patch
|
|
|
-Patch25: cups-force-gnutls.patch
|
|
|
-Patch26: cups-serialize-gnutls.patch
|
|
|
-Patch27: cups-0755.patch
|
|
|
-Patch28: cups-snmp-quirks.patch
|
|
|
-Patch29: cups-hp-deviceid-oid.patch
|
|
|
-Patch30: cups-dnssd-deviceid.patch
|
|
|
-Patch31: cups-ricoh-deviceid-oid.patch
|
|
|
-Patch32: cups-texttops-rotate-page.patch
|
|
|
-Patch33: cups-usb-parallel.patch
|
|
|
-Patch34: cups-str3535.patch
|
|
|
-Patch35: cups-polld-busy-loop.patch
|
|
|
-Patch36: cups-CVE-2011-2896.patch
|
|
|
-Patch37: cups-str3947.patch
|
|
|
-
|
|
|
-Patch40: cups-avahi-1-config.patch
|
|
|
-Patch41: cups-avahi-2-backend.patch
|
|
|
-Patch42: cups-avahi-3-timeouts.patch
|
|
|
-Patch43: cups-avahi-4-poll.patch
|
|
|
-Patch44: cups-avahi-5-services.patch
|
|
|
-
|
|
|
-Patch45: cups-icc.patch
|
|
|
-
|
|
|
-Patch100: cups-1.4.6-fix-template-ja.patch
|
|
|
+Patch12: cups-eggcups.patch
|
|
|
+Patch13: cups-driverd-timeout.patch
|
|
|
+Patch14: cups-strict-ppd-line-length.patch
|
|
|
+Patch15: cups-logrotate.patch
|
|
|
+Patch16: cups-usb-paperout.patch
|
|
|
+Patch17: cups-res_init.patch
|
|
|
+Patch18: cups-filter-debug.patch
|
|
|
+Patch19: cups-uri-compat.patch
|
|
|
+Patch20: cups-str3382.patch
|
|
|
+Patch21: cups-0755.patch
|
|
|
+Patch22: cups-hp-deviceid-oid.patch
|
|
|
+Patch23: cups-dnssd-deviceid.patch
|
|
|
+Patch24: cups-ricoh-deviceid-oid.patch
|
|
|
+Patch25: cups-systemd-socket.patch
|
|
|
+Patch26: cups-lpd-manpage.patch
|
|
|
+Patch27: cups-avahi-address.patch
|
|
|
+Patch28: cups-usb-timeout.patch
|
|
|
+Patch29: cups-enum-all.patch
|
|
|
+Patch30: cups-stringpool-rdar15382819.patch
|
|
|
+Patch31: cups-dymo-deviceid.patch
|
|
|
+Patch32: cups-freebind.patch
|
|
|
+Patch33: cups-no-gcry.patch
|
|
|
+Patch34: cups-libusb-quirks.patch
|
|
|
+Patch35: cups-use-ipp1.1.patch
|
|
|
+Patch36: cups-avahi-no-threaded.patch
|
|
|
+Patch37: cups-gz-crc.patch
|
|
|
+Patch39: cups-ipp-multifile.patch
|
|
|
+Patch40: cups-full-relro.patch
|
|
|
+Patch41: cups-web-devices-timeout.patch
|
|
|
+Patch43: cups-final-content-type.patch
|
|
|
+Patch44: cups-jobhistory.patch
|
|
|
+Patch45: cups-journal.patch
|
|
|
+Patch46: cups-synconclose.patch
|
|
|
+Patch47: cups-dbus-notifier.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: e2fsprogs-devel
|
|
|
+BuildRequires: libusb1-devel
|
|
|
+BuildRequires: openldap-devel
|
|
|
+BuildRequires: openssl-devel
|
|
|
+BuildRequires: pam-devel
|
|
|
+BuildRequires: pkgconfig
|
|
|
BuildRequires: poppler-utils
|
|
|
-%if %use_dbus
|
|
|
-BuildRequires: dbus-devel >= 0.90
|
|
|
-Requires: dbus >= 0.90
|
|
|
-%endif
|
|
|
+BuildRequires: python-cups
|
|
|
+
|
|
|
|
|
|
-%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.
|
|
|
-%patch4 -p1 -b .serial
|
|
|
+# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
|
|
|
+%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
|
|
|
-# More sophisticated implementation of cupsGetPassword than getpass.
|
|
|
-%patch14 -p1 -b .getpass
|
|
|
-# Increase driverd timeout to 70s to accommodate foomatic.
|
|
|
-%patch15 -p1 -b .driverd-timeout
|
|
|
+%patch12 -p1 -b .eggcups
|
|
|
+# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
|
|
|
+%patch13 -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
|
|
|
-# Simplify the DNSSD parts so they can build using the compat library.
|
|
|
-%patch19 -p1 -b .build
|
|
|
-# Re-initialise the resolver on failure in httpAddrGetList().
|
|
|
-%patch20 -p1 -b .res_init
|
|
|
+%patch16 -p1 -b .usb-paperout
|
|
|
+# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
|
|
|
+%patch17 -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
|
|
|
-# Fix support for older CUPS servers in cupsGetDests.
|
|
|
-%patch23 -p1 -b .cups-get-classes
|
|
|
+%patch19 -p1 -b .uri-compat
|
|
|
# Fix temporary filename creation.
|
|
|
-%patch24 -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
|
|
|
+%patch20 -p1 -b .str3382
|
|
|
# Use mode 0755 for binaries and libraries where appropriate.
|
|
|
-%patch27 -p1 -b .0755
|
|
|
-# Handle SNMP supply level quirks (bug #581825).
|
|
|
-%patch28 -p1 -b .snmp-quirks
|
|
|
+%patch21 -p1 -b .0755
|
|
|
# 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
|
|
|
-# Adjust texttops output to be in natural orientation (STR #3563).
|
|
|
-# This fixes page-label orientation when texttops is used in the
|
|
|
-# filter chain (bug #572338).
|
|
|
-%patch32 -p1 -b .texttops-rotate-page
|
|
|
-# Use numeric addresses for interfaces unless HostNameLookups are
|
|
|
-# turned on (bug #583054).
|
|
|
-# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
|
|
|
-%patch33 -p1 -b .usb-parallel
|
|
|
-# Set the default RIPCache to 128m (STR #3535, bug #549901).
|
|
|
-%patch34 -p1 -b .str3535
|
|
|
-# Avoid busy loop in cups-polld (bug #720921).
|
|
|
-%patch35 -p1 -b .polld-busy-loop
|
|
|
-# Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
|
|
|
-%patch36 -p1 -b .CVE-2011-2896
|
|
|
-# Fixed string manipulation in the dbus notifier (STR #3947, bug #741833).
|
|
|
-%patch37 -p1 -b .str3947
|
|
|
-
|
|
|
-# Avahi support:
|
|
|
-# - discovery in the dnssd backend
|
|
|
-# - service announcement in the scheduler
|
|
|
-%patch40 -p1 -b .avahi-1-config
|
|
|
-%patch41 -p1 -b .avahi-2-backend
|
|
|
-%patch42 -p1 -b .avahi-3-timeouts
|
|
|
-%patch43 -p1 -b .avahi-4-poll
|
|
|
-%patch44 -p1 -b .avahi-5-services
|
|
|
-
|
|
|
-# ICC colord support.
|
|
|
-%patch45 -p1 -b .icc
|
|
|
+%patch24 -p1 -b .ricoh-deviceid-oid
|
|
|
+# Add support for systemd socket activation (patch from Lennart
|
|
|
+# Poettering).
|
|
|
+%patch25 -p1 -b .systemd-socket
|
|
|
+# Talk about systemd in cups-lpd manpage (part of bug #884641).
|
|
|
+%patch26 -p1 -b .lpd-manpage
|
|
|
+# Use IP address when resolving DNSSD URIs (bug #948288).
|
|
|
+%patch27 -p1 -b .avahi-address
|
|
|
+# Prevent USB timeouts causing incorrect print output (bug #1026914).
|
|
|
+%patch28 -p1 -b .usb-timeout
|
|
|
+# Return from cupsEnumDests() once all records have been returned.
|
|
|
+%patch29 -p1 -b .enum-all
|
|
|
+# Prevent stringpool damage leading to memory leaks (bug #974048).
|
|
|
+%patch30 -p1 -b .stringpool-rdar15382819
|
|
|
+# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
|
|
+%patch31 -p1 -b .dymo-deviceid
|
|
|
+# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
|
|
|
+%patch32 -p1 -b .freebind
|
|
|
+# Don't link against libgcrypt needlessly.
|
|
|
+%patch33 -p1 -b .no-gcry
|
|
|
+# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
|
|
|
+%patch34 -p1 -b .libusb-quirks
|
|
|
+# Default to IPP/1.1 for now (bug #977813).
|
|
|
+%patch35 -p1 -b .use-ipp1.1
|
|
|
+# Don't use D-Bus from two threads (bug #979748).
|
|
|
+%patch36 -p1 -b .avahi-no-threaded
|
|
|
+# Avoid sign-extending CRCs for gz decompression (bug #983486).
|
|
|
+%patch37 -p1 -b .gz-crc
|
|
|
+# 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 -
|
|
|
-d %{_localstatedir}/run/cups/certs 0511 lp sys -
|
|
|
+# See tmpfiles.d(5) for details
|
|
|
+
|
|
|
+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
|
|
|
-%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}/cups
|
|
|
%{_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
|
|
|
|
tomop