Browse Source

バージョンチェックを調整した

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3897 ec354946-7b23-47d6-9f5a-488ba84defc7
miyabi 13 years ago
parent
commit
c484f11539
2 changed files with 7 additions and 4 deletions
  1. 4 2
      s/squid/squid-vl.spec
  2. 3 2
      s/squid30/squid30-vl.spec

+ 4 - 2
s/squid/squid-vl.spec

@@ -1,10 +1,12 @@
 %define         base_name       squid
+%define         pkg_epoch       7
 %define         pkg_version     3.1.12
 %define         pkg_release     1%{?_dist_release}
 
 Summary:        The Squid proxy caching server
 Summary(ja):    Squid ウェブプロキシキャッシュ
 Name:           %{base_name}
+Epoch:          %{pkg_epoch}
 Version:        %{pkg_version}
 Release:        %{pkg_release}
 Source0:        %{base_name}-%{version}.tar.bz2
@@ -26,7 +28,7 @@ BuildRequires:  openldap-devel pam-devel openssl-devel krb5-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
 
-Conflicts:      squid30 <= 3.0
+Conflicts:      squid30
 Obsoletes:      squid-novm
 
 Vendor:         Project Vine
@@ -266,6 +268,6 @@ fi
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
 %changelog
-* Fri May 13 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.12-1
+* Tue May 17 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.12-1
 - initial build for Vine Linux
 - This package is based on Vine Linux - squid-3.0.STABLE25-2

+ 3 - 2
s/squid30/squid30-vl.spec

@@ -43,9 +43,10 @@ BuildRequires: openjade linuxdoc-tools
 BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
 BuildRequires: cyrus-sasl-devel
 
-Conflicts: squid >= 3.1
+Conflicts: squid >= 7:3.1
 Obsoletes: squid-novm
 # Obsoletes: squid26
+Obsoletes: squid <= 7:3.0.STABLE25
 
 %description
 Squid is a high-performance proxy caching server for Web clients,
@@ -358,7 +359,7 @@ 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
+* Tue May 17 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.12-1
 - 7:3.0.STABLE25-3
 - change package name squid -> squid30