- release 3 (by relup.sh)

[packages/squid.git] / squid.spec

diff --git a/squid.spec b/squid.spec
index d5d40fb95cca7ae307ec13668a7320b6bde2a043..da716e9d5243744600e957dea78d5f88915dbe3e 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid
-Version:       3.1.11
-Release:       1
+Version:       3.1.20
+Release:       3
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v3/3.1/%{name}-%{version}.tar.bz2
-# Source0-md5: 4b071d2bf4959f2d081344f2f69dd2f1
+# Source0-md5: c4d733a383c0508fd0746d64a2d7278a
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
@@ -38,6 +38,7 @@ Patch3:               %{name}-empty-referer.patch
 Patch4:                %{name}-2.5.STABLE4-apache-like-combined-log.patch
 Patch5:                %{name}-ppc-m32.patch
 Patch6:                %{name}-cachemgr-webapp.patch
+Patch7:                %{name}-ecap.patch
 URL:           http://www.squid-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -76,8 +77,10 @@ Requires:    setup >= 2.4.6
 Provides:      group(squid)
 # epoll enabled by default:
 Requires:      uname(release) >= 2.6
+# TPROXYv4 (v2 disabled b/c it breaks v4)
+#Suggests:     uname(release) >= 2.6.28.3
 Provides:      user(squid)
-Conflicts:     logrotate < 3.7-4
+Conflicts:     logrotate < 3.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _webapps        /etc/webapps
@@ -476,6 +479,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 %patch5 -p1
 %endif
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
 
@@ -512,7 +516,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
        --enable-kill-parent-hack \
        --enable-large-cache-files \
        --enable-linux-netfilter \
-       --enable-linux-tproxy \
+       --disable-linux-tproxy \
        --enable-multicast-miss \
        --enable-referer-log \
        --enable-removal-policies="heap,lru" \
@@ -717,6 +721,7 @@ fi
 %lang(ms) %{_datadir}/squid/errors/ms-*
 %lang(nl) %{_datadir}/squid/errors/nl
 %lang(nl) %{_datadir}/squid/errors/nl-*
+%lang(oc) %{_datadir}/squid/errors/oc
 %lang(pl) %{_datadir}/squid/errors/pl
 %lang(pl) %{_datadir}/squid/errors/pl-*
 %lang(pt) %{_datadir}/squid/errors/pt
@@ -728,6 +733,8 @@ fi
 %lang(ru) %{_datadir}/squid/errors/ru-*
 %lang(sk) %{_datadir}/squid/errors/sk
 %lang(sk) %{_datadir}/squid/errors/sk-*
+%lang(sk) %{_datadir}/squid/errors/sl
+%lang(sk) %{_datadir}/squid/errors/sl-*
 %lang(sr) %{_datadir}/squid/errors/sr
 %lang(sr) %{_datadir}/squid/errors/sr-*
 %lang(sv) %{_datadir}/squid/errors/sv
@@ -739,6 +746,8 @@ fi
 %lang(uk) %{_datadir}/squid/errors/uk
 %lang(uk) %{_datadir}/squid/errors/uk-*
 %lang(uz) %{_datadir}/squid/errors/uz
+%lang(vi) %{_datadir}/squid/errors/vi
+%lang(vi) %{_datadir}/squid/errors/vi-*
 %lang(zh_CN) %{_datadir}/squid/errors/zh-cn
 %lang(zh_CN) %{_datadir}/squid/errors/zh-sg
 %lang(zh_CN) %{_datadir}/squid/errors/zh-tw