]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups.spec
- switch to OpenPrinting cups 2.4.8
[packages/cups.git] / cups.spec
index 592b88675ca981b5f95beca9aead7a2f10d110d6..34540aa991d7e21e2cb21959b58f73b92cb70671 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -7,17 +7,18 @@
 %bcond_with    lspp            # audit and SELinux label support (lspp patch)
 %bcond_with    tcp_wrappers    # tcp_wrappers/libwrap support
 %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.3.3
-Release:       3
+Version:       2.4.8
+Release:       0.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: 412434ceefbdf3ec71bc9188a035f589
+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
@@ -36,32 +37,24 @@ Patch9:             %{name}-verbose-compilation.patch
 Patch10:       %{name}-peercred.patch
 Patch11:       %{name}-usb.patch
 Patch12:       %{name}-desktop.patch
-Patch13:       %{name}-systemd-socket.patch
-Patch14:       %{name}-backroot-readable.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
+Patch19:       job-name-too-long.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
-Patch118:      scx3400w-quirks.patchs
-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 +73,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 +152,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 +166,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 +183,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 +202,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 +229,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,40 +275,29 @@ 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
+%patch19 -p1
 
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
-%patch106 -p1
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
 %patch110 -p1
-%patch111 -p1
 
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
 %patch116 -p1
 %patch117 -p1
-%patch118 -p1
 
 %build
 %{__aclocal} -I config-scripts
 %{__autoconf}
 %configure \
-       --libdir=%{_ulibdir} \
        --enable-acl \
        --enable-avahi%{!?with_avahi:=no} \
        --disable-cdsassl \
@@ -338,11 +320,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-systemd=%{systemdunitdir}
+       %{?with_systemd:--with-systemd=%{systemdunitdir}} \
+       %{!?with_systemd:--disable-systemd}
 
 %{__make} %{?debug:OPTIONS="-DDEBUG"}
 
@@ -358,14 +342,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 +398,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
@@ -457,17 +433,21 @@ fi
 %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
@@ -500,8 +480,10 @@ 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
@@ -548,6 +530,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
@@ -608,8 +591,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
@@ -676,10 +661,11 @@ fi
 %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}/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
@@ -692,7 +678,7 @@ 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)
@@ -700,6 +686,7 @@ fi
 %attr(755,root,root) %{_libdir}/libcups.so
 %attr(755,root,root) %{_libdir}/libcupsimage.so
 %{_includedir}/cups
+%{_pkgconfigdir}/cups.pc
 %{_mandir}/man1/cups-config.1*
 
 %if %{with static_libs}
This page took 0.073533 seconds and 4 git commands to generate.