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

diff --git a/cups.spec b/cups.spec
index 23375c6..c48f8a2 100644
--- a/cups.spec
+++ b/cups.spec
@@ -39,7 +39,6 @@ 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
@@ -68,11 +67,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
@@ -254,7 +253,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 
 %if %{with avahi}
@@ -334,7 +332,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.
@@ -353,7 +351,7 @@ 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/banners/*
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/data/testprint
 
 %clean
@@ -482,6 +480,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