4ba2ab - update to 4.11 beta

Authored and Committed by Panu Matilainen 12 years ago
    - update to 4.11 beta
    - drop upstreamed patch
    
        
file modified
+1 -0
.gitignore CHANGED
@@ -5,3 +5,4 @@
5
5
/rpm-4.10.0.tar.bz2
6
6
/rpm-4.10.1.tar.bz2
7
7
/rpm-4.10.90.git11989.tar.bz2
8
+ /rpm-4.11.0-beta1.tar.bz2
rpm-4.10.90-caps-free.patch DELETED
@@ -1,21 +0,0 @@
1
- commit 34df9d81d15b596ea6f3f3f2e15bd0ec55323a19
2
- Author: Panu Matilainen <pmatilai@redhat.com>
3
- Date: Sat Nov 17 17:57:59 2012 +0200
4
-
5
- Fix double-free on %caps in spec (RhBug:877512)
6
-
7
- - Fixes regression caused by dumb refactoring mistake in commit
8
- 807ba93a6cf168410e3801347898949f356fcd6c
9
-
10
- diff --git a/build/files.c b/build/files.c
11
- index d299cb9..10d7fff 100644
12
- --- a/build/files.c
13
- +++ b/build/files.c
14
- @@ -216,7 +216,6 @@ static void FileEntryFree(FileEntry entry)
15
- {
16
- freeAttrRec(&(entry->ar));
17
- argvFree(entry->langs);
18
- - free(entry->caps);
19
- memset(entry, 0, sizeof(*entry));
20
- }
21
-
file modified
+7 -7
rpm.spec CHANGED
@@ -11,9 +11,9 @@
11
11
12
12
%define rpmhome /usr/lib/rpm
13
13
14
- %define rpmver 4.10.90
15
- %define snapver git11989
16
- %define srcver %{rpmver}%{?snapver:.%{snapver}}
14
+ %define rpmver 4.11.0
15
+ %define snapver beta1
16
+ %define srcver %{rpmver}%{?snapver:-%{snapver}}
17
17
18
18
%define bdbname libdb
19
19
%define bdbver 5.3.15
@@ -22,7 +22,7 @@
22
22
Summary: The RPM package management system
23
23
Name: rpm
24
24
Version: %{rpmver}
25
- Release: %{?snapver:0.%{snapver}.}3%{?dist}
25
+ Release: %{?snapver:0.%{snapver}.}1%{?dist}
26
26
Group: System Environment/Base
27
27
Url: http://www.rpm.org/
28
28
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -46,7 +46,6 @@ Patch5: rpm-4.9.90-armhfp.patch
46
46
Patch6: rpm-4.9.0-armhfp-logic.patch
47
47
48
48
# Patches already in upstream
49
- Patch100: rpm-4.10.90-caps-free.patch
50
49
51
50
# These are not yet upstream
52
51
Patch301: rpm-4.6.0-niagara.patch
@@ -220,8 +219,6 @@ packages on a system.
220
219
%patch3 -p1 -b .no-man-dirs
221
220
%patch4 -p1 -b .use-gpg2
222
221
223
- %patch100 -p1 -b .caps-free
224
-
225
222
%patch301 -p1 -b .niagara
226
223
%patch302 -p1 -b .geode
227
224
%patch304 -p1 -b .ldflags
@@ -454,6 +451,9 @@ exit 0
454
451
%doc COPYING doc/librpm/html/*
455
452
456
453
%changelog
454
+ * Mon Dec 10 2012 Panu Matilainen <pmatilai@redhat.com> - 4.11.0-0.beta1.1
455
+ - update to 4.11 beta
456
+
457
457
* Mon Nov 19 2012 Panu Matilainen <pmatilai@redhat.com> - 4.10.90-0.git11989.3
458
458
- package /usr/lib/rpm/macros.d directory (related to #846679)
459
459
- fixup a bunch of old incorrect dates in spec changelog
file modified
+1 -1
sources CHANGED
@@ -1 +1 @@
1
- 674fc60129543a7378615adfd828681d rpm-4.10.90.git11989.tar.bz2
1
+ cb71785390bf6a918cb185221d22ab04 rpm-4.11.0-beta1.tar.bz2