diff --git a/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch b/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
deleted file mode 100644
index 088082d..0000000
--- a/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 17d08cd3942405e20889ba7d420191993c93a12f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Sun, 25 Sep 2011 11:25:34 +0300
-Subject: [PATCH] Drop (un)setting LANG and DISPLAY in various build stages.
-
-rpm >= 4.8.0 takes care of that itself.
----
- macros |   21 ---------------------
- 1 files changed, 0 insertions(+), 21 deletions(-)
-
-Index: redhat-rpm-config-9.1.0/macros
-===================================================================
---- redhat-rpm-config-9.1.0.orig/macros
-+++ redhat-rpm-config-9.1.0/macros
-@@ -131,29 +131,8 @@ package or when debugging this package.\
- %endif\
- %{nil}
- 
--# Bad hack to set $LANG to C during all RPM builds
--%prep \
--%%prep\
--LANG=C\
--export LANG\
--unset DISPLAY\
--%{nil}
--
--%build %%build\
--LANG=C\
--export LANG\
--unset DISPLAY\
--%{nil}
--
- %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
- %%install\
--LANG=C\
--export LANG\
--unset DISPLAY\
--%{nil}
--
--%check %%check\
--unset DISPLAY\
- %{nil}
- 
- #
diff --git a/redhat-rpm-config-9.1.0-aarch64.patch b/redhat-rpm-config-9.1.0-aarch64.patch
deleted file mode 100644
index 03456d2..0000000
--- a/redhat-rpm-config-9.1.0-aarch64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/rpmrc b/rpmrc
-index 9127200..fe2f84b 100644
---- a/rpmrc
-+++ b/rpmrc
-@@ -64,6 +64,8 @@ optflags: hades %{__global_cflags}
- optflags: s390 %{__global_cflags} -m31 -march=z9-109 -mtune=z10
- optflags: s390x %{__global_cflags} -m64 -march=z9-109 -mtune=z10
- 
-+optflags: aarch64 %{__global_cflags} -fno-stack-protector
-+
- # set build arch to fedora buildarches on hardware capable of running it
- # saves having to do rpmbuild --target=
- buildarchtranslate: athlon: i686
diff --git a/redhat-rpm-config-9.1.0-arches-macros.patch b/redhat-rpm-config-9.1.0-arches-macros.patch
deleted file mode 100644
index ccb7f3e..0000000
--- a/redhat-rpm-config-9.1.0-arches-macros.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.ghc-srpm redhat-rpm-config-9.1.0/macros.ghc-srpm
---- redhat-rpm-config-9.1.0-orig/macros.ghc-srpm	1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.ghc-srpm	2011-05-27 10:19:29.504287354 -0500
-@@ -0,0 +1,3 @@
-+# macro defining the archs that ghc runs on in fedora
-+%ghc_arches %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x
-+%ghc_arches_with_ghci %{ix86} x86_64 ppc sparcv9 armv7hl armv5tel
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.mono-srpm redhat-rpm-config-9.1.0/macros.mono-srpm
---- redhat-rpm-config-9.1.0-orig/macros.mono-srpm	1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.mono-srpm	2011-05-27 10:59:00.348201750 -0500
-@@ -0,0 +1,2 @@
-+# arches that mono builds on
-+%mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.nodejs-srpm redhat-rpm-config-9.1.0/macros.nodejs-srpm
---- redhat-rpm-config-9.1.0-orig/macros.nodejs-srpm 1969-12-31 17:00:00.000000000 -0700
-+++ redhat-rpm-config-9.1.0/macros.nodejs-srpm  2013-05-20 19:21:20.364367765 -0700
-@@ -0,0 +1,6 @@
-+# nodejs_arches lists what arches Node.js and dependent packages run on.
-+#
-+# Enabling Node.js on other arches requires porting the V8 JavaScript JIT to
-+# those arches.
-+
-+%nodejs_arches %{ix86} x86_64 %{arm}
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0/macros.ocaml-srpm
---- redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm	1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.ocaml-srpm	2011-05-27 10:42:10.638194240 -0500
-@@ -0,0 +1,2 @@
-+# arches that ocaml runs on
-+%ocaml_arches alpha %{arm} %{ix86} ia64 x86_64 ppc  sparc sparcv9 ppc64
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.gnat-srpm redhat-rpm-config-9.1.0/macros.gnat-srpm
---- redhat-rpm-config-9.1.0-orig/macros.gnat-srpm	1970-01-01 01:00:00.000000000 +0100
-+++ redhat-rpm-config-9.1.0/macros.gnat-srpm	2012-01-05 17:04:35.000000000 +0100
-@@ -0,0 +1,4 @@
-+# GNAT_arches lists the architectures where GNAT is available in Fedora. Ada
-+# packages won't build on other architectures until GNAT is bootstrapped for
-+# them.
-+%GNAT_arches %{ix86} x86_64 ia64 ppc ppc64 alpha
-diff -uNr redhat-rpm-config-9.1.0-orig/Makefile redhat-rpm-config-9.1.0/Makefile
---- redhat-rpm-config-9.1.0-orig/Makefile	2010-02-02 03:24:04.000000000 -0600
-+++ redhat-rpm-config-9.1.0/Makefile	2011-05-27 10:43:34.898205307 -0500
-@@ -11,7 +11,10 @@
- install:
- 	mkdir -p $(DESTDIR)/usr/lib/rpm/redhat
- 	cp -pr * $(DESTDIR)/usr/lib/rpm/redhat/
-+	mkdir -p $(DESTDIR)/etc/rpm
-+	cp -pr macros.* $(DESTDIR)/etc/rpm/
- 	rm -f $(DESTDIR)/usr/lib/rpm/redhat/Makefile
-+	rm -f $(DESTDIR)/usr/lib/rpm/redhat/macros.*
- 
- tag-archive:
- 	@git tag -a $(CVSTAG) -m "$(NAME)-$(VERSION) release"
diff --git a/redhat-rpm-config-9.1.0-arm.patch b/redhat-rpm-config-9.1.0-arm.patch
deleted file mode 100644
index e059347..0000000
--- a/redhat-rpm-config-9.1.0-arm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNp redhat-rpm-config-9.1.0_orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
---- redhat-rpm-config-9.1.0_orig/rpmrc	2010-02-02 04:24:04.000000000 -0500
-+++ redhat-rpm-config-9.1.0/rpmrc	2011-07-02 04:29:11.921575635 -0400
-@@ -46,10 +46,12 @@ optflags: armv3l %{__global_cflags} -fsi
- optflags: armv4b %{__global_cflags} -fsigned-char -march=armv4
- optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4
- optflags: armv4tl %{__global_cflags} -march=armv4t
--optflags: armv5tel %{__global_cflags} -march=armv5te
--optflags: armv5tejl %{__global_cflags} -march=armv5te
--optflags: armv6l %{__global_cflags} -march=armv6
--optflags: armv7l %{__global_cflags} -march=armv7
-+optflags: armv5tel %{__global_cflags} -march=armv5te -mfloat-abi=soft
-+optflags: armv5tejl %{__global_cflags} -march=armv5te -mfloat-abi=soft
-+optflags: armv6l %{__global_cflags} -march=armv6 -mfloat-abi=soft
-+optflags: armv7l %{__global_cflags} -march=armv7-a -mfloat-abi=soft
-+optflags: armv7hl %{__global_cflags} -march=armv7-a -mfpu=vfpv3-d16  -mfloat-abi=hard
-+optflags: armv7hnl %{__global_cflags} -march=armv7-a -mfpu=neon  -mfloat-abi=hard
- 
- optflags: atarist %{__global_cflags}
- optflags: atariste %{__global_cflags}
-@@ -76,5 +78,7 @@ buildarchtranslate: sparcv9v: sparcv9
- 
- buildarchtranslate: armv5tejl: armv5tel
- buildarchtranslate: armv6l: armv5tel
- buildarchtranslate: armv7l: armv5tel
-+buildarchtranslate: armv7hl: armv7hl
-+buildarchtranslate: armv7hnl: armv7hl
- 
diff --git a/redhat-rpm-config-9.1.0-configfoo.patch b/redhat-rpm-config-9.1.0-configfoo.patch
deleted file mode 100644
index 495f39c..0000000
--- a/redhat-rpm-config-9.1.0-configfoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.configfoo redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.configfoo	2013-04-22 13:42:25.984613491 +0300
-+++ redhat-rpm-config-9.1.0/macros	2013-04-22 13:43:27.053420367 +0300
-@@ -33,6 +33,9 @@
-   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-   LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
-+  for i in $(find . -name config.guess -o -name config.sub) ; do \
-+      [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
-+  done ; \
-   %{_configure} --build=%{_build} --host=%{_host} \\\
- 	--program-prefix=%{?_program_prefix} \\\
- 	--disable-dependency-tracking \\\
diff --git a/redhat-rpm-config-9.1.0-dwz.patch b/redhat-rpm-config-9.1.0-dwz.patch
deleted file mode 100644
index aa60c91..0000000
--- a/redhat-rpm-config-9.1.0-dwz.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- redhat-rpm-config-9.1.0/macros.dwz.jj	2012-06-25 13:08:44.854489913 +0200
-+++ redhat-rpm-config-9.1.0/macros.dwz	2012-06-25 13:03:55.520112180 +0200
-@@ -0,0 +1,39 @@ 
-+# Macros for reducing debug info size using dwz(1) utility.
-+
-+# The two default values below should result in dwz taking at most
-+# 3GB of RAM or so on 64-bit hosts and 2.5GB on 32-bit hosts
-+# on the largest *.debug files  (in mid 2012 those are
-+# libreoffice-debuginfo, debuginfos containing
-+# libxul.so.debug and libwebkitgtk-*.so.*.debug).
-+# This needs to be tuned based on the amount of available RAM
-+# on build boxes for each architecture as well as virtual address
-+# space limitations if dwz is 32-bit program.  While it needs less
-+# memory than 64-bit program because pointers are smaller, it can
-+# never have more than 4GB-epsilon of RAM and on some architecture
-+# even less than that (e.g. 2GB).
-+
-+# Number of debugging information entries (DIEs) above which
-+# dwz will stop considering file for multifile optimizations
-+# and enter a low memory mode, in which it will optimize
-+# in about half the memory needed otherwise.
-+%_dwz_low_mem_die_limit		 10000000
-+# Number of DIEs above which dwz will stop processing
-+# a file altogether.
-+%_dwz_max_die_limit     	 50000000
-+
-+# On x86_64 increase the higher limit to make libwebkit* optimizable.
-+# libwebkit* in mid 2012 contains roughly 87mil DIEs, and 64-bit
-+# dwz is able to optimize it from ~1.1GB to ~410MB using 5.2GB of RAM.
-+%_dwz_max_die_limit_x86_64	110000000
-+
-+# On ARM, build boxes often have only 512MB of RAM and are very slow.
-+# Lower both the limits.
-+%_dwz_low_mem_die_limit_armv5tel  4000000
-+%_dwz_low_mem_die_limit_armv7hl	  4000000
-+%_dwz_max_die_limit_armv5tel	 10000000
-+%_dwz_max_die_limit_armv7hl	 10000000
-+
-+%_dwz_limit() %{expand:%%{?%{1}_%{_arch}}%%{!?%{1}_%{_arch}:%%%{1}}}
-+%_find_debuginfo_dwz_opts --run-dwz\\\
-+   --dwz-low-mem-die-limit %{_dwz_limit _dwz_low_mem_die_limit}\\\
-+   --dwz-max-die-limit %{_dwz_limit _dwz_max_die_limit}
diff --git a/redhat-rpm-config-9.1.0-fcflags.patch b/redhat-rpm-config-9.1.0-fcflags.patch
deleted file mode 100644
index 5b450d7..0000000
--- a/redhat-rpm-config-9.1.0-fcflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.fcflags redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.fcflags	2013-04-23 07:26:57.202073011 +0300
-+++ redhat-rpm-config-9.1.0/macros	2013-04-23 07:29:21.401036883 +0300
-@@ -32,6 +32,7 @@
-   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-+  FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \
-   LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
-   for i in $(find . -name config.guess -o -name config.sub) ; do \
-       [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
diff --git a/redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch b/redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
deleted file mode 100644
index 045dfb2..0000000
--- a/redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: redhat-rpm-config-9.1.0/macros
-===================================================================
---- redhat-rpm-config-9.1.0.orig/macros
-+++ redhat-rpm-config-9.1.0/macros
-@@ -262,7 +262,7 @@ kernel_module_package_release	1
- # actually set up the filtering bits 
- %filter_setup %{expand: \
- %global _use_internal_dependency_generator 0 \
--%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u \
-+%global __deploop() while read FILE; do echo "${FILE}" | /usr/lib/rpm/rpmdeps -%{1}; done | /bin/sort -u \
- %global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
- %global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
- }
diff --git a/redhat-rpm-config-9.1.0-fix-requires.patch b/redhat-rpm-config-9.1.0-fix-requires.patch
deleted file mode 100644
index 8c07eed..0000000
--- a/redhat-rpm-config-9.1.0-fix-requires.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 635437c7bfe6053dcfe112705b809bb78aba1a73
-Author: Panu Matilainen <pmatilai@redhat.com>
-Date:   Mon Feb 15 13:42:36 2010 +0200
-
-    Unbreak find-requires (#443015, #564527)
-    - regression originating from commit 9ed9b4e3459e3125befd324f579f751a239c26ca
-      which was supposed to fix something for on ARM but broke pretty much
-      all else
-    - this should've been in 9.1.0 but somehow gone missing, ugh...
-    - fix originally from Bill Nottingham
-
-diff --git a/find-requires b/find-requires
-index fa5ab95..eb3ee54 100755
---- a/find-requires
-+++ b/find-requires
-@@ -106,6 +106,7 @@ for f in $liblist $exelist ; do
- 		print $2 ;
- 	    }
- 	}
-+	(START==2) && /^[A-Za-z]/ { START=3; }
- 	/^Version References:$/ { START=2; }
- 	(START==2) && /required from/ {
- 	    sub(/:/, "", $3);
-@@ -114,7 +115,6 @@ for f in $liblist $exelist ; do
- 	(START==2) && (LIBNAME!="") && ($4!="") {
- 	    print LIBNAME "(" $4 ")'$lib64'";
- 	}
--	/^[A-Za-z]/ { START=3; }
-     '
- done | sort -u
- 
diff --git a/redhat-rpm-config-9.1.0-hardened.patch b/redhat-rpm-config-9.1.0-hardened.patch
deleted file mode 100644
index 007a6c1..0000000
--- a/redhat-rpm-config-9.1.0-hardened.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.jx redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.jx	2011-08-03 15:42:20.267064981 -0400
-+++ redhat-rpm-config-9.1.0/macros	2011-08-03 15:44:46.581058603 -0400
-@@ -184,8 +184,15 @@ unset DISPLAY\
- %__find_provides        /usr/lib/rpm/redhat/find-provides
- %__find_requires        /usr/lib/rpm/redhat/find-requires
- 
--%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
--%__global_ldflags	-Wl,-z,relro
-+%_hardening_cflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
-+%_hardening_ldflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-ld
-+
-+#_hardened_build	0
-+%_hardened_cflags	%{?_hardened_build:%{_hardening_cflags}}
-+%_hardened_ldflags	%{?_hardened_build:%{_hardening_ldflags}}
-+
-+%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 %{_hardened_cflags}
-+%__global_ldflags	-Wl,-z,relro %{_hardened_ldflags}
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
- redhat_kernel_module_package	1
diff --git a/redhat-rpm-config-9.1.0-jar-repack-perms.patch b/redhat-rpm-config-9.1.0-jar-repack-perms.patch
deleted file mode 100644
index 4268526..0000000
--- a/redhat-rpm-config-9.1.0-jar-repack-perms.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/brp-java-repack-jars.jar-repack-perms redhat-rpm-config-9.1.0/brp-java-repack-jars
---- redhat-rpm-config-9.1.0/brp-java-repack-jars.jar-repack-perms	2013-07-05 13:21:56.548998671 +0300
-+++ redhat-rpm-config-9.1.0/brp-java-repack-jars	2013-07-05 13:22:50.962398381 +0300
-@@ -35,8 +35,8 @@ if [ ! -z "$JARS" ]; then
- 		
- 		pushd "$JTMPDIR" > /dev/null
- 		/usr/bin/unzip -qq -o "$j"
--		find -type d -exec chmod a+rx {} \;
--		find -type f -exec chmod a+r {} \;
-+		find -type d -exec chmod a+rx,u+w {} \;
-+		find -type f -exec chmod a+r,u+w {} \;
- 		rm -f "$j"
- 		
- 		# Create the directories first.
diff --git a/redhat-rpm-config-9.1.0-java-repack-order.patch b/redhat-rpm-config-9.1.0-java-repack-order.patch
deleted file mode 100644
index fb83e96..0000000
--- a/redhat-rpm-config-9.1.0-java-repack-order.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: redhat-rpm-config-9.1.0/brp-java-repack-jars
-===================================================================
---- redhat-rpm-config-9.1.0.orig/brp-java-repack-jars
-+++ redhat-rpm-config-9.1.0/brp-java-repack-jars
-@@ -79,7 +79,10 @@ if [ ! -z "$JARS" ]; then
- 		pushd $JARDIR > /dev/null
- 
- 		if [ -n "`find -not -name '.'`" ]; then
--			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -q -X -9 $j -@
-+			if [ -e META-INF/MANIFEST.MF ]; then
-+			    /usr/bin/zip -q -X -9 $j META-INF/MANIFEST.MF
-+			fi
-+			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 $j -@
- 		else
- 			# Put the empty jar back
- 			touch $j
diff --git a/redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch b/redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
deleted file mode 100644
index 44172f3..0000000
--- a/redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: redhat-rpm-config-9.1.0/brp-java-repack-jars
-===================================================================
---- redhat-rpm-config-9.1.0.orig/brp-java-repack-jars
-+++ redhat-rpm-config-9.1.0/brp-java-repack-jars
-@@ -25,17 +25,19 @@ if [ ! -z "$JARS" ]; then
- 	
- 	# unpack every jar, set the date of the files and directories and 
- 	# repack the jar
-+	OLD_IFS="$IFS"
-+	IFS=$(printf '\n\t')
- 	for j in $JARS ; do
--		JARNAME=`basename $j`
--		JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.tmpdir.XXXXXXXXXX` || exit 1
--		JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.jardir.XXXXXXXXXX` || exit 1
--		TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp $JARNAME.timeref.XXXXXXXXXX` || exit 1
-+		JARNAME=`basename "$j"`
-+		JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1
-+		JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1
-+		TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp "$JARNAME.timeref.XXXXXXXXXX"` || exit 1
- 		
--		pushd $JTMPDIR > /dev/null
--		/usr/bin/unzip -qq -o $j
-+		pushd "$JTMPDIR" > /dev/null
-+		/usr/bin/unzip -qq -o "$j"
- 		find -type d -exec chmod a+rx {} \;
- 		find -type f -exec chmod a+r {} \;
--		rm -f $j
-+		rm -f "$j"
- 		
- 		# Create the directories first.
- 		find -type d | LC_ALL=C sort | while read d; do
-@@ -76,24 +78,25 @@ if [ ! -z "$JARS" ]; then
- 		done
- 
- 		# make the jar
--		pushd $JARDIR > /dev/null
-+		pushd "$JARDIR" > /dev/null
- 
- 		if [ -n "`find -not -name '.'`" ]; then
- 			if [ -e META-INF/MANIFEST.MF ]; then
--			    /usr/bin/zip -q -X -9 $j META-INF/MANIFEST.MF
-+			    /usr/bin/zip -q -X -9 "$j" META-INF/MANIFEST.MF
- 			fi
--			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 $j -@
-+			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 "$j" -@
- 		else
- 			# Put the empty jar back
--			touch $j
-+			touch "$j"
- 		fi
- 		popd > /dev/null
- 
- 		# Cleanup.
--		rm -rf $JTMPDIR
--		rm -rf $JARDIR
--		rm -f $TIMEREF
-+		rm -rf "$JTMPDIR"
-+		rm -rf "$JARDIR"
-+		rm -f "$TIMEREF"
- 	done
-+	IFS="$OLD_IFS"
- 
- 	# remove $RPM_BUILD_ROOT/tmp if we created it
- 	if [ $rmtmp -eq 1 ]; then
diff --git a/redhat-rpm-config-9.1.0-kernel-source.patch b/redhat-rpm-config-9.1.0-kernel-source.patch
deleted file mode 100644
index 965fabe..0000000
--- a/redhat-rpm-config-9.1.0-kernel-source.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: redhat-rpm-config-9.1.0/macros
-===================================================================
---- redhat-rpm-config-9.1.0.orig/macros
-+++ redhat-rpm-config-9.1.0/macros
-@@ -239,7 +239,7 @@ kernel_module_package_release	1
- 		done \
- 	fi \
- 	echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \
--	echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}-")%_target_cpu" \
-+	echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}.")%_target_cpu" \
- 	if [ ! -z "%{-f*}" ] \
- 	then \
- 		filelist="%{-f*}" \
diff --git a/redhat-rpm-config-9.1.0-libtool-hardened-build.patch b/redhat-rpm-config-9.1.0-libtool-hardened-build.patch
deleted file mode 100644
index 28c77c6..0000000
--- a/redhat-rpm-config-9.1.0-libtool-hardened-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur redhat-rpm-config-9.1.0.orig/macros redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0.orig/macros	2014-01-12 11:24:18.866139925 -0700
-+++ redhat-rpm-config-9.1.0/macros	2014-01-12 11:26:28.182832378 -0700
-@@ -29,6 +29,7 @@
- #==============================================================================
- # ---- configure and makeinstall.
- #
-+%_configure_libtool_hardening_hack	1
- %_configure ./configure
- %configure \
-   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-@@ -39,6 +40,10 @@
-   for i in $(find . -name config.guess -o -name config.sub) ; do \
-       [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
-   done ; \
-+  [ "%_configure_libtool_hardening_hack" = 1 ] && [ x != "x%{_hardened_ldflags}" ] && \
-+      for i in $(find . -name ltmain.sh) ; do \
-+        %{__sed} -i.backup -e 's~compiler_flags=$~compiler_flags="%{_hardened_ldflags}"~' $i \
-+      done ; \
-   %{_configure} --build=%{_build} --host=%{_host} \\\
- 	--program-prefix=%{?_program_prefix} \\\
- 	--disable-dependency-tracking \\\
-@@ -174,6 +179,7 @@
- %__find_requires        /usr/lib/rpm/redhat/find-requires
- 
- %_hardening_cflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
-+# we don't escape symbols '~', '"', etc. so be careful when changing this
- %_hardening_ldflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-ld
- 
- #_hardened_build	0
diff --git a/redhat-rpm-config-9.1.0-minidebuginfo.patch b/redhat-rpm-config-9.1.0-minidebuginfo.patch
deleted file mode 100644
index 03f92d8..0000000
--- a/redhat-rpm-config-9.1.0-minidebuginfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- redhat-rpm-config-9.1.0/macros	2012-06-11 11:48:58.144578684 +0200
-+++ redhat-rpm-config-9.1.0/macros.minidebug	2012-06-11 11:49:18.444255286 +0200
-@@ -22,6 +22,7 @@ 
- %_fmoddir		%{_libdir}/gfortran/modules
- 
- %_enable_debug_packages 1
-+%_include_minidebuginfo 1
- 
- #==============================================================================
- # ---- configure and makeinstall.
diff --git a/redhat-rpm-config-9.1.0-ncpus-max.patch b/redhat-rpm-config-9.1.0-ncpus-max.patch
deleted file mode 100644
index b2d4f71..0000000
--- a/redhat-rpm-config-9.1.0-ncpus-max.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.ncpus redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.ncpus	2013-06-27 09:54:38.663039820 +0300
-+++ redhat-rpm-config-9.1.0/macros	2013-06-27 09:54:50.746135882 +0300
-@@ -71,10 +71,13 @@
- 	infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
-   install
- 
-+# Maximum number of CPU's to use when building, 0 for unlimited.
-+%_smp_ncpus_max 16
- %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
- 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
--        if [ "$RPM_BUILD_NCPUS" -gt 16 ]; then echo "-j16"; \\\
--        elif [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
-+        ncpus_max=%{?_smp_ncpus_max}; \\\
-+        if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$RPM_BUILD_NCPUS" -gt "$ncpus_max" ]; then RPM_BUILD_NCPUS="$ncpus_max"; fi; \\\
-+        if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
- 
- #==============================================================================
- # ---- Build policy macros.
diff --git a/redhat-rpm-config-9.1.0-no-strip-note.patch b/redhat-rpm-config-9.1.0-no-strip-note.patch
deleted file mode 100644
index bcb5bd0..0000000
--- a/redhat-rpm-config-9.1.0-no-strip-note.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 055d0b77e1e2823daef60a4c2b201531dc0c7248
-Author: Panu Matilainen <pmatilai@redhat.com>
-Date:   Mon Mar 1 10:58:17 2010 +0200
-
-    Don't run brp-strip-comment-note when find-debuginfo.sh is run (#568924)
-    - brp-strip-comment-note is not only unnecessary here but is also
-      now messing up things by resetting EI_OSABI to zero (#568921)
-    - patch from  Roland McGrath
-
-diff --git a/macros b/macros
-index 7721fe0..1ac46d7 100644
---- a/macros
-+++ b/macros
-@@ -92,9 +92,11 @@
- 
- %__os_install_post    \
-     /usr/lib/rpm/redhat/brp-compress \
--    %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip}} \
--    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
-+    %{!?__debug_package:\
-+    /usr/lib/rpm/redhat/brp-strip %{__strip} \
-     /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
-+    } \
-+    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
-     /usr/lib/rpm/brp-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build} \
-     /usr/lib/rpm/redhat/brp-python-hardlink \
-     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
diff --git a/redhat-rpm-config-9.1.0-pkgconfig-private.patch b/redhat-rpm-config-9.1.0-pkgconfig-private.patch
deleted file mode 100644
index c467d89..0000000
--- a/redhat-rpm-config-9.1.0-pkgconfig-private.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- redhat-rpm-config-9.1.0/find-requires.pkgconfig	2010-05-26 19:38:28.892598734 -0400
-+++ redhat-rpm-config-9.1.0/find-requires.pkgconfig.new-pkgconfig	2010-05-26 19:39:40.174602325 -0400
-@@ -4,7 +4,7 @@ test -x $pkgconfig || exit 0
- while read filename ; do
- case "${filename}" in
- *.pc)
--	$pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
-+	$pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
- 		echo "pkgconfig($n)" "$r" "$v"
- 	done
- esac
diff --git a/redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch b/redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch
deleted file mode 100644
index 6ee44fc..0000000
--- a/redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- redhat-rpm-config-9.1.0-orig/rpmrc	2012-01-15 12:17:17.320694234 -0600
-+++ redhat-rpm-config-9.1.0/rpmrc	2012-01-15 12:19:36.883275451 -0600
-@@ -27,9 +27,9 @@
- optflags: ppc %{__global_cflags} -m32
- optflags: ppciseries %{__global_cflags} -m32
- optflags: ppcpseries %{__global_cflags} -m32
--optflags: ppc64 %{__global_cflags} -m64 -mminimal-toc
--optflags: ppc64iseries %{__global_cflags} -m64 -mminimal-toc
--optflags: ppc64pseries %{__global_cflags} -m64 -mminimal-toc
-+optflags: ppc64 %{__global_cflags} -m64
-+optflags: ppc64iseries %{__global_cflags} -m64
-+optflags: ppc64pseries %{__global_cflags} -m64
- optflags: ppc8260 %{__global_cflags} -m32
- optflags: ppc8560 %{__global_cflags} -m32
- 
diff --git a/redhat-rpm-config-9.1.0-ppc64le.patch b/redhat-rpm-config-9.1.0-ppc64le.patch
deleted file mode 100644
index 29448cc..0000000
--- a/redhat-rpm-config-9.1.0-ppc64le.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/rpmrc.ppc64le redhat-rpm-config-9.1.0/rpmrc
---- redhat-rpm-config-9.1.0/rpmrc.ppc64le	2014-03-24 17:20:09.000000000 +0100
-+++ redhat-rpm-config-9.1.0/rpmrc	2014-03-24 17:20:53.000000000 +0100
-@@ -28,6 +28,7 @@ optflags: ppc %{__global_cflags} -m32
- optflags: ppciseries %{__global_cflags} -m32
- optflags: ppcpseries %{__global_cflags} -m32
- optflags: ppc64 %{__global_cflags} -m64
-+optflags: ppc64le %{__global_cflags} -m64
- optflags: ppc64iseries %{__global_cflags} -m64
- optflags: ppc64pseries %{__global_cflags} -m64
- optflags: ppc8260 %{__global_cflags} -m32
diff --git a/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch b/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
deleted file mode 100644
index d724b21..0000000
--- a/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/brp-python-hardlink b/brp-python-hardlink
-index a937529..210d69c 100755
---- a/brp-python-hardlink
-+++ b/brp-python-hardlink
-@@ -10,8 +10,8 @@ fi
- find "$RPM_BUILD_ROOT" -type f -name "*.pyc" | while read pyc ; do
-        pyo="$(echo $pyc | sed -e 's/.pyc$/.pyo/')"
-        if [ -f "$pyo" ] ; then
--               csha="$(sha1sum -b $pyc | cut -d' ' -f 1)" && \
--               osha="$(sha1sum -b $pyo | cut -d' ' -f 1)" && \
-+               csha="$(sha1sum -b "$pyc" | cut -d' ' -f 1)" && \
-+               osha="$(sha1sum -b "$pyo" | cut -d' ' -f 1)" && \
-                if [ "$csha" = "$osha" ] ; then
-                        ln -f "$pyc" "$pyo"
-                fi
diff --git a/redhat-rpm-config-9.1.0-record-switches.patch b/redhat-rpm-config-9.1.0-record-switches.patch
deleted file mode 100644
index 881e366..0000000
--- a/redhat-rpm-config-9.1.0-record-switches.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.record-switches redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.record-switches	2013-04-22 13:17:29.319358036 +0300
-+++ redhat-rpm-config-9.1.0/macros	2013-04-22 13:17:44.665308442 +0300
-@@ -171,7 +171,7 @@ package or when debugging this package.\
- %_hardened_cflags	%{?_hardened_build:%{_hardening_cflags}}
- %_hardened_ldflags	%{?_hardened_build:%{_hardening_ldflags}}
- 
--%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 %{_hardened_cflags}
-+%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags}
- %__global_ldflags	-Wl,-z,relro %{_hardened_ldflags}
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
diff --git a/redhat-rpm-config-9.1.0-relro.patch b/redhat-rpm-config-9.1.0-relro.patch
deleted file mode 100644
index 10c09d6..0000000
--- a/redhat-rpm-config-9.1.0-relro.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.jx redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.jx	2011-07-07 13:10:18.000000000 -0400
-+++ redhat-rpm-config-9.1.0/macros	2011-07-07 13:12:00.299594529 -0400
-@@ -31,6 +31,7 @@
-   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-+  LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
-   %{_configure} --build=%{_build} --host=%{_host} \\\
- 	--program-prefix=%{?_program_prefix} \\\
- 	--disable-dependency-tracking \\\
-@@ -184,6 +185,7 @@ unset DISPLAY\
- %__find_requires        /usr/lib/rpm/redhat/find-requires
- 
- %__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
-+%__global_ldflags	-Wl,-z,relro
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
- redhat_kernel_module_package	1
diff --git a/redhat-rpm-config-9.1.0-stackprotector-strong.patch b/redhat-rpm-config-9.1.0-stackprotector-strong.patch
deleted file mode 100644
index 0e1820a..0000000
--- a/redhat-rpm-config-9.1.0-stackprotector-strong.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up redhat-rpm-config-9.1.0/macros.stackprotector-strong redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0/macros.stackprotector-strong	2013-07-04 10:21:30.078245504 +0300
-+++ redhat-rpm-config-9.1.0/macros	2013-07-04 10:21:44.509357128 +0300
-@@ -178,7 +178,7 @@ package or when debugging this package.\
- %_hardened_cflags	%{?_hardened_build:%{_hardening_cflags}}
- %_hardened_ldflags	%{?_hardened_build:%{_hardening_ldflags}}
- 
--%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags}
-+%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags}
- %__global_ldflags	-Wl,-z,relro %{_hardened_ldflags}
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
diff --git a/redhat-rpm-config-9.1.0-strict-format.patch b/redhat-rpm-config-9.1.0-strict-format.patch
deleted file mode 100644
index 7e2f05c..0000000
--- a/redhat-rpm-config-9.1.0-strict-format.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/macros b/macros
-index cf59046..f24b2ec 100644
---- a/macros
-+++ b/macros
-@@ -180,7 +180,7 @@ package or when debugging this package.\
- %_hardened_cflags	%{?_hardened_build:%{_hardening_cflags}}
- %_hardened_ldflags	%{?_hardened_build:%{_hardening_ldflags}}
- 
--%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags}
-+%__global_cflags	-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags}
- %__global_ldflags	-Wl,-z,relro %{_hardened_ldflags}
- 
- # Use these macros to differentiate between RH and other KMP implementation(s).
diff --git a/redhat-rpm-config-9.1.0-strict-python-bytecompile.patch b/redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
deleted file mode 100644
index e6d3059..0000000
--- a/redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 7cf1ad2dbb5af9b9012ba67b9687ad28c02578d6
-Author: Panu Matilainen <pmatilai@redhat.com>
-Date:   Wed Feb 3 12:52:30 2010 +0200
-
-    Enable strict python bytecompile mode (if rpm supports it)
-    - with %_python_bytecompile_errors_terminate_build set to non-zero,
-      byte-compilation errors will abort the build, this helps catch out
-      silly "improt foo" syntax errors early on
-    - not all .py files are valid python (they can be templates, inteded for
-      jython consumption etc), and what's valid can depend on the python
-      version (notably 2.x vs 3.x) so allow overriding from spec
-
-diff --git a/macros b/macros
-index 77844f0..7721fe0 100644
---- a/macros
-+++ b/macros
-@@ -95,7 +95,7 @@
-     %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip}} \
-     /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
-     /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
--    /usr/lib/rpm/brp-python-bytecompile %{__python} \
-+    /usr/lib/rpm/brp-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build} \
-     /usr/lib/rpm/redhat/brp-python-hardlink \
-     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
- %{nil}
-@@ -167,6 +167,10 @@ unset DISPLAY\
- # Should unpackaged files in a build root terminate a build?
- %_unpackaged_files_terminate_build    1
- 
-+#
-+## Should python bytecompilation errors terminate a build?
-+%_python_bytecompile_errors_terminate_build 1
-+
- # Use SHA-256 for FILEDIGESTS instead of default MD5
- %_source_filedigest_algorithm 8
- %_binary_filedigest_algorithm 8
diff --git a/redhat-rpm-config-9.1.0-unversioned-docdirs.patch b/redhat-rpm-config-9.1.0-unversioned-docdirs.patch
deleted file mode 100644
index c0f630b..0000000
--- a/redhat-rpm-config-9.1.0-unversioned-docdirs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur redhat-rpm-config-9.1.0.orig/macros redhat-rpm-config-9.1.0/macros
---- redhat-rpm-config-9.1.0.orig/macros	2013-07-24 14:45:29.972653928 -0600
-+++ redhat-rpm-config-9.1.0/macros	2013-07-24 14:46:14.419922188 -0600
-@@ -18,6 +18,8 @@
- %_mandir		%{_prefix}/share/man
- 
- %_defaultdocdir		%{_prefix}/share/doc
-+%_pkgdocdir             %{_docdir}/%{name}
-+%_docdir_fmt            %%{NAME}
- 
- %_fmoddir		%{_libdir}/gfortran/modules
- 
diff --git a/redhat-rpm-config-9.1.0-use-prefix-macro.patch b/redhat-rpm-config-9.1.0-use-prefix-macro.patch
deleted file mode 100644
index eac4395..0000000
--- a/redhat-rpm-config-9.1.0-use-prefix-macro.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: redhat-rpm-config-9.1.0/macros
-===================================================================
---- redhat-rpm-config-9.1.0.orig/macros
-+++ redhat-rpm-config-9.1.0/macros
-@@ -14,10 +14,10 @@
- %_prefix		/usr
- %_sysconfdir		/etc
- %_localstatedir		/var
--%_infodir		/usr/share/info
--%_mandir		/usr/share/man
-+%_infodir		%{_prefix}/share/info
-+%_mandir		%{_prefix}/share/man
- 
--%_defaultdocdir		%{_usr}/share/doc
-+%_defaultdocdir		%{_prefix}/share/doc
- 
- %_fmoddir		%{_libdir}/gfortran/modules
- 
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 840b15c..9d4b05f 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,79 +1,71 @@
+#                        TO WHOM IT MAY CONCERN
+#
+# 1) Don't add patches, dist-git is the upstream repository for this package.
+# 2) When making changes, update version by +1, leave release alone.
+#
+
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 9.1.0
-Release: 58%{?dist}
+Version: 10
+Release: 1%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
-URL: http://git.fedorahosted.org/git/redhat-rpm-config
-Source: redhat-rpm-config-%{version}.tar.bz2
+URL: http://pkgs.fedoraproject.org/cgit/redhat-rpm-config.git
+
+# Core rpm settings
+Source0: macros
+Source1: rpmrc
 
 # gcc specs files for hardened builds
