- Group changed from Daemons to Networking/Daemons,

- spec adapterized,
- removed COPYING from %doc (clear copyright statment is in License field).

Changed files:
    squid.spec -> 1.34

diff --git a/squid.spec b/squid.spec
index 217ea032ec9e21ada3259dd18b66fab1f2881a5b..a624365892cee14f6de9c6725b0cc1a16cda219b 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -4,8 +4,8 @@ Name:           squid
 Version:       2.3.STABLE3
 Release:       1
 License:       GPL
-Group:         Daemons
-Group(pl):     Serwery
+Group:         Networking/Daemons
+Group(pl):     Sieciowe/Serwery
 Source0:       http://www.squid-cache.org/Versions/v2/2.3/%{name}-%{version}-src.tar.gz
 Source1:       %{name}-1.1.19-faq.tar.gz
 Source2:       %{name}.init
@@ -28,34 +28,35 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     /etc/%{name}
 
 %description
-Squid is a high-performance proxy caching server for web clients, supporting
-FTP, gopher, and HTTP data objects. Unlike traditional caching software,
-Squid handles all requests in a single, non-blocking, I/O-driven process.
-Squid keeps meta data and especially hot objects cached in RAM, caches DNS
-lookups, supports non-blocking DNS lookups, and implements negative caching
-of failed requests. If you are tight on memory, check out the NOVM version
-of this package. Squid supports SSL, extensive access controls, and full
-request logging. By using the lightweight Internet Cache Protocol, Squid
+Squid is a high-performance proxy caching server for web clients,
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, Squid handles all requests in a single,
+non-blocking, I/O-driven process. Squid keeps meta data and especially
+hot objects cached in RAM, caches DNS lookups, supports non-blocking
+DNS lookups, and implements negative caching of failed requests. If
+you are tight on memory, check out the NOVM version of this package.
+Squid supports SSL, extensive access controls, and full request
+logging. By using the lightweight Internet Cache Protocol, Squid
 caches can be arranged in a hierarchy or mesh for additional bandwidth
-savings. Squid consists of a main server program squid, a Domain Name System
-lookup program dnsserver, a program for retrieving FTP data ftpget, and some
-management and client tools. When squid starts up, it spawns a configurable
-number of dnsserver processes, each of which can perform a single, blocking
-Domain Name System (DNS) lookup. This reduces the amount of time the cache
-waits for DNS lookups. Squid is derived from the ARPA-funded Harvest
-project.
+savings. Squid consists of a main server program squid, a Domain Name
+System lookup program dnsserver, a program for retrieving FTP data
+ftpget, and some management and client tools. When squid starts up, it
+spawns a configurable number of dnsserver processes, each of which can
+perform a single, blocking Domain Name System (DNS) lookup. This
+reduces the amount of time the cache waits for DNS lookups. Squid is
+derived from the ARPA-funded Harvest project.
 
 %description -l pl
 Squid jest wysoce wydajnym serwerem proxy-cache dla przegl±darek WWW,
 klientów FTP i gopher. Squid przechowuje najczê¶ciej pobierane dane w
-pamiêci RAM i zapamiêtuje odwo³ania do DNS. Squid oferuje wsparcie dla SSL,
-rozbudowan± kontrolê dostêpu oraz pe³ne rejestrowanie pobieranych danych.
-Dziêki u¿yciu protoko³u ICP (Internet Cache Protocol), serwer squid mo¿na
-³±czyæ w hierarchiê, zwiêkszaj±c ich efektywno¶æ. Pakiet squid obejmuje:
-g³ówny program serwera squid, program dostarczaj±cy informacji z DNS
-dnsserver, program odbieraj±cy dane FTP ftpget, oraz pomocnicze programy do
-zarz±dzania. Squid wywodzi siê ze sponsorowanego przez ARPA projektu
-Harvest.
+pamiêci RAM i zapamiêtuje odwo³ania do DNS. Squid oferuje wsparcie dla
+SSL, rozbudowan± kontrolê dostêpu oraz pe³ne rejestrowanie pobieranych
+danych. Dziêki u¿yciu protoko³u ICP (Internet Cache Protocol), serwer
+squid mo¿na ³±czyæ w hierarchiê, zwiêkszaj±c ich efektywno¶æ. Pakiet
+squid obejmuje: g³ówny program serwera squid, program dostarczaj±cy
+informacji z DNS dnsserver, program odbieraj±cy dane FTP ftpget, oraz
+pomocnicze programy do zarz±dzania. Squid wywodzi siê ze
+sponsorowanego przez ARPA projektu Harvest.
 
 %package cachemgr
 Summary:       CGI script for Squid management
@@ -66,12 +67,12 @@ Requires:   %{name} = %{version}
 Requires:      httpd
 
 %description cachemgr
-Cachemgr.cgi is a CGI script that allows administrator to chceck various
-informations about Squid via WWW.
+Cachemgr.cgi is a CGI script that allows administrator to chceck
+various informations about Squid via WWW.
 
 %description -l pl cachemgr
-Cachemgr.cgi jest skryptem CGI, który pozwala administratorowi zapoznaæ siê
-z informacjami o pracy Squid'a poprzez WWW.
+Cachemgr.cgi jest skryptem CGI, który pozwala administratorowi
+zapoznaæ siê z informacjami o pracy Squid'a poprzez WWW.
 
 %prep
 %setup -q -a 1 -a 4
@@ -146,11 +147,10 @@ touch $RPM_BUILD_ROOT/var/log/squid/{access,cache,store}.log
 # These two files start squid. They are replaced by /etc/rc.d/init.d script.
 rm -f $RPM_BUILD_ROOT%{_bindir}/R*
 
-gzip -9nf CONTRIBUTORS COPYING COPYRIGHT CREDITS README ChangeLog QUICKSTART \
+gzip -9nf CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART \
        TODO
 
 %post
-
 # If there is already link, don't do anything.
 if [ ! -e %{_datadir}/squid/errors ]; then 
 
@@ -246,4 +246,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(750,nobody,root) %dir /var/cache/squid
 
 %files cachemgr
+%defattr(644,root,root,755)
 %attr(755,nobody,nobody) /home/httpd/cgi-bin/*