- added missing squid manual and removed Makefile from package

Changed files:
    squid.spec -> 1.143

diff --git a/squid.spec b/squid.spec
index 3e9f3e84fea67f2c15ff22be9a05d9b6e9c85357..3dc7344d2c5a95f5204fd221ecb961b5a52e5ee5 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -510,8 +510,6 @@ z pakietu Samba 2.2.4 lub wy
 %{__autoconf}
 %{__automake}
 %configure \
-       --localstatedir=/var \
-       --sysconfdir=%{_sysconfdir} \
        --datadir=%{_datadir}/squid \
        --disable-ipf-transparent \
        --enable-arp-acl \
@@ -536,6 +534,8 @@ z pakietu Samba 2.2.4 lub wy
        --enable-underscores \
        --enable-useragent-log \
        --enable-x-accelerator-vary \
+       --localstatedir=/var \
+       --sysconfdir=%{_sysconfdir} \
        --with-pthreads 
 
 mv -f squid/* doc
@@ -579,6 +579,12 @@ 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*
 
+# dunno why, but manual is not installed
+mv doc/squid.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
+# We don't want Makefiles as docs...
+rm -f doc/Makefile*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -693,6 +699,7 @@ fi
 %attr(660,root,squid) %ghost /var/log/squid/*
 
 %attr(770,root,squid) %dir /var/cache/squid
+%{_mandir}/man8/squid.8*
 
 %files cachemgr
 %defattr(644,root,root,755)