diff --git a/cups.spec b/cups.spec index fa04369..36fabaa 100644 --- a/cups.spec +++ b/cups.spec @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.10 -Release: 3%{?svn:.svn%{svn}}%{?dist} +Release: 4%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -55,7 +55,7 @@ Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: /sbin/chkconfig /sbin/service +PreReq: /sbin/chkconfig /sbin/service /bin/grep Requires: %{name}-libs = %{epoch}:%{version}-%{release} %if %use_alternatives Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat @@ -366,7 +366,7 @@ exit 0 %triggerpostun -- %{name} < 1:1.3.10-3 if [ "$1" -gt 0 ]; then CONF=%{_sysconfdir}/cups/cupsd.conf - if ! grep -q ServerAlias "$CONF"; then + if ! grep -qiw ServerAlias "$CONF"; then cp -a "$CONF" "$CONF".rpmorig cat <<"EOF" >> "$CONF" @@ -505,7 +505,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/php/modules/*.so %changelog -* Mon Apr 27 2009 Tim Waugh 1:1.3.10-3 +* Mon Apr 27 2009 Tim Waugh 1:1.3.10-4 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade (part of bug #497301). The default cupsd.conf now includes this line as well.