Browse Source

rpm: update to 4.11.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7797 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 10 years ago
parent
commit
db5131e1ee
1 changed files with 16 additions and 9 deletions
  1. 16 9
      r/rpm/rpm-vl.spec

+ 16 - 9
r/rpm/rpm-vl.spec

@@ -1,6 +1,9 @@
 # new vine linux release number
 %define _dist_release vl%(cat /etc/vine-release | cut -f3 -d" " | cut -f1 -d.)
 
+# rc
+#define _prever -rc1
+
 %define	with_python_subpackage	1%{nil}
 %define	with_python_version	2.7%{nil}
 %define	with_apidocs		1%{nil}
@@ -26,13 +29,13 @@
 Summary: The RPM package management system.
 Summary(ja): RPM パッケージ管理システム
 Name: rpm
-Version: 4.11.0.1
+Version: 4.11.1
 %define rpm_version %{version}
 Release: 1%{_dist_release}
 Group: System Environment/Base
 License: GPL
 
-Source: http://rpm.org/releases/rpm-4.8.x/rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}%{?_prever}.tar.bz2
 %if %{with int_bdb}
 Source1: db-%{bdbver}.tar.gz
 %endif
@@ -43,7 +46,6 @@ Source120: GROUPS-DESC_for_vine.txt
 Source130: COMPAT32_for_vine
 Source200: rpm44-perldeps.pl
 
-Patch1: rpm-4.5.90-pkgconfig-path.patch
 
 #conditionally applied patch for arm hardware floating point
 Patch5: rpm-4.9.90-armhfp.patch
@@ -233,8 +235,7 @@ that will manipulate RPM packages and databases.
 
 
 %prep
-%setup -q %{?with_int_bdb:-a 1}
-%patch1 -p1 -b .pkgconfig-path
+%setup -n %{name}-%{version}%{?_prever} -q %{?with_int_bdb:-a 1}
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -608,6 +609,12 @@ exit 0
 
 
 %changelog
+* Mon Aug 12 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 4.11.1-1
+- update to 4.11.1
+
+* Wed May 08 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 4.11.1-0.rc1
+- update to 4.11.1-rc1
+
 * Thu Feb 07 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 4.11.0.1-1
 - update to 4.11.0.1
 - add %%_sourcedir to macros.vine
@@ -731,7 +738,7 @@ exit 0
 * Mon Apr 07 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2.3-1
 - new upstream release
 
-* Tue Mar 20 2008 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.4.2.3-0.rc1.3
+* Thu Mar 20 2008 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.4.2.3-0.rc1.3
 - fix file section for x86_64 build
 
 * Wed Mar 19 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2.3-0.rc1.2
@@ -846,10 +853,10 @@ exit 0
 * Wed Dec 21 2005 KOBAYASHI Taizo <tkoba@vinelinux.org> 4.4.2-0vl5
 - added Patch210 for PPC deadlock.
 
-* Mon Dec 18 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2-0vl4
+* Sun Dec 18 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2-0vl4
 - import Patch51-55 from MDK package.
 
-* Mon Dec 18 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2-0vl3
+* Sun Dec 18 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 4.4.2-0vl3
 - add Requires: popt >= %%{poptversion} to rpm-libs.
   librpm-4.4 need new popt feature.
 
@@ -910,7 +917,7 @@ exit 0
 - use internal db only.
 - update Patch100 to fix %%configure macros
 
-* Tue Feb 20 2004 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 4.0.5-1vl1
+* Fri Feb 20 2004 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 4.0.5-1vl1
 - source update for rebuild and current autotools
 - added BuildRequires libtool >= 1.5.2
 - added patch107,200