- rel 3

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index ef7bf2ff91e83d4977be0e20c970ed5dd3661ec4..16267a56073c61721496a01a8011b2f30f0ee508 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -13,18 +13,21 @@
 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
-Release:       1
+Version:       1.4.2
+Release:       3
 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: d95e2d588e3d36e563027a963b117b1b
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
 Source4:       %{name}.mailto.conf
 Source5:       %{name}-lpd.inetd
+Source6:       %{name}-modprobe.conf
+# svn diff http://svn.easysw.com/public/cups/tags/release-1.4.1/ 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
@@ -41,11 +44,11 @@ BuildRequires:      automake
 %{?with_dnssd:BuildRequires:   avahi-compat-libdns_sd-devel}
 BuildRequires: dbus-devel
 BuildRequires: glibc-headers
+BuildRequires: heimdal-devel
 %{?with_gnutls:BuildRequires:  gnutls-devel}
 %{?with_java:BuildRequires:    jar}
 %{?with_java:BuildRequires:    jdk}
 %{?with_java:BuildRequires:    jpackage-utils}
-BuildRequires: heimdal-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpaper-devel
 BuildRequires: libpng-devel
@@ -70,14 +73,7 @@ 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
@@ -367,9 +363,9 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        %{?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}
 
@@ -391,7 +387,7 @@ cd ../..
 
 %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
 
@@ -428,6 +424,7 @@ 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
 
 touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.cups
@@ -464,6 +461,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add cups
 %service cups restart "cups daemon"
+/sbin/rmmod usblp > /dev/null 2>&1 || :
 
 %preun
 if [ "$1" = "0" ]; then
@@ -498,6 +496,7 @@ fi
 %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