]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups.spec
projects / packages / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more verbose files, so we can track what belongs to cups and what to cups-filters...
[packages/cups.git] / cups.spec
diff --git a/cups.spec b/cups.spec
index 9398f9548dd7d4b252b977fe5c5529b5e41f15a7..0efc9bcc1f69d66d90ff0a6964e40a6d46c36400 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -14,7 +14,7 @@ Summary(pl.UTF-8):    Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
 Version:       1.7.0
-Release:       0.1
+Release:       3
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:         Applications/Printing
@@ -45,6 +45,9 @@ 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
+Patch19:       %{name}-jobhistory.patch
+Patch20:       %{name}-stringpool-rdar15382819.patch
 # avahi patches from fedora
 Patch100:      %{name}-avahi-address.patch
 Patch101:      %{name}-avahi-no-threaded.patch
@@ -83,12 +86,11 @@ Suggests:   ImageMagick-coder-pdf
 Suggests:      cups-filter-pstoraster
 Suggests:      poppler-progs
 Provides:      printingdaemon
-Obsoletes:     backend-parallel
-Obsoletes:     backend-serial
 Obsoletes:     perl-cups
 Obsoletes:     php-cups
 Obsoletes:     printingdaemon
 Conflicts:     ghostscript < 7.05.4
+Conflicts:     hplip < 3.13.11
 Conflicts:     logrotate < 3.7-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -267,6 +269,9 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %if %{with avahi}
 %patch100 -p1
@@ -369,11 +374,25 @@ 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
 
 %post
+# Deal with config migration due to CVE-2012-5519 (STR #4223)
+_keywords="^\(AccessLog\|CacheDir\|ConfigFilePerm\|\
+DataDir\|DocumentRoot\|ErrorLog\|FatalErrors\|\
+FileDevice\|FontPath\|Group\|LogFilePerm\|\
+LPDConfigFile\|PageLog\|Printcap\|PrintcapFormat\|\
+RemoteRoot\|RequestRoot\|ServerBin\|ServerCertificate\|\
+ServerKey\|ServerRoot\|SMBConfigFile\|StateDir\|\
+SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)"
+if [ -f %{_sysconfdir}/cups/cupsd.conf ] && grep -iq "$_keywords" %{_sysconfdir}/cups/cupsd.conf; then
+       echo "# Settings automatically moved from cupsd.conf by RPM package:" >> %{_sysconfdir}/cups/cups-files.conf
+       grep -i "$_keywords" %{_sysconfdir}/cups/cupsd.conf >> %{_sysconfdir}/cups/cups-files.conf || :
+       %{__sed} -i -e "s,$_keywords,#&,ig" %{_sysconfdir}/cups/cupsd.conf || :
+fi
 /sbin/chkconfig --add cups
 %service cups restart "cups daemon"
 /sbin/rmmod usblp > /dev/null 2>&1 || :
@@ -389,7 +408,7 @@ fi
 %postun
 %systemd_reload
 
-%triggerpostun -- cups < 1.5.2-1
+%triggerpostun -- cups < 1:1.5.2-1
 %systemd_trigger cups.service cups.socket cups.path
 
 %post  lib -p /sbin/ldconfig
