[rpm] - update to 4.11.2-rc1 - drop upstreamed patches, adjust others as needed - handle python egg-info's

Panu Matilainen pmatilai at fedoraproject.org
Mon Jan 20 12:51:36 UTC 2014 

commit 1d5ceec05f97fc32cafd41a7da06e1d396e8142b
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Mon Jan 20 14:51:31 2014 +0200

    - update to 4.11.2-rc1
    - drop upstreamed patches, adjust others as needed
    - handle python egg-info's version munging in file lists

 .gitignore                            |    1 +
 rpm-4.11.1-application-provides.patch |   28 ---------
 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-kmod-find-provides.patch   |   40 ++++++------
 rpm-4.11.1-ppc64le.patch              |  109 ---------------------------------
 rpm-4.11.1-py3-fixes.patch            |   59 ------------------
 rpm-4.11.1-sepdebugcrcfix.patch       |   78 -----------------------
 rpm.spec                              |   33 ++++------
 sources                               |    2 +-
 12 files changed, 35 insertions(+), 439 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94bf3ab..7927501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /rpm-4.11.1-rc1.tar.bz2
 /rpm-4.11.1-rc2.tar.bz2
 /rpm-4.11.1.tar.bz2
+/rpm-4.11.2-rc1.tar.bz2
diff --git a/rpm-4.11.1-kmod-find-provides.patch b/rpm-4.11.1-kmod-find-provides.patch
index e96399b..8a035c8 100644
--- a/rpm-4.11.1-kmod-find-provides.patch
+++ b/rpm-4.11.1-kmod-find-provides.patch
@@ -1,23 +1,23 @@
-diff -Nur rpm-4.11.1/fileattrs/kmod.attr rpm-4.11.1.new/fileattrs/kmod.attr
---- rpm-4.11.1/fileattrs/kmod.attr	1969-12-31 19:00:00.000000000 -0500
-+++ rpm-4.11.1.new/fileattrs/kmod.attr	2013-10-31 16:33:57.919845171 -0400
+diff -up rpm-4.11.2-rc1/fileattrs/kmod.attr.kmod-provides rpm-4.11.2-rc1/fileattrs/kmod.attr
+--- rpm-4.11.2-rc1/fileattrs/kmod.attr.kmod-provides	2014-01-20 11:47:48.325409810 +0200
++++ rpm-4.11.2-rc1/fileattrs/kmod.attr	2014-01-20 11:47:48.325409810 +0200
 @@ -0,0 +1,2 @@
 +%__kmod_provides       %{_rpmconfigdir}/kmod.prov
 +%__kmod_path           ^/lib/modules/.*$
-diff -Nur rpm-4.11.1/fileattrs/Makefile.am rpm-4.11.1.new/fileattrs/Makefile.am
---- rpm-4.11.1/fileattrs/Makefile.am	2012-11-18 03:21:06.000000000 -0500
-+++ rpm-4.11.1.new/fileattrs/Makefile.am	2013-10-31 16:35:16.443641444 -0400
-@@ -6,6 +6,6 @@
- 
+diff -up rpm-4.11.2-rc1/fileattrs/Makefile.am.kmod-provides rpm-4.11.2-rc1/fileattrs/Makefile.am
+--- rpm-4.11.2-rc1/fileattrs/Makefile.am.kmod-provides	2014-01-20 11:47:48.325409810 +0200
++++ rpm-4.11.2-rc1/fileattrs/Makefile.am	2014-01-20 11:49:31.764544198 +0200
+@@ -7,6 +7,6 @@ fattrsdir = $(rpmconfigdir)/fileattrs
  fattrs_DATA = \
- 	desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \
--	pkgconfig.attr python.attr ocaml.attr script.attr mono.attr
-+	pkgconfig.attr python.attr ocaml.attr script.attr mono.attr kmod.attr
+ 	appdata.attr desktop.attr elf.attr font.attr libtool.attr perl.attr \
+ 	perllib.attr pkgconfig.attr python.attr ocaml.attr script.attr \
+-	mono.attr
++	mono.attr kmod.attr
  
  EXTRA_DIST = $(fattrs_DATA)
-diff -Nur rpm-4.11.1/scripts/kmod.prov rpm-4.11.1.new/scripts/kmod.prov
---- rpm-4.11.1/scripts/kmod.prov	1969-12-31 19:00:00.000000000 -0500
-+++ rpm-4.11.1.new/scripts/kmod.prov	2013-10-31 16:33:57.919845171 -0400
+diff -up rpm-4.11.2-rc1/scripts/kmod.prov.kmod-provides rpm-4.11.2-rc1/scripts/kmod.prov
+--- rpm-4.11.2-rc1/scripts/kmod.prov.kmod-provides	2014-01-20 11:47:48.325409810 +0200
++++ rpm-4.11.2-rc1/scripts/kmod.prov	2014-01-20 11:47:48.325409810 +0200
 @@ -0,0 +1,17 @@
 +#!/bin/sh +x
 +
@@ -36,19 +36,19 @@ diff -Nur rpm-4.11.1/scripts/kmod.prov rpm-4.11.1.new/scripts/kmod.prov
 +		echo "kmod($kmod)"
 +	fi
 +done
