[squid] Resolved: /usr move - squid service file
mluscon
mluscon at fedoraproject.org
Mon Mar 11 15:17:48 UTC 2013
commit 685c0607344b19df483633a009aec6ab3ae8ff62
Author: Michal Luscon <mluscon at redhat.com>
Date: Mon Mar 11 16:10:26 2013 +0100
Resolved: /usr move - squid service file
squid.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/squid.spec b/squid.spec
index 5bf5fad..0fffcbf 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
Name: squid
Version: 3.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@@ -195,13 +195,13 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
mkdir -p $RPM_BUILD_ROOT/usr/libexec/squid
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/squid
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squid
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/squid
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/squid
-install -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}/lib/systemd/system
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}
install -m 755 %{SOURCE8} ${RPM_BUILD_ROOT}/usr/libexec/squid
install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/squid.conf
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
@@ -230,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING COPYRIGHT README ChangeLog QUICKSTART src/squid.conf.documented
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
-/lib/systemd/system/squid.service
+%{_unitdir}/squid.service
%attr(755,root,root) %dir /usr/libexec/squid/cache_swap.sh
%attr(755,root,root) %dir %{_sysconfdir}/squid
%attr(755,root,root) %dir %{_libdir}/squid
@@ -311,6 +311,9 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog
+* Mon Mar 11 2013 Michal Luscon <mluscon at redhat.com> 7:3.2.8-3
+- Resolved: /usr move - squid service file
+
* Sat Mar 09 2013 Michal Luscon <mluscon at redhat.com> - 7:3.2.8-2
- Resolved: #896127 - basic_ncsa_auth does not work
More information about the scm-commits
mailing list