X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=eefd92ffd4f6f5d7e0fea5949af13adf7215dd2e;hb=HEAD;hp=a7dcdcb96673dd7ad68f0eff426b32526ca2dc76;hpb=200bc65051aeb41350512f5cdd03c119c192189f;p=packages%2Fcups.git

diff --git a/cups.spec b/cups.spec
index a7dcdcb..eb31b5c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,19 +6,19 @@
 %bcond_without	gssapi		# GSSAPI support
 %bcond_with	lspp		# audit and SELinux label support (lspp patch)
 %bcond_with	tcp_wrappers	# tcp_wrappers/libwrap support
-%bcond_without	python		# Python support in web interface
 %bcond_without	static_libs	# static library
+%bcond_without	systemd		# systemd
 
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
-Version:	2.2.8
-Release:	2
+Version:	2.4.8
+Release:	1
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest)
 Group:		Applications/Printing
-Source0:	https://github.com/apple/cups/releases/download/v%{version}/%{name}-%{version}-source.tar.gz
-# Source0-md5:	33150d08993a04c8e22176e93805a051
+Source0:	https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
+# Source0-md5:	3fdd9a5249f090cd35e324246ef0e3e4
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -37,31 +37,23 @@ Patch9:		%{name}-verbose-compilation.patch
 Patch10:	%{name}-peercred.patch
 Patch11:	%{name}-usb.patch
 Patch12:	%{name}-desktop.patch
-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
 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
 
 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/