-diff -Nur rpm-4.11.1/scripts/Makefile.am rpm-4.11.1.new/scripts/Makefile.am
---- rpm-4.11.1/scripts/Makefile.am	2012-11-18 03:21:06.000000000 -0500
-+++ rpm-4.11.1.new/scripts/Makefile.am	2013-10-31 16:35:53.990543808 -0400
-@@ -20,7 +20,7 @@
+diff -up rpm-4.11.2-rc1/scripts/Makefile.am.kmod-provides rpm-4.11.2-rc1/scripts/Makefile.am
+--- rpm-4.11.2-rc1/scripts/Makefile.am.kmod-provides	2014-01-17 13:17:29.000000000 +0200
++++ rpm-4.11.2-rc1/scripts/Makefile.am	2014-01-20 11:50:24.065601168 +0200
+@@ -20,7 +20,7 @@ EXTRA_DIST = \
  	ocaml-find-requires.sh ocaml-find-provides.sh \
- 	pkgconfigdeps.sh libtooldeps.sh \
+ 	pkgconfigdeps.sh libtooldeps.sh appdata.prov \
  	fontconfig.prov desktop-file.prov script.req \
 -	macros.perl macros.php macros.python
 +	macros.perl macros.php macros.python kmod.prov
  
  rpmconfig_SCRIPTS = \
  	brp-compress brp-python-bytecompile brp-java-gcjcompile \
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,7 @@ rpmconfig_SCRIPTS = \
  	pkgconfigdeps.sh libtooldeps.sh \
  	ocaml-find-requires.sh ocaml-find-provides.sh \
  	fontconfig.prov desktop-file.prov script.req \
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.spec b/rpm.spec
index 33343b7..19b64b2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,8 +11,10 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.11.1
+%define rpmver 4.11.2
+%define snapver rc1
 %define srcver %{rpmver}%{?snapver:-%{snapver}}
+%define eggver %{rpmver}%{?snapver:_%{snapver}}
 
 %define bdbname libdb
 %define bdbver 5.3.15
@@ -21,7 +23,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}12%{?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
@@ -50,14 +52,7 @@ Patch7: rpm-4.11.1-kmod-find-provides.patch
 # Patches already in upstream
 # Filter soname dependencies by name
 Patch100: rpm-4.11.x-filter-soname-deps.patch
-Patch101: rpm-4.11.1-instprefix.patch
-Patch102: rpm-4.11.x-do-not-filter-ld64.patch
-Patch103: rpm-4.11.1-file-triplet-check.patch
-Patch104: rpm-4.11.1-caps-double-free.patch
-Patch105: rpm-4.11.1-empty-lua-script.patch
-Patch106: rpm-4.11.1-ppc64le.patch
-Patch107: rpm-4.11.1-application-provides.patch
-Patch108: rpm-4.11.1-py3-fixes.patch
+Patch101: rpm-4.11.x-do-not-filter-ld64.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -258,14 +253,7 @@ packages on a system.
 %patch7 -p1 -b .kmod-provides
 
 %patch100 -p1 -b .filter-soname-deps
-%patch101 -p1 -b .instprefix
-%patch102 -p1 -b .dont-filter-ld64
-%patch103 -p1 -b .file-triplet-check
-%patch104 -p1 -b .caps-double-free
-%patch105 -p1 -b .empty-lua-script
-%patch106 -p1 -b .ppc64le
-%patch107 -p1 -b .application-provides
-%patch108 -p1 -b .py3-fixes
+%patch101 -p1 -b .dont-filter-ld64
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -497,12 +485,12 @@ exit 0
 %files python
 %defattr(-,root,root)
 %{python_sitearch}/rpm
-%{python_sitearch}/rpm_python-%{version}-py2.7.egg-info
+%{python_sitearch}/rpm_python-%{eggver}-py2.7.egg-info
 
 %files python3
 %defattr(-,root,root)
 %{python3_sitearch}/rpm
-%{python3_sitearch}/rpm_python-%{version}-py%{python3_version}.egg-info
+%{python3_sitearch}/rpm_python-%{eggver}-py%{python3_version}.egg-info
 
 %files devel
 %defattr(-,root,root)
@@ -522,6 +510,11 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Mon Jan 20 2014 Panu Matilainen <pmatilai at redhat.com> - 4.11.2-0.rc1.1
+- update to 4.11.2-rc1 (http://rpm.org/wiki/Releases/4.11.2)
+- drop upstreamed patches, adjust others as needed
+- handle python egg-info's version munging in file lists
+
 * Wed Jan 15 2014 Panu Matilainen <pmatilai at redhat.com> - 4.11.1-12
 - include ppc64le in %%power64 macro (#1052930)
 
diff --git a/sources b/sources
index 86efe68..04e71e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e53c59768676b21b0924d251b21df7c6  rpm-4.11.1.tar.bz2
+2bc7ff2829385ed36eb57b5bcff0c58b  rpm-4.11.2-rc1.tar.bz2

More information about the scm-commits mailing list