@@ -408,7 +427,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc *.txt
-%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/*
+%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/cups
 %attr(754,root,root) /etc/rc.d/init.d/cups
 /etc/dbus-1/system.d/cups.conf
 /etc/modprobe.d/cups.conf
@@ -437,7 +456,21 @@ fi
 %attr(755,root,root) %{_sbindir}/cupsfilter
 
 %dir %{_ulibdir}/cups
-%dir %{_ulibdir}/cups/*
+%dir %{_ulibdir}/cups/backend
+%if %{with avahi}
+%attr(755,root,root) %{_ulibdir}/cups/backend/dnssd
+%attr(755,root,root) %{_ulibdir}/cups/backend/mdns
+%endif
+%attr(755,root,root) %{_ulibdir}/cups/backend/http
+%attr(755,root,root) %{_ulibdir}/cups/backend/https
+%attr(755,root,root) %{_ulibdir}/cups/backend/ipp
+%attr(755,root,root) %{_ulibdir}/cups/backend/ipp14
+%attr(755,root,root) %{_ulibdir}/cups/backend/ipps
+%attr(755,root,root) %{_ulibdir}/cups/backend/lpd
+%attr(755,root,root) %{_ulibdir}/cups/backend/snmp
+%attr(755,root,root) %{_ulibdir}/cups/backend/socket
+
+%dir %{_ulibdir}/cups/cgi-bin
 %{_ulibdir}/cups/cgi-bin/help
 %{_ulibdir}/cups/cgi-bin/images
 %attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi
@@ -452,30 +485,36 @@ fi
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
 %lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
-%if %{with avahi}
-%attr(755,root,root) %{_ulibdir}/cups/backend/dnssd
-%attr(755,root,root) %{_ulibdir}/cups/backend/mdns
-%endif
-%attr(755,root,root) %{_ulibdir}/cups/backend/http
-%attr(755,root,root) %{_ulibdir}/cups/backend/https
-%attr(755,root,root) %{_ulibdir}/cups/backend/ipp
-%attr(755,root,root) %{_ulibdir}/cups/backend/ipp14
-%attr(755,root,root) %{_ulibdir}/cups/backend/ipps
-%attr(755,root,root) %{_ulibdir}/cups/backend/lpd
-%attr(755,root,root) %{_ulibdir}/cups/backend/snmp
-%attr(755,root,root) %{_ulibdir}/cups/backend/socket
+%dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-driverd
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-exec
-%attr(755,root,root) %{_ulibdir}/cups/filter/*
-%attr(755,root,root) %{_ulibdir}/cups/monitor/*
-%attr(755,root,root) %{_ulibdir}/cups/notifier/*
-
-%{_datadir}/cups/data
-%{_datadir}/cups/drivers
-%{_datadir}/cups/drv
-%{_datadir}/cups/examples
-%{_datadir}/cups/mime
+%dir %{_ulibdir}/cups/filter
+%attr(755,root,root) %{_ulibdir}/cups/filter/commandtops
+%attr(755,root,root) %{_ulibdir}/cups/filter/gziptoany
+%attr(755,root,root) %{_ulibdir}/cups/filter/pstops
+%attr(755,root,root) %{_ulibdir}/cups/filter/rastertodymo
+%attr(755,root,root) %{_ulibdir}/cups/filter/rastertoepson
+%attr(755,root,root) %{_ulibdir}/cups/filter/rastertohp
+%attr(755,root,root) %{_ulibdir}/cups/filter/rastertolabel
+%attr(755,root,root) %{_ulibdir}/cups/filter/rastertopwg
+%dir %{_ulibdir}/cups/monitor
+%attr(755,root,root) %{_ulibdir}/cups/monitor/bcp
+%attr(755,root,root) %{_ulibdir}/cups/monitor/tbcp
+%dir %{_ulibdir}/cups/notifier
+%attr(755,root,root) %{_ulibdir}/cups/notifier/dbus
+%attr(755,root,root) %{_ulibdir}/cups/notifier/mailto
+%attr(755,root,root) %{_ulibdir}/cups/notifier/rss
+
+%dir %{_datadir}/cups/data
+%dir %{_datadir}/cups/drivers
+%dir %{_datadir}/cups/drv
+%{_datadir}/cups/drv/sample.drv
+%dir %{_datadir}/cups/examples
+%{_datadir}/cups/examples/*.drv
+%dir %{_datadir}/cups/mime
+%{_datadir}/cups/mime/mime.convs
+%{_datadir}/cups/mime/mime.types
 %dir %{_datadir}/cups/model
 # dirs for gimp-print-cups-4.2.7-1
 %dir %{_datadir}/cups/model/C
@@ -486,7 +525,13 @@ fi
 %lang(pl) %dir %{_datadir}/cups/model/pl
 %lang(sv) %dir %{_datadir}/cups/model/sv
 
-%{_datadir}/cups/ppdc
+%dir %{_datadir}/cups/ppdc
+%{_datadir}/cups/ppdc/epson.h
+%{_datadir}/cups/ppdc/hp.h
+%{_datadir}/cups/ppdc/label.h
+%{_datadir}/cups/ppdc/font.defs
+%{_datadir}/cups/ppdc/media.defs
+%{_datadir}/cups/ppdc/raster.defs
 
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
@@ -504,7 +549,18 @@ fi
 %{_mandir}/man7/backend.7*
 %{_mandir}/man7/filter.7*
 %{_mandir}/man7/notifier.7*
-%{_mandir}/man5/*
+%{_mandir}/man5/classes.conf.5*
+%{_mandir}/man5/client.conf.5*
+%{_mandir}/man5/cups-files.conf.5*
+%{_mandir}/man5/cups-snmp.conf.5*
+%{_mandir}/man5/cupsd.conf.5*
+%{_mandir}/man5/ipptoolfile.5*
+%{_mandir}/man5/mailto.conf.5*
+%{_mandir}/man5/mime.convs.5*
+%{_mandir}/man5/mime.types.5*
+%{_mandir}/man5/ppdcfile.5*
+%{_mandir}/man5/printers.conf.5*
+%{_mandir}/man5/subscriptions.conf.5*
 %{_mandir}/man8/accept.8*
 %{_mandir}/man8/cups-deviced.8*
 %{_mandir}/man8/cups-driverd.8*
@@ -514,7 +570,10 @@ fi
 %{_mandir}/man8/cupsd.8*
 %{_mandir}/man8/cupsenable.8*
 %{_mandir}/man8/cupsfilter.8*
-%{_mandir}/man8/lp*
+%{_mandir}/man8/lpadmin.8*
+%{_mandir}/man8/lpc.8*
+%{_mandir}/man8/lpinfo.8*
+%{_mandir}/man8/lpmove.8*
 
 %dir %attr(775,root,lp) /var/cache/cups
 %dir %attr(755,root,lp) /var/lib/cups
USB backend for CUPS
This page took 0.049219 seconds and 4 git commands to generate.