commit 9fc3c00dcaa503e69ad7d76aae6a3f1c9b4be256
Author: Tomasz Pala <[email protected]>
Date: Mon May 4 00:55:29 2015 +0200
fixed migration regexp (do not match prefixes like in PageLogFormat)
cups.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index 7f465be..23375c6 100644
--- a/cups.spec
+++ b/cups.spec
@@ -48,8 +48,8 @@ URL: http://www.cups.org/
BuildRequires: acl-devel
BuildRequires: autoconf >= 2.60
BuildRequires: automake
-%{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel}
-%{?with_avahi:BuildRequires: avahi-devel}
+%{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel}
+%{?with_avahi:BuildRequires: avahi-devel}
BuildRequires: dbus-devel
BuildRequires: glibc-headers
%{?with_gnutls:BuildRequires: gnutls-devel}
@@ -367,7 +367,7 @@ FileDevice\|FontPath\|Group\|LogFilePerm\|\
LPDConfigFile\|PageLog\|Printcap\|PrintcapFormat\|\
RemoteRoot\|RequestRoot\|ServerBin\|ServerCertificate\|\
ServerKey\|ServerRoot\|SMBConfigFile\|StateDir\|\
-SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)"
+SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)\b"
if [ -f %{_sysconfdir}/cups/cupsd.conf ] && grep -iq "$_keywords"
%{_sysconfdir}/cups/cupsd.conf; then
echo "# Settings automatically moved from cupsd.conf by RPM package:"
>> %{_sysconfdir}/cups/cups-files.conf
grep -i "$_keywords" %{_sysconfdir}/cups/cupsd.conf >>
%{_sysconfdir}/cups/cups-files.conf || :
@@ -400,7 +400,7 @@ fi
%service -q rc-inetd reload
%postun lpd
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
%service -q rc-inetd reload
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cups.git/commitdiff/4a2b7af149557223568f1d43258c1a7dbaec74da
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
