rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from cups-1.1.14-15.2.src.rpm

Browse Source 
Wed Jan 08 2003 Tim Waugh <twaugh@redhat.com> 1.1.14-15.2
- Add 'exit 0' to postun scriptlet, and fix init script 'condrestart'
    behaviour.
Fri Dec 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.14-15.1
- Fix up smb printing trigger (samba-client, not samba-clients)
- Don't install files not shipped.
- Security fixes.
This commit is contained in:
cvsdist 2004-09-09 04:00:15 +00:00
parent 9f149e20e3
commit 66c832424d
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups.init
View File

@ -77,7 +77,7 @@ case $1 in
restart restart
;; ;;
condrestart) condrestart)
[ -f /var/lock/subsys/cups ] && restart [ -f /var/lock/subsys/cups ] && restart || :
;; ;;
status) status)
status $DAEMON status $DAEMON

23
cups.spec
View File

@ -5,7 +5,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.1.14 Version: 1.1.14
Release: 15 Release: 15.2
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
%if "%{patchlevel}" != "" %if "%{patchlevel}" != ""
@ -19,6 +19,8 @@ Source3: cups.desktop
Source4: cupsconfig Source4: cupsconfig
Patch: cups-1.1.14-initscript.patch Patch: cups-1.1.14-initscript.patch
Patch1: cups-1.1.14-doclink.patch Patch1: cups-1.1.14-doclink.patch
Patch2: cups-1.1.15-security.patch
Patch3: cups-1.1.17-pdftops.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -64,6 +66,8 @@ natively, without needing the lp/lpr commands.
%setup -q %setup -q
%patch -p1 -b .noinit %patch -p1 -b .noinit
%patch1 -p1 -b .doclink %patch1 -p1 -b .doclink
%patch2 -p1 -b .security
%patch3 -p1 -b .pdftops
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
autoconf autoconf
@ -131,6 +135,9 @@ If your browser does not support redirection, please use
EOF EOF
done done
# Remove unshipped files.
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
%post %post
/sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
/sbin/chkconfig --add cups || true /sbin/chkconfig --add cups || true
@ -171,12 +178,13 @@ exit 0
if [ "$1" -ge "1" ]; then if [ "$1" -ge "1" ]; then
/sbin/service cups condrestart > /dev/null 2>&1 /sbin/service cups condrestart > /dev/null 2>&1
fi fi
exit 0
%triggerin -- samba-clients %triggerin -- samba-client
ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || :
exit 0 exit 0
%triggerun -- samba-clients %triggerun -- samba-client
[ $2 = 0 ] || exit 0 [ $2 = 0 ] || exit 0
rm -f %{_libdir}/cups/backend/smb rm -f %{_libdir}/cups/backend/smb
@ -224,6 +232,15 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/cups %{_includedir}/cups
%changelog %changelog
* Wed Jan 8 2003 Tim Waugh <twaugh@redhat.com> 1.1.14-15.2
- Add 'exit 0' to postun scriptlet, and fix init script 'condrestart'
behaviour.
* Fri Dec 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.14-15.1
- Fix up smb printing trigger (samba-client, not samba-clients)
- Don't install files not shipped.
- Security fixes.
* Wed Apr 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.1.14-15 * Wed Apr 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.1.14-15
- Fix bug #63387 - Fix bug #63387