packages: cups/cups.spec, cups/cups-modprobe.conf (NEW) rel 4; blacklist usblp

[arekm]

Author: arekm                        Date: Tue Sep 15 20:58:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
rel 4; blacklist usblp

---- Files affected:
packages/cups:
   cups.spec (1.268 -> 1.269) , cups-modprobe.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.268 packages/cups/cups.spec:1.269
--- packages/cups/cups.spec:1.268	Sat Sep 12 19:20:11 2009
+++ packages/cups/cups.spec	Tue Sep 15 22:58:09 2009
@@ -15,7 +15,7 @@
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
 Version:	1.4.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:		Applications/Printing
@@ -26,6 +26,7 @@
 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
 Patch100:	%{name}-branch.diff
@@ -396,7 +397,7 @@
 
 %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
 
@@ -433,6 +434,7 @@
 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
@@ -469,6 +471,7 @@
 %post
 /sbin/chkconfig --add cups
 %service cups restart "cups daemon"
+/sbin/rmmod usblp > /dev/null 2>&1
 
 %preun
 if [ "$1" = "0" ]; then
@@ -503,6 +506,7 @@
 %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
@@ -747,6 +751,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.269  2009/09/15 20:58:09  arekm
+rel 4; blacklist usblp
+
 Revision 1.268  2009/09/12 17:20:11  arekm
 1.4.1
 

================================================================
Index: packages/cups/cups-modprobe.conf
diff -u /dev/null packages/cups/cups-modprobe.conf:1.1
--- /dev/null	Tue Sep 15 22:58:14 2009
+++ packages/cups/cups-modprobe.conf	Tue Sep 15 22:58:08 2009
@@ -0,0 +1 @@
+blacklist usblp
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.268&r2=1.269&f=u