]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups.spec
- added tmpfiles config for systemd
[packages/cups.git] / cups.spec
index 9b70ae96c96b6b322aef65ba81e2082b8031aa74..2f351e12e32766acfeb5dbe671f506decf6c2ed0 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
 %bcond_with    gnutls          # use GNU TLS for SSL/TLS support (instead of OpenSSL)
-%bcond_without dnssd
+%bcond_with    dnssd           # DNS Service Discovery support (obsoleted by Avahi patch)
+%bcond_without avahi           # DNS Service Discovery support via Avahi
 %bcond_without ldap            # do not include LDAP support
 %bcond_without gssapi          # do not include GSSAPI support
 %bcond_without php             # don't build PHP extension/support in web interface
 %bcond_without python          # don't build Python support in web interface
 %bcond_without slp             # do not include SLP support
 %bcond_without static_libs     # don't build static library
-#
-%include       /usr/lib/rpm/macros.perl
-%define                pdir CUPS
 
+%define                pdir CUPS
+%include       /usr/lib/rpm/macros.perl
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       1.4.3
-Release:       1
+Version:       1.5.0
+Release:       8
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:         Applications/Printing
 Source0:       http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: e70b1c3f60143d7310c1d74c111a21ab
+# Source0-md5: e54ed09ede2340fc3014913333520fe4
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
 Source4:       %{name}.mailto.conf
 Source5:       %{name}-lpd.inetd
 Source6:       %{name}-modprobe.conf
+Source7:       %{name}.tmpfiles
 # svn diff http://svn.easysw.com/public/cups/tags/release-1.4.3/ http://svn.easysw.com/public/cups/branches/branch-1.4/ > cups-branch.diff
 # + drop config-scripts/cups-common.m4 change
 Patch0:                %{name}-config.patch
@@ -41,44 +42,54 @@ Patch7:             %{name}-no-polluted-krb5config.patch
 Patch9:                %{name}-verbose-compilation.patch
 Patch10:       %{name}-peercred.patch
 Patch11:       %{name}-usb.patch
+Patch12:       %{name}-desktop.patch
+Patch13:       %{name}-ssl-segfault.patch
+Patch14:       %{name}-auth.patch
+# avahi patches from fedora
+Patch100:      %{name}-avahi-1-config.patch
+Patch101:      %{name}-avahi-2-backend.patch
+Patch102:      %{name}-avahi-3-timeouts.patch
+Patch103:      %{name}-avahi-4-poll.patch
+Patch104:      %{name}-avahi-5-services.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-%{?with_dnssd:BuildRequires:   avahi-compat-libdns_sd-devel}
+%{?with_dnssd:BuildRequires:    avahi-compat-libdns_sd-devel}
+%{?with_avahi:BuildRequires: avahi-devel}
 BuildRequires: dbus-devel
 BuildRequires: glibc-headers
-%{?with_gssapi:BuildRequires:  heimdal-devel}
 %{?with_gnutls:BuildRequires:  gnutls-devel}