-Source1: redhat-hardened-cc1
-Source2: redhat-hardened-ld
+Source50: redhat-hardened-cc1
+Source51: redhat-hardened-ld
 
-# 16082013 snapshots from http://git.savannah.gnu.org/gitweb/?p=config.git
-Source10: config.guess
-Source11: config.sub
-
-Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
-Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
-Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch
-Patch3: redhat-rpm-config-9.1.0-pkgconfig-private.patch
-# the macros defined by this patch are for things that need to be defined
+# The macros defined by these files are for things that need to be defined
 # at srpm creation time when it is not feasable to require the base packages
 # that would otherwise be providing the macros. other language/arch specific
 # macros should not be defined here but instead in the base packages that can
 # be pulled in at rpm build time, this is specific for srpm creation.
-Patch4: redhat-rpm-config-9.1.0-arches-macros.patch
-Patch5: redhat-rpm-config-9.1.0-arm.patch
-Patch6: redhat-rpm-config-9.1.0-relro.patch
-Patch7: redhat-rpm-config-9.1.0-hardened.patch
-Patch8: redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch
-Patch9: redhat-rpm-config-9.1.0-dwz.patch
-Patch10: redhat-rpm-config-9.1.0-minidebuginfo.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=783433
-Patch11: redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=853216
-Patch12:redhat-rpm-config-9.1.0-use-prefix-macro.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=648996
-Patch13: redhat-rpm-config-9.1.0-kernel-source.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=465664
-Patch14: redhat-rpm-config-9.1.0-java-repack-order.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=741089
-Patch15: 0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=783932
-Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=872737
-Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=951669
-Patch18: redhat-rpm-config-9.1.0-record-switches.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=951442
-Patch19: redhat-rpm-config-9.1.0-configfoo.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=909788
-Patch20: redhat-rpm-config-9.1.0-aarch64.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=914831
-Patch21: redhat-rpm-config-9.1.0-fcflags.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=669638
-Patch22: redhat-rpm-config-9.1.0-ncpus-max.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=978763
-Patch23: redhat-rpm-config-9.1.0-stackprotector-strong.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=905573
-Patch24: redhat-rpm-config-9.1.0-jar-repack-perms.patch
-# Hacky fix for hardened build and libtool. 
-# Should be dropped as soon as libtool is fixed. 
-# https://bugzilla.redhat.com/show_bug.cgi?id=978949
-Patch25: redhat-rpm-config-9.1.0-libtool-hardened-build.patch
-%if 0%{?fedora} >= 20
-# Drop versioning on docdirs in Fedora 20+
-# https://bugzilla.redhat.com/show_bug.cgi?id=986871
-Patch26: redhat-rpm-config-9.1.0-unversioned-docdirs.patch
-# Enable "-Werror=format-security" by default
-Patch27: redhat-rpm-config-9.1.0-strict-format.patch
-%endif
-# enable ppc64le otherwise default rpm cflags will be used
-Patch28: redhat-rpm-config-9.1.0-ppc64le.patch
+Source100: macros.ghc-srpm
+Source101: macros.gnat-srpm
+Source102: macros.mono-srpm
+Source103: macros.nodejs-srpm
+Source104: macros.ocaml-srpm
 
