[rpm/f19] - update to 4.11.2 - drop/adjust patches as appropriate
Panu Matilainen
pmatilai at fedoraproject.org
Thu Feb 13 09:09:35 UTC 2014
commit cfbeab79dc4b95fb20b1f4f124ee169d7d97e2dd
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Thu Feb 13 10:26:53 2014 +0200
- update to 4.11.2
- drop/adjust patches as appropriate
.gitignore | 1 +
rpm-4.11.1-caps-double-free.patch | 19 --------
rpm-4.11.1-empty-lua-script.patch | 23 ----------
rpm-4.11.1-file-triplet-check.patch | 27 ------------
rpm-4.11.1-instprefix.patch | 55 ------------------------
rpm-4.11.1-sepdebugcrcfix.patch | 78 -----------------------------------
rpm-4.9.0-armhfp-logic.patch | 12 +++---
rpm.spec | 20 ++++-----
sources | 2 +-
9 files changed, 17 insertions(+), 220 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db3c46c..b0ade63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/rpm-4.11.0-beta1.tar.bz2
/rpm-4.11.0.1.tar.bz2
/rpm-4.11.1.tar.bz2
+/rpm-4.11.2.tar.bz2
diff --git a/rpm-4.11.1-sepdebugcrcfix.patch b/rpm-4.11.1-sepdebugcrcfix.patch
index 74e8445..520198e 100644
--- a/rpm-4.11.1-sepdebugcrcfix.patch
+++ b/rpm-4.11.1-sepdebugcrcfix.patch
@@ -11,84 +11,6 @@
endif
endif
---- rpm-4.11.1-rc1-orig/Makefile.in 2013-06-10 08:38:51.000000000 +0200
-+++ rpm-4.11.1-rc1/Makefile.in 2013-06-24 18:34:06.342894002 +0200
-@@ -74,7 +74,8 @@ bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmbuil
- rpmgraph$(EXEEXT)
- rpmlibexec_PROGRAMS = $(am__EXEEXT_1) rpmdeps$(EXEEXT)
- @LIBDWARF_TRUE@@LIBELF_TRUE at am__append_6 = scripts/find-debuginfo.sh
-- at LIBDWARF_TRUE@@LIBELF_TRUE at am__append_7 = debugedit elfdeps
-+ at LIBDWARF_TRUE@@LIBELF_TRUE at am__append_7 = debugedit elfdeps \
-+ at LIBDWARF_TRUE@@LIBELF_TRUE@ sepdebugcrcfix
- @DOXYGEN_TRUE@@HACKINGDOCS_TRUE at am__append_8 = doc/hacking/html/index.html
- @DOXYGEN_TRUE at am__append_9 = doc/librpm/html/index.html
- @WITH_INTERNAL_DB_TRUE at am__append_10 = db.h
-@@ -110,7 +111,8 @@ am__installdirs = "$(DESTDIR)$(bindir)"
- "$(DESTDIR)$(rpmconfigdir)" "$(DESTDIR)$(rpmvardir)" \
- "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"
- @LIBDWARF_TRUE@@LIBELF_TRUE at am__EXEEXT_1 = debugedit$(EXEEXT) \
-- at LIBDWARF_TRUE@@LIBELF_TRUE@ elfdeps$(EXEEXT)
-+ at LIBDWARF_TRUE@@LIBELF_TRUE@ elfdeps$(EXEEXT) \
-+ at LIBDWARF_TRUE@@LIBELF_TRUE@ sepdebugcrcfix$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS) $(rpmbin_PROGRAMS) $(rpmlibexec_PROGRAMS)
- am__debugedit_SOURCES_DIST = tools/debugedit.c tools/hashtab.c \
- tools/hashtab.h
-@@ -157,6 +159,11 @@ am_rpmspec_OBJECTS = rpmspec-rpmspec.$(O
- rpmspec_OBJECTS = $(am_rpmspec_OBJECTS)
- rpmspec_DEPENDENCIES = libcliutils.la build/librpmbuild.la \
- lib/librpm.la rpmio/librpmio.la
-+am__sepdebugcrcfix_SOURCES_DIST = tools/sepdebugcrcfix.c
-+ at LIBDWARF_TRUE@@LIBELF_TRUE at am_sepdebugcrcfix_OBJECTS = \
-+ at LIBDWARF_TRUE@@LIBELF_TRUE@ tools/sepdebugcrcfix.$(OBJEXT)
-+sepdebugcrcfix_OBJECTS = $(am_sepdebugcrcfix_OBJECTS)
-+sepdebugcrcfix_DEPENDENCIES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -223,12 +230,12 @@ SOURCES = $(libcliutils_la_SOURCES) $(de
- $(elfdeps_SOURCES) $(rpm_SOURCES) $(rpm2cpio_SOURCES) \
- $(rpmbuild_SOURCES) $(rpmdb_SOURCES) $(rpmdeps_SOURCES) \
- $(rpmgraph_SOURCES) $(rpmkeys_SOURCES) $(rpmsign_SOURCES) \
-- $(rpmspec_SOURCES)
-+ $(rpmspec_SOURCES) $(sepdebugcrcfix_SOURCES)
- DIST_SOURCES = $(libcliutils_la_SOURCES) $(am__debugedit_SOURCES_DIST) \
- $(am__elfdeps_SOURCES_DIST) $(rpm_SOURCES) $(rpm2cpio_SOURCES) \
- $(rpmbuild_SOURCES) $(rpmdb_SOURCES) $(rpmdeps_SOURCES) \
- $(rpmgraph_SOURCES) $(rpmkeys_SOURCES) $(rpmsign_SOURCES) \
-- $(rpmspec_SOURCES)
-+ $(rpmspec_SOURCES) $(am__sepdebugcrcfix_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
-@@ -636,6 +643,8 @@ rpm2cpio_LDADD = lib/librpm.la rpmio/lib
- @LIBDWARF_TRUE@@LIBELF_TRUE at elfdeps_LDADD = rpmio/librpmio.la \
- @LIBDWARF_TRUE@@LIBELF_TRUE@ @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ \
- @LIBDWARF_TRUE@@LIBELF_TRUE@ $(am__empty)
-+ at LIBDWARF_TRUE@@LIBELF_TRUE at sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
-+ at LIBDWARF_TRUE@@LIBELF_TRUE at sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@
- rpmdeps_SOURCES = tools/rpmdeps.c
- rpmdeps_LDADD = lib/librpm.la rpmio/librpmio.la build/librpmbuild.la @WITH_POPT_LIB@
- rpmgraph_SOURCES = tools/rpmgraph.c
-@@ -903,6 +912,11 @@ rpmsign$(EXEEXT): $(rpmsign_OBJECTS) $(r
- rpmspec$(EXEEXT): $(rpmspec_OBJECTS) $(rpmspec_DEPENDENCIES) $(EXTRA_rpmspec_DEPENDENCIES)
- @rm -f rpmspec$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(rpmspec_OBJECTS) $(rpmspec_LDADD) $(LIBS)
-+tools/sepdebugcrcfix.$(OBJEXT): tools/$(am__dirstamp) \
-+ tools/$(DEPDIR)/$(am__dirstamp)
-+sepdebugcrcfix$(EXEEXT): $(sepdebugcrcfix_OBJECTS) $(sepdebugcrcfix_DEPENDENCIES) $(EXTRA_sepdebugcrcfix_DEPENDENCIES)
-+ @rm -f sepdebugcrcfix$(EXEEXT)
-+ $(AM_V_CCLD)$(LINK) $(sepdebugcrcfix_OBJECTS) $(sepdebugcrcfix_LDADD) $(LIBS)
- install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-@@ -994,6 +1008,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at tools/$(DEPDIR)/hashtab.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at tools/$(DEPDIR)/rpmdeps.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at tools/$(DEPDIR)/rpmgraph.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at tools/$(DEPDIR)/sepdebugcrcfix.Po at am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
--- rpm-4.11.1-rc1-orig/scripts/find-debuginfo.sh 2013-06-24 17:20:55.407538301 +0200
+++ rpm-4.11.1-rc1/scripts/find-debuginfo.sh 2013-06-24 18:34:41.270897302 +0200
@@ -114,10 +114,12 @@ done
diff --git a/rpm-4.9.0-armhfp-logic.patch b/rpm-4.9.0-armhfp-logic.patch
index be00bba..916b53f 100644
--- a/rpm-4.9.0-armhfp-logic.patch
+++ b/rpm-4.9.0-armhfp-logic.patch
@@ -1,7 +1,7 @@
-diff -up rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic rpm-4.9.1.3/lib/rpmrc.c
---- rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic 2012-04-19 17:11:32.728750591 +0200
-+++ rpm-4.9.1.3/lib/rpmrc.c 2012-04-19 17:11:32.754738455 +0200
-@@ -743,6 +743,56 @@ static int is_sun4v()
+diff -up rpm-4.11.1/lib/rpmrc.c.armhfp-logic rpm-4.11.1/lib/rpmrc.c
+--- rpm-4.11.1/lib/rpmrc.c.armhfp-logic 2013-10-01 14:59:12.841041726 +0300
++++ rpm-4.11.1/lib/rpmrc.c 2013-10-01 14:59:12.856041684 +0300
+@@ -733,6 +733,56 @@ static int is_sun4v()
}
#endif
@@ -58,8 +58,8 @@ diff -up rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic rpm-4.9.1.3/lib/rpmrc.c
# if defined(__linux__) && defined(__i386__)
#include <setjmp.h>
-@@ -1220,6 +1270,22 @@ static void defaultMachine(const char **
- }
+@@ -1136,6 +1186,22 @@ static void defaultMachine(const char **
+ # endif /* __ORDER_BIG_ENDIAN__ */
# endif /* ppc64*-linux */
+# if defined(__linux__) && defined(__arm__)
diff --git a/rpm.spec b/rpm.spec
index ae92a49..abbe18d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,7 +11,7 @@
%define rpmhome /usr/lib/rpm
-%define rpmver 4.11.1
+%define rpmver 4.11.2
%define srcver %{rpmver}%{?snapver:-%{snapver}}
%define bdbname libdb
@@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}3%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2
@@ -44,10 +44,6 @@ Patch5: rpm-4.9.90-armhfp.patch
Patch6: rpm-4.9.0-armhfp-logic.patch
# Patches already in upstream
-Patch100: rpm-4.11.1-instprefix.patch
-Patch101: rpm-4.11.1-file-triplet-check.patch
-Patch102: rpm-4.11.1-caps-double-free.patch
-Patch103: rpm-4.11.1-empty-lua-script.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
@@ -110,6 +106,8 @@ BuildRequires: xz-devel%{_isa} >= 4.999.8
%endif
# Only required by sepdebugcrcfix patch
BuildRequires: binutils-devel
+# Couple of patches change makefiles so, require for now...
+BuildRequires: automake libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -224,11 +222,6 @@ packages on a system.
%patch3 -p1 -b .no-man-dirs
%patch4 -p1 -b .use-gpg2
-%patch100 -p1 -b .instprefix
-%patch101 -p1 -b .file-triplet-check
-%patch102 -p1 -b .caps-double-free
-%patch103 -p1 -b .empty-lua-script
-
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
%patch304 -p1 -b .ldflags
@@ -257,6 +250,8 @@ CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
CFLAGS="$RPM_OPT_FLAGS"
export CPPFLAGS CFLAGS LDFLAGS
+autoreconf -i -f
+
# Using configure macro has some unwanted side-effects on rpm platform
# setup, use the old-fashioned way for now only defining minimal paths.
./configure \
@@ -463,6 +458,9 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
+* Thu Feb 13 2014 Panu Matilainen <pmatilai at redhat.com> - 4.11.2-1
+- update to 4.11.2 (http://rpm.org/wiki/Releases/4.11.2)
+
* Mon Sep 09 2013 Matilainen <pmatilai at redhat.com> - 4.11.1-3
- add missing dependency on tar to rpm-build (#986539)
diff --git a/sources b/sources
index 86efe68..d09b363 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e53c59768676b21b0924d251b21df7c6 rpm-4.11.1.tar.bz2
+876ac9948a88367054f8ddb5c0e87173 rpm-4.11.2.tar.bz2
More information about the scm-commits
mailing list