-%{?with_java:BuildRequires:    jar}
-%{?with_java:BuildRequires:    jdk}
-%{?with_java:BuildRequires:    jpackage-utils}
+%{?with_gssapi:BuildRequires:  heimdal-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: libpaper-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: libusb-devel
 BuildRequires: libusb-compat-devel
+BuildRequires: libusb-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 %{?with_slp:BuildRequires:     openslp-devel}
 %{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
 %{?with_php:BuildRequires:     php-devel >= 4:5.0.0}
 BuildRequires: pkgconfig
-%{?with_java:BuildRequires:    rpm-javaprov}
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.344
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      openssl-tools
 Requires:      pam >= 0.77.3
+Requires:      perl-modules
 Requires:      rc-scripts
+Suggests:      ImageMagick-coder-pdf
+Suggests:      cups-filter-pstoraster
+Suggests:      ghostscript-cups
+Suggests:      poppler-progs
 Provides:      printingdaemon
 Obsoletes:     printingdaemon
 Conflicts:     ghostscript < 7.05.4
 Conflicts:     logrotate < 3.7-4
-Suggests:      cups-filter-pstoraster
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _ulibdir        %{_prefix}/lib
@@ -238,35 +249,6 @@ PHP module for Common Unix Printing System.
 %description -n php-cups -l pl.UTF-8
 Moduł PHP do ogólnego systemu druku dla Uniksa.
 
-%package -n java-cups
-Summary:       CUPS java classes
-Summary(pl.UTF-8):     Klasy javy CUPS
-License:       GPL v2 + openssl exception
-Group:         Libraries/Java
-Requires:      jpackage-utils
-
-%description -n java-cups
-Common Unix Printing System Java classes.
-
-%description -n java-cups -l pl.UTF-8
-Klasy javy do ogólnego systemu druku dla Uniksa.
-
-%package -n java-cups-javadoc
-Summary:       Online manual for %{name}
-Summary(pl.UTF-8):     Dokumentacja online do %{name}
-License:       GPL v2 + openssl exception
-Group:         Documentation
-Requires:      jpackage-utils
-
-%description -n java-cups-javadoc
-Documentation for %{name}.
-
-%description -n java-cups-javadoc -l pl.UTF-8
-Dokumentacja do %{name}.
-
-%description -n java-cups-javadoc -l fr.UTF-8
-Javadoc pour %{name}.
-
 %package backend-usb
 Summary:       USB backend for CUPS
 Summary(pl.UTF-8):     Backend USB dla CUPS-a
@@ -331,11 +313,22 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+# why it hasn't been merged for so long (and why no other distro uses it)
+#%patch6 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
+# why it hasn't been merged for so long (and why no other distro uses it)
+#%patch11 -p1
+%patch12 -p1
+%patch13 -p0
+%patch14 -p0
+
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -353,6 +346,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --enable-shared \
        --enable-ssl \
        %{?debug:--enable-debug} \
+       --%{!?with_avahi:dis}%{?with_avahi:en}able-avahi \
        --%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \
        --%{!?with_ldap:dis}%{?with_ldap:en}able-ldap \
        --%{!?with_gssapi:dis}%{?with_gssapi:en}able-gssapi \
@@ -371,12 +365,11 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --with-optim=-Wno-format-y2k \
        %{?with_dnssd:--with-dnssd-libs=x} \
        %{?with_dnssd:--with-dnssd-includes=x} \
-       --with-java=%{_bindir}/java \
        %{?with_perl:--with-perl=%{_bindir}/perl} \
        %{?with_php:--with-php=%{_bindir}/php} \
        %{?with_python:--with-python=%{_bindir}/python}
 
-%{__make}
+%{__make} %{?debug:OPTIONS="-DDEBUG"}
 
 %{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile
 %{?with_php:%{__make} -C scripting/php PHPCONFIG=%{_bindir}/php-config}
@@ -398,7 +391,8 @@ cd ../..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,security,sysconfig/rc-inetd} \
        $RPM_BUILD_ROOT/var/run/cups \
-       $RPM_BUILD_ROOT/var/log/{,archive/}cups
+       $RPM_BUILD_ROOT/var/log/{,archive/}cups \
+       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
        BUILDROOT=$RPM_BUILD_ROOT \
@@ -428,12 +422,13 @@ EOF
        DESTDIR=$RPM_BUILD_ROOT
 %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 %{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
 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 %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf
+install %{SOURCE7} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.cups
@@ -541,12 +536,18 @@ fi
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
 %lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
-%exclude %{_ulibdir}/cups/backend/usb
-%exclude %{_ulibdir}/cups/backend/serial
-%exclude %{_ulibdir}/cups/backend/parallel
-%attr(755,root,root) %{_ulibdir}/cups/backend/*
+%attr(755,root,root) %{_ulibdir}/cups/backend/dnssd
+%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/ipps
+%attr(755,root,root) %{_ulibdir}/cups/backend/lpd
+%attr(755,root,root) %{_ulibdir}/cups/backend/mdns
+%attr(755,root,root) %{_ulibdir}/cups/backend/snmp
+%attr(755,root,root) %{_ulibdir}/cups/backend/socket
 %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/daemon/cups-polld
 %attr(755,root,root) %{_ulibdir}/cups/filter/*
 %attr(755,root,root) %{_ulibdir}/cups/monitor/*
@@ -587,7 +588,6 @@ fi
 %{_mandir}/man1/lppasswd.1*
 %{_mandir}/man1/ppd*.1*
 %{_mandir}/man7/backend.7*
-%{_mandir}/man7/drv.7*
 %{_mandir}/man7/filter.7*
 %{_mandir}/man7/notifier.7*
 %{_mandir}/man5/*
@@ -602,6 +602,7 @@ fi
 %{_mandir}/man8/cupsfilter.8*
 %{_mandir}/man8/lp*
 
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %attr(775,root,lp) /var/cache/cups
 %dir %attr(755,root,lp) /var/lib/cups
 %dir %attr(511,lp,sys) /var/lib/cups/certs
@@ -627,7 +628,6 @@ fi
 %attr(755,root,root) %{_libdir}/libcupsmime.so.*
 %attr(755,root,root) %{_libdir}/libcupsppdc.so.*
 %dir %{_datadir}/cups
-%{_datadir}/cups/charmaps
 %lang(da) %{_datadir}/locale/da/cups_da.po
 %lang(de) %{_datadir}/locale/de/cups_de.po
 %lang(es) %{_datadir}/locale/es/cups_es.po
@@ -652,6 +652,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}/ipptool
 %attr(755,root,root) %{_bindir}/lp
 %attr(755,root,root) %{_bindir}/lpoptions
 %attr(755,root,root) %{_bindir}/lpq
@@ -671,9 +672,11 @@ fi
 %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/ipptool.1*
 %{_mandir}/man1/lp.1*
 %{_mandir}/man1/lpoptions.1*
 %{_mandir}/man1/lpq.1*
This page took 0.072823 seconds and 4 git commands to generate.