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

auto-import cups-1.1.17-0.2 from cups-1.1.17-0.2.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 04:02:11 +00:00
parent a87014afbe
commit fcbc17be36
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
cups-1.1.15-1-source.tar.bz2 cups-1.1.17-source.tar.bz2
postscript.ppd.gz postscript.ppd.gz

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

25
cups.spec
View File

@ -1,11 +1,11 @@
%define initdir /etc/rc.d/init.d %define initdir /etc/rc.d/init.d
%define patchlevel 1 %define patchlevel %{nil}
%define use_alternatives 1 %define use_alternatives 1
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.1.15 Version: 1.1.17
Release: 10 Release: 0.2
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
%if "%{patchlevel}" != "" %if "%{patchlevel}" != ""
@ -23,6 +23,9 @@ Source7: pstoraster.convs
Source8: postscript.ppd.gz Source8: postscript.ppd.gz
Patch: cups-1.1.15-initscript.patch Patch: cups-1.1.15-initscript.patch
Patch1: cups-1.1.14-doclink.patch Patch1: cups-1.1.14-doclink.patch
Patch2: cups-1.1.17-uninit.patch
Patch3: cups-idefense-v2.patch
Patch4: 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
@ -68,6 +71,9 @@ 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 .uninit
%patch3 -p0 -b .security
%patch4 -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
@ -137,6 +143,10 @@ 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? \
$RPM_BUILD_ROOT%{_mandir}/fr
# Ship pstoraster (bug #69573). # Ship pstoraster (bug #69573).
install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
@ -240,6 +250,15 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/cups %{_includedir}/cups
%changelog %changelog
* Wed Jan 8 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.2
- Fix 'condrestart' behaviour in init script.
* Fri Dec 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-0.1
- 1.1.17.
- Fix cupsd startup hang (bug #79346).
- Don't install files not shipped.
- Security fixes.
* Fri Aug 30 2002 Bernhard Rosenkraenzer <bero@redhat.de> 1.1.15-10 * Fri Aug 30 2002 Bernhard Rosenkraenzer <bero@redhat.de> 1.1.15-10
- Add generic postscript PPD file (#73061) - Add generic postscript PPD file (#73061)

2
sources
View File

@ -1,2 +1,2 @@
971a14d35f61ea19871616f437e199a2 cups-1.1.15-1-source.tar.bz2 22a8b951fc962e37d1c6ddab3b9b634a cups-1.1.17-source.tar.bz2
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz