#
# 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 perl # don't build Perl 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.0
+Version: 1.5.1
Release: 0.1
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: bc5e777d4320cecdd1a64de8035171a8
+# Source0-md5: 7e7026f5b6392deae46f889129b196a7
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
Patch2: %{name}-options.patch
Patch3: %{name}-man_pages_linking.patch
Patch7: %{name}-no-polluted-krb5config.patch
Patch9: %{name}-verbose-compilation.patch
Patch10: %{name}-peercred.patch
+Patch11: %{name}-usb.patch
+Patch12: %{name}-desktop.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_gnutls:BuildRequires: gnutls-devel}
-%{?with_java:BuildRequires: jar}
-%{?with_java:BuildRequires: jdk}
-%{?with_java:BuildRequires: jpackage-utils}
-BuildRequires: heimdal-devel
+%{?with_gssapi:BuildRequires: heimdal-devel}
BuildRequires: libjpeg-devel
+BuildRequires: libpaper-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
-BuildRequires: openldap-devel
-BuildRequires: openslp-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
-# pstoraster:
-Suggests: cups-filter-pstoraster
-# Contains imagetops...:
-Suggests: kde4-kde3support
-# pdftops:
-Suggests: poppler-progs
-# pstops:
-Suggests: psutils
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _ulibdir %{_prefix}/lib
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
# for libcups
%{?with_gnutls:Requires: gnutls-devel}
-Requires: heimdal-devel
+%{?with_gssapi:Requires: heimdal-devel}
%{!?with_gnutls:Requires: openssl-devel}
Requires: zlib-devel
# for libcupsimage
%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
%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
+# why it hasn't been merged for so long (and why no other distro uses it)
+#%patch11 -p1
+%patch12 -p1
+
+%if %{with avahi}
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%endif
%build
%{__aclocal} -I config-scripts
%configure \
--libdir=%{_ulibdir} \
--disable-cdsassl \
+ --enable-libpaper \
+ --enable-libusb \
+ --enable-acl \
--enable-dbus \
+ --enable-image \
+ --enable-bannertops \
+ --enable-texttops \
--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 \
--%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
--%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
+ --%{!?with_slp:dis}%{?with_slp:en}able-slp \
%{?with_static_libs:--enable-static} \
--with-cups-user=lp \
--with-cups-group=lp \
--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} \
- %{?with_php:--with-php} \
- %{?with_python:--with-python}
+ %{?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}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security,sysconfig/rc-inetd} \
+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 \
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 %{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
%post
/sbin/chkconfig --add cups
%service cups restart "cups daemon"
+/sbin/rmmod usblp > /dev/null 2>&1 || :
%preun
if [ "$1" = "0" ]; then
%files
%defattr(644,root,root,755)
-#%doc *.gz doc/*.html doc/*.css doc/images
%doc *.txt
%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/*
%attr(754,root,root) /etc/rc.d/init.d/cups
/etc/dbus-1/system.d/cups.conf
+/etc/modprobe.d/cups.conf
%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}/cupsd.conf
%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) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs
-#%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups
%dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl
%dir %{_sysconfdir}/%{name}/interfaces
%attr(4755,lp,root) %{_bindir}/lppasswd
%attr(755,root,root) %{_bindir}/cupstestppd
%attr(755,root,root) %{_bindir}/cupstestdsc
+%attr(755,root,root) %{_bindir}/ppd*
%attr(755,root,root) %{_sbindir}/cupsctl
%attr(755,root,root) %{_sbindir}/cupsd
%attr(755,root,root) %{_sbindir}/cupsfilter
%attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi
%{_ulibdir}/cups/cgi-bin/*.css
%{_ulibdir}/cups/cgi-bin/*.html
-#%{_ulibdir}/cups/cgi-bin/*.ico
%{_ulibdir}/cups/cgi-bin/*.txt
%lang(de) %{_ulibdir}/cups/cgi-bin/de
%lang(es) %{_ulibdir}/cups/cgi-bin/es
%lang(eu) %{_ulibdir}/cups/cgi-bin/eu
-#%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
-#%lang(he) %{_ulibdir}/cups/cgi-bin/he
-#%lang(id) %{_ulibdir}/cups/cgi-bin/id
-#%lang(it) %{_ulibdir}/cups/cgi-bin/it
+%lang(id) %{_ulibdir}/cups/cgi-bin/id
+%lang(it) %{_ulibdir}/cups/cgi-bin/it
%lang(ja) %{_ulibdir}/cups/cgi-bin/ja
%lang(pl) %{_ulibdir}/cups/cgi-bin/pl
%lang(ru) %{_ulibdir}/cups/cgi-bin/ru
-#%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW
-%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/*
%{_datadir}/cups/charsets
%{_datadir}/cups/data
%{_datadir}/cups/drivers
+%{_datadir}/cups/drv
+%{_datadir}/cups/examples
%{_datadir}/cups/fonts
+%{_datadir}/cups/mime
%dir %{_datadir}/cups/model
-#%{_datadir}/cups/model/*.ppd.gz
# dirs for gimp-print-cups-4.2.7-1
%dir %{_datadir}/cups/model/C
%lang(da) %dir %{_datadir}/cups/model/da
%lang(pl) %dir %{_datadir}/cups/model/pl
%lang(sv) %dir %{_datadir}/cups/model/sv
+%{_datadir}/cups/ppdc
+
%dir %{_datadir}/cups/templates
%{_datadir}/cups/templates/*.tmpl
%lang(de) %{_datadir}/cups/templates/de
%lang(es) %{_datadir}/cups/templates/es
%lang(eu) %{_datadir}/cups/templates/eu
-#%lang(fr) %{_datadir}/cups/templates/fr
-#%lang(he) %{_datadir}/cups/templates/he
-#%lang(id) %{_datadir}/cups/templates/id
-#%lang(it) %{_datadir}/cups/templates/it
+%lang(id) %{_datadir}/cups/templates/id
+%lang(it) %{_datadir}/cups/templates/it
%lang(ja) %{_datadir}/cups/templates/ja
%lang(pl) %{_datadir}/cups/templates/pl
%lang(ru) %{_datadir}/cups/templates/ru
-#%lang(zh_TW) %{_datadir}/cups/templates/zh_TW
%{_mandir}/man1/cupstestppd.1*
%{_mandir}/man1/cupstestdsc.1*
%{_mandir}/man1/lppasswd.1*
+%{_mandir}/man1/ppd*.1*
%{_mandir}/man7/backend.7*
%{_mandir}/man7/filter.7*
+%{_mandir}/man7/notifier.7*
%{_mandir}/man5/*
%{_mandir}/man8/accept.8*
%{_mandir}/man8/cups-deviced.8*
%{_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
%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}/libcupsdriver.so.*
+%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
%lang(eu) %{_datadir}/locale/eu/cups_eu.po
%lang(fi) %{_datadir}/locale/fi/cups_fi.po
%lang(fr) %{_datadir}/locale/fr/cups_fr.po
-#%lang(he) %{_datadir}/locale/he/cups_he.po
-#%lang(id) %{_datadir}/locale/id/cups_id.po
+%lang(id) %{_datadir}/locale/id/cups_id.po
%lang(it) %{_datadir}/locale/it/cups_it.po
%lang(ko) %{_datadir}/locale/ko/cups_ko.po
%lang(ja) %{_datadir}/locale/ja/cups_ja.po
%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
%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
%attr(755,root,root) %{_sbindir}/disable
%attr(755,root,root) %{_sbindir}/enable
%attr(755,root,root) %{_sbindir}/lpadmin
%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*
%{_mandir}/man1/lpr.1*
%{_mandir}/man1/lprm.1*
%{_mandir}/man1/lpstat.1*
-#%lang(fr) %{_mandir}/fr/man1/cancel.1*
-#%lang(fr) %{_mandir}/fr/man1/lp.1*
-#%lang(fr) %{_mandir}/fr/man1/lpoptions.1*
-#%lang(fr) %{_mandir}/fr/man1/lpq.1*
-#%lang(fr) %{_mandir}/fr/man1/lpr.1*
-#%lang(fr) %{_mandir}/fr/man1/lprm.1*
-#%lang(fr) %{_mandir}/fr/man1/lpstat.1*
-#%lang(es) %{_mandir}/es/man1/lp.1*
-#%lang(es) %{_mandir}/es/man1/lpoptions.1*
-#%lang(es) %{_mandir}/es/man1/lpq.1*
-#%lang(es) %{_mandir}/es/man1/lpr.1*
-#%lang(es) %{_mandir}/es/man1/lprm.1*
-#%lang(es) %{_mandir}/es/man1/lpstat.1*
+%{_mandir}/man8/cupsaccept.8*
+%{_mandir}/man8/cupsdisable.8*
+%{_mandir}/man8/cupsreject.8*
+%{_mandir}/man8/reject.8*
%files image-lib
%defattr(644,root,root,755)
%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}/libcupsdriver.so
%attr(755,root,root) %{_libdir}/libcupsimage.so
+%attr(755,root,root) %{_libdir}/libcupsmime.so
+%attr(755,root,root) %{_libdir}/libcupsppdc.so
%{_includedir}/cups
%{_mandir}/man1/cups-config.1*
-#%lang(fr) %{_mandir}/fr/man1/cups-config.1*
-#%lang(es) %{_mandir}/es/man1/cups-config.1*
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libcups.a
+%{_libdir}/libcupscgi.a
+%{_libdir}/libcupsdriver.a
%{_libdir}/libcupsimage.a
+%{_libdir}/libcupsmime.a
+%{_libdir}/libcupsppdc.a
%endif
%if %{with perl}