[rpm] - update to 4.9.0 final - drop upstreamed patches
Panu Matilainen
pmatilai at fedoraproject.org
Wed Mar 2 09:26:05 UTC 2011
commit ffbcdae5f2b6257a67df41c399b1714b0d62566a
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Wed Mar 2 11:25:38 2011 +0200
- update to 4.9.0 final
- drop upstreamed patches
.gitignore | 1 +
rpm-4.9.0-rc1-double-cursor.patch | 24 -----------------
rpm-4.9.0-rc1-getoutput.patch | 51 -------------------------------------
rpm.spec | 12 +++-----
sources | 2 +-
5 files changed, 7 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0c59cb..dec7568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
rpm-4.8.1.tar.bz2
/rpm-4.9.0-beta1.tar.bz2
/rpm-4.9.0-rc1.tar.bz2
+/rpm-4.9.0.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index c886d1b..700f084 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -12,7 +12,6 @@
%define rpmhome /usr/lib/rpm
%define rpmver 4.9.0
-%define snapver rc1
%define srcver %{rpmver}%{?snapver:-%{snapver}}
%define bdbname db4
@@ -22,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}4%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2
@@ -41,8 +40,6 @@ Patch3: rpm-4.8.0-no-man-dirs.patch
Patch4: rpm-4.8.1-use-gpg2.patch
# Patches already in upstream
-Patch100: rpm-4.9.0-rc1-getoutput.patch
-Patch101 : rpm-4.9.0-rc1-double-cursor.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
@@ -208,9 +205,6 @@ packages on a system.
%patch3 -p1 -b .no-man-dirs
%patch4 -p1 -b .use-gpg2
-%patch100 -p1 -b .getoutput
-%patch101 -p1 -b .double-cursor
-
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
@@ -424,6 +418,10 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
+* Wed Mar 02 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.0-1
+- update to 4.9.0 final
+- drop upstreamed patches
+
* Tue Mar 01 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.0-0.rc1.4
- spec cosmetics clean up extra whitespace + group more logically
- wipe out BDB environment at boot via tmpfiles.d
diff --git a/sources b/sources
index 194789b..af1f386 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2529d0943d64a8c767527427ea88e84c rpm-4.9.0-rc1.tar.bz2
+9fb2bf03c697d719a9bfc72aafb723b9 rpm-4.9.0.tar.bz2
More information about the scm-commits
mailing list