+# Other misc macros
+Source150: macros.dwz
+
+# Build policy scripts
+Source200: brp-compress
+Source201: brp-implant-ident-static
+Source202: brp-java-repack-jars
+Source203: brp-python-hardlink
+Source204: brp-strip
+Source205: brp-strip-comment-note
+Source206: brp-strip-shared
+Source207: brp-strip-static-archive
+
+# Dependency generator scripts (deprecated)
+Source300: find-provides
+Source301: find-provides.ksyms
+Source302: find-provides.libtool
+Source303: find-provides.pkgconfig
+Source304: find-requires
+Source305: find-requires.ksyms
+Source306: find-requires.libtool
+Source307: find-requires.pkgconfig
+Source308: firmware.prov
+Source309: modalias.prov
+
+# Misc helper scripts
+Source400: dist.sh
+Source401: rpmsort
+Source402: symset-table
+Source403: kmodtool
+
+# 16082013 snapshots from http://git.savannah.gnu.org/gitweb/?p=config.git
+Source500: config.guess
+Source501: config.sub
 
 BuildArch: noarch
 Requires: coreutils
@@ -83,64 +75,42 @@ Requires: dwz >= 0.4
 Requires: zip
 Provides: system-rpm-config = %{version}-%{release}
 
+%global rrcdir %{_prefix}/lib/rpm/redhat
+
 %description
 Red Hat specific rpm configuration files.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-# Only make docs change in Fedora 20+
