From d8d8b187c502abf04532c841ad3a271506e0b4d8 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sat, 30 Oct 2010 20:41:41 +0200
Subject: [PATCH] Bug 647967 - license clarification & specfile cleanup

---
 squid.spec | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/squid.spec b/squid.spec
index 92e8548..1f8bbe2 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,10 +4,11 @@
 
 Name:     squid
 Version:  3.1.9
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
-License:  GPLv2
+# See CREDITS for breakdown of non GPLv2+ code
+License:  GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain)
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
 Source0:  http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
@@ -85,7 +86,7 @@ lookup program (dnsserver), a program for retrieving FTP data
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir}/squid \
-   --sysconfdir=/etc/squid \
+   --sysconfdir=%{_sysconfdir}/squid \
    --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
@@ -133,7 +134,7 @@ make \
 	install
 echo "
 #
-# This is /etc/httpd/conf.d/squid.conf
+# This is %{_sysconfdir}/httpd/conf.d/squid.conf
 #
 
 ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
@@ -147,18 +148,18 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
-mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
-install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/20-squid
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+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
+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 $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
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
@@ -170,7 +171,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
 mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
 
 # squid.conf.documented is documentation. We ship that in doc/
-rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/squid/squid.conf.documented
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
@@ -259,6 +260,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 30 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.9-3
+- Bug #647967 - License clarification & spec-file cleanup
+
 * Mon Oct 25 2010 Henrik Nordstrom <henrik@henriknordstrom.net> 7:3.1.9-2
 - Upstream 3.1.9 bugfix release