Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3860 ec354946-7b23-47d6-9f5a-488ba84defc7

miyabi 14 years ago
parent
commit
aab70f1b9c
1 changed files with 7 additions and 2 deletions
  1. 7 2
      s/squid30/squid30-vl.spec

+ 7 - 2
s/squid/squid-vl.spec → s/squid30/squid30-vl.spec

@@ -1,8 +1,8 @@
 %define __perl_requires %{SOURCE98}
 
-Name:     squid
+Name:     squid30
 Version:  3.0.STABLE25
-Release:  2%{_dist_release}
+Release:  3%{_dist_release}
 Summary:  The Squid proxy caching server
 Summary(ja): Squid ウェブプロキシキャッシュ
 Epoch:    7
@@ -43,6 +43,7 @@ BuildRequires: openjade linuxdoc-tools
 BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
 BuildRequires: cyrus-sasl-devel
 
+Conflicts: squid >= 3.1
 Obsoletes: squid-novm
 # Obsoletes: squid26
 
@@ -357,6 +358,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri May 13 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.12-1
+- 7:3.0.STABLE25-3
+- change package name squid -> squid30
+
 * Mon Sep 20 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
 - 7:3.0.STABLE25-2
 - add patch001 for fix CVE-2010-3072