#
# 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
Summary(pl.UTF-8): Ogólny system druku dla Uniksa
Summary(pt_BR.UTF-8): Sistema Unix de Impressão
Name: cups
-Version: 1.5.0
-Release: 1
+Version: 1.7.0
+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: e54ed09ede2340fc3014913333520fe4
+Source0: http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2
+# Source0-md5: 5ab496a2ce27017fcdb3d7ec4818a75a
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
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
+Patch17: %{name}-use-ipp1.1.patch
+Patch18: %{name}-final-content-type.patch
+# avahi patches from fedora
+Patch100: %{name}-avahi-address.patch
+Patch101: %{name}-avahi-no-threaded.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}
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
-BuildRequires: libusb-compat-devel
-BuildRequires: libusb-devel
+BuildRequires: libusb-devel >= 1.0
%{?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
-BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.344
+BuildRequires: rpmbuild(macros) >= 1.641
+BuildRequires: systemd-devel
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: cups-filters
Requires: openssl-tools
Requires: pam >= 0.77.3
-Requires: perl-modules
Requires: rc-scripts
+Requires: systemd-units >= 38
Suggests: ImageMagick-coder-pdf
Suggests: cups-filter-pstoraster
-Suggests: ghostscript-cups
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: logrotate < 3.7-4
Bibliotecas estáticas para desenvolvimento de programas que usam as
bibliotecas do CUPS.
-%package -n perl-cups
-Summary: Perl module for CUPS
-Summary(pl.UTF-8): Moduł Perla CUPS
-License: GPL v2 + openssl exception
-Group: Development/Languages/Perl
-Requires: %{name}-lib = %{epoch}:%{version}-%{release}
-
-%description -n perl-cups
-Perl module for Common Unix Printing System.
-
-%description -n perl-cups -l pl.UTF-8
-Moduł Perla do ogólnego systemu druku dla Uniksa.
-
-%package -n php-cups
-Summary: PHP module for CUPS
-Summary(pl.UTF-8): Moduł PHP CUPS
-License: GPL v2 + openssl exception
-Group: Development/Languages/PHP
-Requires: %{name}-lib = %{epoch}:%{version}-%{release}
-%{?requires_php_extension}
-Requires: /etc/php/conf.d
-Requires: php-common >= 4:5.0.0
-
-%description -n php-cups
-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 backend-usb
Summary: USB backend for CUPS
Summary(pl.UTF-8): Backend USB dla CUPS-a
%description backend-usb -l pl.UTF-8
Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB.
-%package backend-serial
-Summary: Serial port backend for CUPS
-Summary(pl.UTF-8): Backend obsługujący porty szeregowe dla CUPS-a
-License: GPL v2 + openssl exception
-Group: Applications/Printing
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description backend-serial
-This package allow CUPS printing on printers connected by serial
-ports.
-
-%description backend-serial -l pl.UTF-8
-Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach
-podłączonych do portów szeregowych.
-
-%package backend-parallel
-Summary: Parallel port backend for CUPS
-Summary(pl.UTF-8): Backend obsługujący porty równoległe dla CUPS-a
-License: GPL v2 + openssl exception
-Group: Applications/Printing
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description backend-parallel
-This package allow CUPS printing on printers connected by parallel
-ports.
-
-%description backend-parallel -l pl.UTF-8
-Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach
-podłączonych do portów równoległych.
-
%package lpd
Summary: LPD compatibility support for CUPS print server
Summary(pl.UTF-8): Wsparcie dla LPD w serwerze wydruków 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
+%patch17 -p1
+%patch18 -p1
+
+%if %{with avahi}
+%patch100 -p1
+%patch101 -p1
+%endif
%build
%{__aclocal} -I config-scripts
--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-optim=-Wno-format-y2k \
%{?with_dnssd:--with-dnssd-libs=x} \
%{?with_dnssd:--with-dnssd-includes=x} \
- %{?with_perl:--with-perl=%{_bindir}/perl} \
- %{?with_php:--with-php=%{_bindir}/php} \
- %{?with_python:--with-python=%{_bindir}/python}
-
-%{__make}
-
-%{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile
-%{?with_php:%{__make} -C scripting/php PHPCONFIG=%{_bindir}/php-config}
-
-%if %{with perl}
-cd scripting/perl
-%{__perl} -pi -e 's@-lcups@-L../../cups $1@' Makefile.PL
-%{__perl} Makefile.PL \
- INSTALLDIRS=vendor \
- OPTIMIZE="%{rpmcflags} -I../.."
-# avoid rpaths generated by MakeMaker
-%{__perl} -pi -e 's@LD_RUN_PATH="\$\(LD_RUN_PATH\)" @@' Makefile
-
-%{__make}
-cd ../..
-%endif
+ %{?with_python:--with-python=%{_bindir}/python} \
+ --with-systemdsystemunitdir=%{systemdunitdir}
+
+%{__make} %{?debug:OPTIONS="-DDEBUG"}
%install
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{%{systemdunitdir},%{systemdtmpfilesdir}}
%{__make} install \
BUILDROOT=$RPM_BUILD_ROOT \
%endif
fi
-%if %{with php}
-%{__make} -C scripting/php install \
- PHPDIR=$RPM_BUILD_ROOT%{php_extensiondir}
-install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
-cat > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpcups.ini << 'EOF'
-; Enable phpcups extension module
-extension=phpcups.so
-EOF
+%if %{with avahi}
+ln -s %{_ulibdir}/cups/backend/dnssd $RPM_BUILD_ROOT%{_ulibdir}/cups/backend/mdns
%endif
-%if %{with perl}
-%{__make} -C scripting/perl install \
- 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%{systemdtmpfilesdir}/%{name}.conf
touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log}
touch $RPM_BUILD_ROOT/etc/security/blacklist.cups
ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable
ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
-# fix/update locale names
-install -d $RPM_BUILD_ROOT%{_datadir}/locale/{nb,zh_CN}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no/cups_no.po,nb/cups_nb.po}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh/cups_zh.po,zh_CN/cups_zh_CN.po}
-
# check-files cleanup
-rm -rf $RPM_BUILD_ROOT%{_mandir}/{,es/,fr/}cat?
-rm -rf $RPM_BUILD_ROOT/''etc/{init.d,rc?.d}/*
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cupsd.conf.default
+%{__rm} -r $RPM_BUILD_ROOT/etc/{init.d,rc?.d}
+
+# shipped in cups-filters
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/banners
%clean
rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --add cups
%service cups restart "cups daemon"
/sbin/rmmod usblp > /dev/null 2>&1 || :
+%systemd_post cups.service cups.socket cups.path
%preun
if [ "$1" = "0" ]; then
%service cups stop
/sbin/chkconfig --del cups
fi
+%systemd_preun cups.service cups.socket cups.path
+
+%postun
+%systemd_reload
+
+%triggerpostun -- cups < 1.5.2-1
+%systemd_trigger cups.service cups.socket cups.path
%post lib -p /sbin/ldconfig
%postun lib -p /sbin/ldconfig
%post image-lib -p /sbin/ldconfig
%postun image-lib -p /sbin/ldconfig
-%post -n php-cups
-%php_webserver_restart
-
-%postun -n php-cups
-if [ "$1" = 0 ]; then
- %php_webserver_restart
-fi
-
%post lpd
%service -q rc-inetd reload
%attr(754,root,root) /etc/rc.d/init.d/cups
/etc/dbus-1/system.d/cups.conf
/etc/modprobe.d/cups.conf
+%{systemdunitdir}/cups.service
+%{systemdunitdir}/cups.socket
+%{systemdunitdir}/cups.path
+%{systemdtmpfilesdir}/%{name}.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}/cups-files.conf
%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
%{_ulibdir}/cups/cgi-bin/*.css
%{_ulibdir}/cups/cgi-bin/*.html
%{_ulibdir}/cups/cgi-bin/*.txt
-%lang(de) %{_ulibdir}/cups/cgi-bin/de
+%lang(ca) %{_ulibdir}/cups/cgi-bin/ca
+%lang(cs) %{_ulibdir}/cups/cgi-bin/cs
%lang(es) %{_ulibdir}/cups/cgi-bin/es
-%lang(eu) %{_ulibdir}/cups/cgi-bin/eu
-%lang(id) %{_ulibdir}/cups/cgi-bin/id
+%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
%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
-%exclude %{_ulibdir}/cups/backend/usb
-%exclude %{_ulibdir}/cups/backend/serial
-%exclude %{_ulibdir}/cups/backend/parallel
-%attr(755,root,root) %{_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
%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/*
%attr(755,root,root) %{_ulibdir}/cups/notifier/*
-%{_datadir}/cups/banners
-%{_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
# dirs for gimp-print-cups-4.2.7-1
%dir %{_datadir}/cups/templates
%{_datadir}/cups/templates/*.tmpl
-%lang(de) %{_datadir}/cups/templates/de
+%lang(ca) %{_datadir}/cups/templates/ca
+%lang(cs) %{_datadir}/cups/templates/cs
%lang(es) %{_datadir}/cups/templates/es
-%lang(eu) %{_datadir}/cups/templates/eu
-%lang(id) %{_datadir}/cups/templates/id
+%lang(fr) %{_datadir}/cups/templates/fr
%lang(it) %{_datadir}/cups/templates/it
%lang(ja) %{_datadir}/cups/templates/ja
-%lang(pl) %{_datadir}/cups/templates/pl
%lang(ru) %{_datadir}/cups/templates/ru
%{_mandir}/man1/cupstestppd.1*
%{_mandir}/man1/cupstestdsc.1*
%{_mandir}/man8/accept.8*
%{_mandir}/man8/cups-deviced.8*
%{_mandir}/man8/cups-driverd.8*
-%{_mandir}/man8/cups-polld.8*
+%{_mandir}/man8/cups-snmp.8*
%{_mandir}/man8/cupsaddsmb.8*
%{_mandir}/man8/cupsctl.8*
%{_mandir}/man8/cupsd.8*
%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
-%lang(da) %{_datadir}/locale/da/cups_da.po
-%lang(de) %{_datadir}/locale/de/cups_de.po
+%lang(ca) %{_datadir}/locale/ca/cups_ca.po
+%lang(cs) %{_datadir}/locale/cs/cups_cs.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(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
-%lang(nl) %{_datadir}/locale/nl/cups_nl.po
-%lang(nb) %{_datadir}/locale/nb/cups_nb.po
-%lang(pl) %{_datadir}/locale/pl/cups_pl.po
-%lang(pt) %{_datadir}/locale/pt/cups_pt.po
-%lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po
%lang(ru) %{_datadir}/locale/ru/cups_ru.po
-%lang(sv) %{_datadir}/locale/sv/cups_sv.po
-%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po
-%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
%files clients
%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
%attr(755,root,root) %{_bindir}/ipptool
%attr(755,root,root) %{_bindir}/lp
%attr(755,root,root) %{_bindir}/lpoptions
%{_desktopdir}/cups.desktop
%{_iconsdir}/hicolor/*/apps/cups.png
%{_mandir}/man1/cancel.1*
+%{_mandir}/man1/ippfind.1*
%{_mandir}/man1/ipptool.1*
%{_mandir}/man1/lp.1*
%{_mandir}/man1/lpoptions.1*
%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
%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}
-%files -n perl-cups
-%defattr(644,root,root,755)
-%{perl_vendorarch}/CUPS.pm
-%dir %{perl_vendorarch}/auto/CUPS
-%{perl_vendorarch}/auto/CUPS/CUPS.bs
-%{perl_vendorarch}/auto/CUPS/autosplit.ix
-%attr(755,root,root) %{perl_vendorarch}/auto/CUPS/CUPS.so
-%{_mandir}/man3/CUPS.3pm*
-%endif
-
-%if %{with php}
-%files -n php-cups
-%defattr(644,root,root,755)
-%doc scripting/php/README
-%attr(755,root,root) %{php_extensiondir}/phpcups.so
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini
-%endif
-
%files backend-usb
%defattr(644,root,root,755)
%attr(755,root,root) %{_ulibdir}/cups/backend/usb
-
-%files backend-serial
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_ulibdir}/cups/backend/serial
-
-%files backend-parallel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_ulibdir}/cups/backend/parallel
+%dir %{_datadir}/cups/usb
+%{_datadir}/cups/usb/org.cups.usb-quirks
%files lpd
%defattr(644,root,root,755)
projects / packages / cups.git / blobdiff