+URL:		https://openprinting.github.io/cups/
 BuildRequires:	acl-devel
 %{?with_lspp:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.60
@@ -80,11 +72,11 @@ BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.641
-BuildRequires:	systemd-devel
+%{?with_systemd:BuildRequires:	systemd-devel}
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 Requires:	%{name}-ppdc = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.77.3
 Requires:	rc-scripts
@@ -159,7 +151,7 @@ Summary:	Common Unix Printing System - PPD manipulation utilities
 Summary(pl.UTF-8):	Narzędzia CUPS do operacji na plikach PPD
 License:	GPL v2
 Group:		Applications/Printing
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 
 %description ppdc
 This package provides utilities to generate and manipulate PPD files.
@@ -173,7 +165,7 @@ Summary:	Common Unix Printing System Clients
 Summary(pl.UTF-8):	Aplikacje klienckie dla CUPS
 License:	GPL v2
 Group:		Applications/Printing
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 Provides:	printingclient
 Obsoletes:	printingclient
 
@@ -190,8 +182,8 @@ Summary(pt_BR.UTF-8):	Sistema Unix de Impressão - bibliotecas para uso em clien
 License:	LGPL v2
 Group:		Libraries
 Provides:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	cups-libs
-Obsoletes:	libcups1
+Obsoletes:	cups-libs < 1:1.1.14-2
+Obsoletes:	libcups1 < 1:2
 
 %description lib
 Common Unix Printing System Libraries.
@@ -209,7 +201,7 @@ Summary(pt_BR.UTF-8):	Sistema Unix de Impressão - bibliotecas para uso em clien
 License:	LGPL v2
 Group:		Libraries
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
-Obsoletes:	libcups1
+Obsoletes:	libcups1 < 1:2
 
 %description image-lib
 Common Unix Printing System Libraries - images manipalation.
@@ -236,7 +228,7 @@ Requires:	zlib-devel
 Requires:	libjpeg-devel
 Requires:	libpng-devel
 Requires:	libtiff-devel
-Obsoletes:	libcups1-devel
+Obsoletes:	libcups1-devel < 1:2
 
 %description devel
 Common Unix Printing System development files.
@@ -282,27 +274,17 @@ bibliotecas do CUPS.
 # why it hasn't been merged for so long (and why no other distro uses it)
 #%patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch18 -p1
 
-%if %{with avahi}
-%patch100 -p1
-%patch101 -p1
-%endif
-
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
-%patch106 -p1
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
 %patch110 -p1
-%patch111 -p1
 
 %patch113 -p1
 %patch114 -p1
@@ -314,7 +296,6 @@ bibliotecas do CUPS.
 %{__aclocal} -I config-scripts
 %{__autoconf}
 %configure \
-	--libdir=%{_ulibdir} \
 	--enable-acl \
 	--enable-avahi%{!?with_avahi:=no} \
 	--disable-cdsassl \
@@ -337,12 +318,13 @@ bibliotecas do CUPS.
 	--with-log-file-perm=0640 \
 	--with-dbusdir=/etc/dbus-1 \
 	--with-docdir=%{_ulibdir}/%{name}/cgi-bin \
+	--with-pkgconfpath=%{_pkgconfigdir} \
 	--with-printcap=/etc/printcap \
 	%{?with_dnssd:--with-dnssd-libs=x} \
 	%{?with_dnssd:--with-dnssd-includes=x} \
 	--with-optim=-Wno-format-y2k \
-	%{?with_python:--with-python=%{_bindir}/python} \
-	--with-systemd=%{systemdunitdir}
+	%{?with_systemd:--with-systemd=%{systemdunitdir}} \
+	%{!?with_systemd:--disable-systemd}
 
 %{__make} %{?debug:OPTIONS="-DDEBUG"}
 
@@ -358,14 +340,6 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,securit
 	CUPS_USER=$(id -u) \
 	CUPS_GROUP=$(id -g)
 
-if [ "%{_lib}" != "lib" ] ; then
-	install -d $RPM_BUILD_ROOT%{_libdir}
-	mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
-%if %{with static_libs}
-	mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
-%endif
-fi
-
 %if %{with avahi}
 ln -s %{_ulibdir}/cups/backend/dnssd $RPM_BUILD_ROOT%{_ulibdir}/cups/backend/mdns
 %endif
@@ -422,20 +396,20 @@ fi
 /sbin/chkconfig --add cups
 %service cups restart "cups daemon"
 /sbin/rmmod usblp > /dev/null 2>&1 || :
-%systemd_post org.cups.cupsd.service org.cups.cupd.socket org.cups.cupsd.path
+%systemd_post cups.service cups.socket cups.path
 
 %preun
 if [ "$1" = "0" ]; then
 	%service cups stop
 	/sbin/chkconfig --del cups
 fi
-%systemd_preun org.cups.cupsd.service org.cups.cupsd.socket org.cups.cupsd.path
+%systemd_preun cups.service cups.socket cups.path
 
 %postun
 %systemd_reload
 
 %triggerpostun -- cups < 1:1.5.2-1
-%systemd_trigger org.cups.cupsd.service org.cups.cupsd.socket org.cups.cupsd.path
+%systemd_trigger cups.service cups.socket cups.path
 
 %post	lib -p /sbin/ldconfig
 %postun	lib -p /sbin/ldconfig
@@ -452,28 +426,32 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt
+%doc *.md
 %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
-%{systemdunitdir}/org.cups.cupsd.service
-%{systemdunitdir}/org.cups.cupsd.socket
-%{systemdunitdir}/org.cups.cupsd.path
+%if %{with systemd}
+%{systemdunitdir}/cups.service
+%{systemdunitdir}/cups.socket
+%{systemdunitdir}/cups.path
 %{systemdtmpfilesdir}/%{name}.conf
+%endif
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf
 %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cups-files.conf
+%attr(640,root,lp) %{_sysconfdir}/%{name}/cups-files.conf.default
 %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cupsd.conf
 %attr(640,root,lp) %{_sysconfdir}/%{name}/cupsd.conf.default
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mailto.conf
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.conf
+%attr(640,root,lp) %{_sysconfdir}/%{name}/snmp.conf.default
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups
 %dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl
 %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
-%attr(755,root,root) %{_bindir}/cupstestdsc
+%attr(755,root,root) %{_bindir}/ippeveprinter
 %attr(755,root,root) %{_sbindir}/cupsctl
 %attr(755,root,root) %{_sbindir}/cupsd
 %attr(755,root,root) %{_sbindir}/cupsfilter
@@ -487,7 +465,6 @@ fi
 %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
@@ -501,12 +478,17 @@ fi
 %{_ulibdir}/cups/cgi-bin/*.html
 %{_ulibdir}/cups/cgi-bin/*.png
 %{_ulibdir}/cups/cgi-bin/*.txt
+%lang(da) %{_ulibdir}/cups/cgi-bin/da
 %lang(de) %{_ulibdir}/cups/cgi-bin/de
 %lang(es) %{_ulibdir}/cups/cgi-bin/es
+%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
 %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/command
+%attr(755,root,root) %{_ulibdir}/cups/command/ippevepcl
+%attr(755,root,root) %{_ulibdir}/cups/command/ippeveps
 %dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-driverd
@@ -516,7 +498,6 @@ fi
 %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
@@ -547,6 +528,7 @@ fi
 
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
+%lang(da) %{_datadir}/cups/templates/da
 %lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
 %lang(fr) %{_datadir}/cups/templates/fr
@@ -555,7 +537,7 @@ fi
 %lang(ru) %{_datadir}/cups/templates/ru
 %{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstestppd.1*
-%{_mandir}/man1/cupstestdsc.1*
+%{_mandir}/man1/ippeveprinter.1*
 %{_mandir}/man5/classes.conf.5*
 %{_mandir}/man5/cups-files.conf.5*
 %{_mandir}/man5/cups-snmp.conf.5*
@@ -569,6 +551,8 @@ fi
 %{_mandir}/man5/subscriptions.conf.5*
 %{_mandir}/man7/backend.7*
 %{_mandir}/man7/filter.7*
+%{_mandir}/man7/ippevepcl.7*
+%{_mandir}/man7/ippeveps.7*
 %{_mandir}/man7/notifier.7*
 %{_mandir}/man8/cups-deviced.8*
 %{_mandir}/man8/cups-driverd.8*
@@ -605,8 +589,10 @@ fi
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cups-lpd
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-lpd
-%{systemdunitdir}/org.cups.cups-lpd.socket
-%{systemdunitdir}/org.cups.cups-lpd@.service
+%if %{with systemd}
+%{systemdunitdir}/cups-lpd.socket
+%{systemdunitdir}/cups-lpd@.service
+%endif
 %{_mandir}/man8/cups-lpd.8*
 
 %files ppdc
@@ -630,7 +616,7 @@ fi
 %defattr(644,root,root,755)
 %attr(644,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/client.conf
 %attr(755,root,root) %{_bindir}/cancel
-%attr(755,root,root) %{_bindir}/ippfind
+%{?with_avahi:%attr(755,root,root) %{_bindir}/ippfind}
 %attr(755,root,root) %{_bindir}/ipptool
 %attr(755,root,root) %{_bindir}/lp
 %attr(755,root,root) %{_bindir}/lpoptions
@@ -638,9 +624,7 @@ fi
 %attr(755,root,root) %{_bindir}/lpr
 %attr(755,root,root) %{_bindir}/lprm
 %attr(755,root,root) %{_bindir}/lpstat
-%attr(755,root,root) %{_sbindir}/accept
 %attr(755,root,root) %{_sbindir}/cupsaccept
-%attr(755,root,root) %{_sbindir}/cupsaddsmb
 %attr(755,root,root) %{_sbindir}/cupsenable
 %attr(755,root,root) %{_sbindir}/cupsdisable
 %attr(755,root,root) %{_sbindir}/cupsreject
@@ -650,12 +634,11 @@ fi
 %attr(755,root,root) %{_sbindir}/lpc
 %attr(755,root,root) %{_sbindir}/lpinfo
 %attr(755,root,root) %{_sbindir}/lpmove
-%attr(755,root,root) %{_sbindir}/reject
 %{_datadir}/cups/ipptool
 %{_desktopdir}/cups.desktop
 %{_iconsdir}/hicolor/*/apps/cups.png
 %{_mandir}/man1/cancel.1*
-%{_mandir}/man1/ippfind.1*
+%{?with_avahi:%{_mandir}/man1/ippfind.1*}
 %{_mandir}/man1/ipptool.1*
 %{_mandir}/man1/lp.1*
 %{_mandir}/man1/lpoptions.1*
@@ -664,9 +647,7 @@ fi
 %{_mandir}/man1/lprm.1*
 %{_mandir}/man1/lpstat.1*
 %{_mandir}/man5/client.conf.5*
-%{_mandir}/man8/accept.8*
 %{_mandir}/man8/cupsaccept.8*
-%{_mandir}/man8/cupsaddsmb.8*
 %{_mandir}/man8/cupsenable.8*
 %{_mandir}/man8/cupsdisable.8*
 %{_mandir}/man8/cupsreject.8*
@@ -674,19 +655,17 @@ fi
 %{_mandir}/man8/lpc.8*
 %{_mandir}/man8/lpinfo.8*
 %{_mandir}/man8/lpmove.8*
-%{_mandir}/man8/reject.8*
 
 %files lib
 %defattr(644,root,root,755)
 %dir %attr(755,root,lp) %{_sysconfdir}/%{name}
-%attr(755,root,root) %{_libdir}/libcups.so.*
-%attr(755,root,root) %{_libdir}/libcupscgi.so.*
-%attr(755,root,root) %{_libdir}/libcupsmime.so.*
-%attr(755,root,root) %{_libdir}/libcupsppdc.so.*
+%attr(755,root,root) %{_libdir}/libcups.so.2
 %dir %{_datadir}/cups
 %lang(ca) %{_localedir}/ca/cups_ca.po
 %lang(cs) %{_localedir}/cs/cups_cs.po
+%lang(da) %{_localedir}/da/cups_da.po
 %lang(de) %{_localedir}/de/cups_de.po
+%{_localedir}/en/cups_en.po
 %lang(es) %{_localedir}/es/cups_es.po
 %lang(fr) %{_localedir}/fr/cups_fr.po
 %lang(it) %{_localedir}/it/cups_it.po
@@ -697,25 +676,20 @@ fi
 
 %files image-lib
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcupsimage.so.*
+%attr(755,root,root) %{_libdir}/libcupsimage.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cups-config
 %attr(755,root,root) %{_libdir}/libcups.so
-%attr(755,root,root) %{_libdir}/libcupscgi.so
 %attr(755,root,root) %{_libdir}/libcupsimage.so
-%attr(755,root,root) %{_libdir}/libcupsmime.so
-%attr(755,root,root) %{_libdir}/libcupsppdc.so
 %{_includedir}/cups
+%{_pkgconfigdir}/cups.pc
 %{_mandir}/man1/cups-config.1*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcups.a
-%{_libdir}/libcupscgi.a
 %{_libdir}/libcupsimage.a
-%{_libdir}/libcupsmime.a
-%{_libdir}/libcupsppdc.a
 %endif