-%if 0%{?fedora} >= 20
-%patch26 -p1
-%endif
-
-%patch27 -p1
-%patch28 -p1
-%build
+# Not strictly necessary but allows working on file names instead
+# of source numbers in install section
+%setup -c -T
+cp -p %{sources} .
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
-install -m 0444 %{SOURCE1} %{SOURCE2} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
-install -m 0755 %{SOURCE10} %{SOURCE11} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
-find ${RPM_BUILD_ROOT} -name \*.orig -delete
-# buggy makefile in 9.1.0 leaves changelog in wrong place
-find ${RPM_BUILD_ROOT} -name ChangeLog -delete
+mkdir -p %{buildroot}%{rrcdir}
+install -p -m 644 -t %{buildroot}%{rrcdir} macros rpmrc
+install -p -m 444 -t %{buildroot}%{rrcdir} redhat-hardened-*
+install -p -m 755 -t %{buildroot}%{rrcdir} config.*
+install -p -m 755 -t %{buildroot}%{rrcdir} dist.sh rpmsort symset-table kmodtool
+install -p -m 755 -t %{buildroot}%{rrcdir} brp-*
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+install -p -m 755 -t %{buildroot}%{rrcdir} find-*
+mkdir -p %{buildroot}%{rrcdir}/find-provides.d
+install -p -m 644 -t %{buildroot}%{rrcdir}/find-provides.d *.prov
+
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -p -m 644 -t %{buildroot}%{_sysconfdir}/rpm macros.*
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog
-%{_prefix}/lib/rpm/redhat
+%{rrcdir}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Wed Apr 02 2014  Panu Matilainen <pmatilai@redhat.com> - 10-1
+- Make fedora dist-git the upstream of this package and its sources
+- Add maintainer comments to spec wrt versioning and changes
+
 * Mon Mar 24 2014 Dan Horák <dan[at]danny.cz> - 9.1.0-58
 - enable ppc64le otherwise default rpm cflags will be used