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

- Remove certs directory in %post, not %postun.

Browse Source
This commit is contained in:
Tim Waugh 2006-06-13 16:23:51 +00:00
parent b6f8e6a558
commit 90b0afb694
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups.spec
View File

@ -5,7 +5,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.1 Version: 1.2.1
Release: 10 Release: 11
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -245,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
%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
# Remove old-style certs directory; new-style is /var/run
# (see bug #194581 for why this is necessary).
/bin/rm -rf /etc/cups/certs
%if %use_alternatives %if %use_alternatives
/usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 40 \ /usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 40 \
--slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \ --slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \
@ -285,9 +288,6 @@ exit 0
%postun %postun
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
# Remove old-style certs directory; new-style is /var/run
# (see bug #194581 for why this is necessary).
rm -rf /etc/cups/certs
fi fi
exit 0 exit 0
@ -392,6 +392,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-11
- Remove certs directory in %%post, not %%postun.
* Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-10 * Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-10
- Remove old-style certs directory after upgrade (bug #194581). - Remove old-style certs directory after upgrade (bug #194581).