X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcups.git;a=blobdiff_plain;f=cups.spec;h=b8244b93a48f87f6be3a2dd58b2e3507d440b6fe;hp=23375c63d925430f9b088505dc3766fa1bc15fa6;hb=b3b509330e6840e7a1a1b6c08b72cbab040eb5d5;hpb=9fc3c00dcaa503e69ad7d76aae6a3f1c9b4be256

diff --git a/cups.spec b/cups.spec
index 23375c6..b8244b9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,13 +10,13 @@
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
-Version:	2.0.2
-Release:	2
+Version:	2.2.1
+Release:	1
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest)
 Group:		Applications/Printing
-Source0:	http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	6e0ea72dbafcf5baaa1cf4178e71096d
+Source0:	https://github.com/apple/cups/releases/download/v%{version}/%{name}-%{version}-source.tar.gz
+# Source0-md5:	a94da2a1e9dbdccb4f3836a38a431931
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -39,11 +39,26 @@ Patch13:	%{name}-systemd-socket.patch
 Patch14:	add-ipp-backend-of-cups-1.4.patch
 Patch15:	reactivate_recommended_driver.patch
 Patch16:	read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
-Patch17:	%{name}-use-ipp1.1.patch
 Patch18:	%{name}-final-content-type.patch
 # avahi patches from fedora
 Patch100:	%{name}-avahi-address.patch
 Patch101:	%{name}-avahi-no-threaded.patch
+Patch102:	cups-banners.patch
+Patch103:	cups-pid.patch
+Patch104:	cups-eggcups.patch
+Patch105:	cups-driverd-timeout.patch
+Patch106:	cups-logrotate.patch
+Patch107:	cups-res_init.patch
+Patch108:	cups-filter-debug.patch
+Patch109:	cups-hp-deviceid-oid.patch
+Patch110:	cups-dnssd-deviceid.patch
+Patch111:	cups-ricoh-deviceid-oid.patch
+Patch112:	cups-enum-all.patch
+Patch113:	cups-dymo-deviceid.patch
+Patch114:	cups-freebind.patch
+Patch115:	cups-ipp-multifile.patch
+Patch116:	cups-web-devices-timeout.patch
+Patch117:	cups-lspp.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.60
@@ -54,11 +69,8 @@ BuildRequires:	dbus-devel
 BuildRequires:	glibc-headers
 %{?with_gnutls:BuildRequires:	gnutls-devel}
 %{?with_gssapi:BuildRequires:	heimdal-devel}
-BuildRequires:	libjpeg-devel
 BuildRequires:	libpaper-devel
-BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel
 BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
@@ -68,11 +80,11 @@ BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	cups-filters
 Requires:	pam >= 0.77.3
 Requires:	rc-scripts
 Requires:	systemd-units >= 38
 Suggests:	ImageMagick-coder-pdf
+Suggests:	cups-filters
 Suggests:	poppler-progs
 Provides:	printingdaemon
 Obsoletes:	printingdaemon
@@ -170,8 +182,8 @@ Group:		Development/Libraries
 Requires:	%{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
-%{?with_gnutls:Requires:	gnutls-devel}
-%{?with_gssapi:Requires:	heimdal-devel}
+%{?with_gnutls:Requires: gnutls-devel}
+%{?with_gssapi:Requires: heimdal-devel}
 Requires:	zlib-devel
 # for libcupsimage
 Requires:	libjpeg-devel
@@ -254,7 +266,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 
 %if %{with avahi}
@@ -262,6 +273,23 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch101 -p1
 %endif
 
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
+%patch117 -p1
+
 %build
 %{__aclocal} -I config-scripts
 %{__autoconf}
@@ -292,7 +320,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 	%{?with_dnssd:--with-dnssd-includes=x} \
 	--with-optim=-Wno-format-y2k \
 	%{?with_python:--with-python=%{_bindir}/python} \
-	--with-systemdsystemunitdir=%{systemdunitdir}
+	--with-systemd=%{systemdunitdir}
 
 %{__make} %{?debug:OPTIONS="-DDEBUG"}
 
@@ -320,13 +348,13 @@ fi
 ln -s %{_ulibdir}/cups/backend/dnssd $RPM_BUILD_ROOT%{_ulibdir}/cups/backend/mdns
 %endif
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -pf %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf
 sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.cups
@@ -334,7 +362,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers}.conf
 
 cat >$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/client.conf <<'EOF'
 # Encryption Always
-# ServerName print.server.ip.or.name
+# ServerName enter.server.IP.or.name
 EOF
 
 # windows drivers can be put there.
@@ -352,10 +380,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
 
-# shipped in cups-filters
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/banners
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/data/testprint
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -424,7 +448,6 @@ fi
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups
 %dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl
-%dir %{_sysconfdir}/%{name}/interfaces
 %dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(755,root,root) %{_bindir}/cupstestppd
@@ -457,8 +480,11 @@ fi
 %{_ulibdir}/cups/cgi-bin/*.html
 %{_ulibdir}/cups/cgi-bin/*.png
 %{_ulibdir}/cups/cgi-bin/*.txt
+%lang(de) %{_ulibdir}/cups/cgi-bin/de
 %lang(es) %{_ulibdir}/cups/cgi-bin/es
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
+%lang(pt_BR) %{_ulibdir}/cups/cgi-bin/pt_BR
+%lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
 %dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
@@ -482,6 +508,7 @@ fi
 %attr(755,root,root) %{_ulibdir}/cups/notifier/mailto
 %attr(755,root,root) %{_ulibdir}/cups/notifier/rss
 
+%dir %{_datadir}/cups/banners
 %dir %{_datadir}/cups/data
 %dir %{_datadir}/cups/drivers
 %dir %{_datadir}/cups/drv
@@ -511,8 +538,11 @@ fi
 
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
+%lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
 %lang(ja) %{_datadir}/cups/templates/ja
+%lang(pt_BR) %{_datadir}/cups/templates/pt_BR
+%lang(ru) %{_datadir}/cups/templates/ru
 %{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
@@ -524,6 +554,7 @@ fi
 %{_mandir}/man5/cups-files.conf.5*
 %{_mandir}/man5/cups-snmp.conf.5*
 %{_mandir}/man5/cupsd.conf.5*
+%{_mandir}/man5/cupsd-logs.5*
 %{_mandir}/man5/ipptoolfile.5*
 %{_mandir}/man5/mailto.conf.5*
 %{_mandir}/man5/mime.convs.5*
@@ -538,7 +569,6 @@ fi
 %{_mandir}/man8/cupsctl.8*
 %{_mandir}/man8/cupsd.8*
 %{_mandir}/man8/cupsd-helper.8*
-%{_mandir}/man8/cupsd-logs.8*
 %{_mandir}/man8/cupsfilter.8*
 
 %dir %attr(775,root,lp) /var/cache/cups
@@ -565,13 +595,15 @@ fi
 %attr(755,root,root) %{_libdir}/libcupsmime.so.*
 %attr(755,root,root) %{_libdir}/libcupsppdc.so.*
 %dir %{_datadir}/cups
-%lang(ca) %{_datadir}/locale/ca/cups_ca.po
-%lang(cs) %{_datadir}/locale/cs/cups_cs.po
-%lang(es) %{_datadir}/locale/es/cups_es.po
-%lang(fr) %{_datadir}/locale/fr/cups_fr.po
-%lang(it) %{_datadir}/locale/it/cups_it.po
-%lang(ja) %{_datadir}/locale/ja/cups_ja.po
-%lang(ru) %{_datadir}/locale/ru/cups_ru.po
+%lang(ca) %{_localedir}/ca/cups_ca.po
+%lang(cs) %{_localedir}/cs/cups_cs.po
+%lang(de) %{_localedir}/de/cups_de.po
+%lang(es) %{_localedir}/es/cups_es.po
+%lang(fr) %{_localedir}/fr/cups_fr.po
+%lang(it) %{_localedir}/it/cups_it.po
+%lang(ja) %{_localedir}/ja/cups_ja.po
+%lang(pt_BR) %{_localedir}/pt_BR/cups_pt_BR.po
+%lang(ru) %{_localedir}/ru/cups_ru.po
 
 %files clients
 %defattr(644,root,root,755)