Merge some patches from cooker, drop haskell generators (superseeded by separate haskell-macros)

rpm.spec

@@ -59,7 +59,7 @@ Summary:	The RPM package management system
 Name:		rpm
 Epoch:		1
 Version:	%{libver}.%{minorver}
-Release:	%{?prereldate:0.%{prereldate}.}25
+Release:	%{?prereldate:0.%{prereldate}.}26
 License:	LGPLv2.1+
 Group:		System/Configuration/Packaging
 URL:		http://rpm5.org/
@@ -203,8 +203,7 @@ Patch91:	rpm-5.4.9-update-rpmfc-when-removing-dependencies-on-self.patch
 Patch92:	rpm-5.4.9-rpmfc-extract-dependencies-for-all-files.patch
 # status: ready for merge
 Patch93:	rpm-5.4.5-rubygems-add-missing-newline.patch
-# status: ugly, keep locally for now
+# Patch94:        rpm-5.4.9-generate-haskell-dependencies.patch
-Patch94:	rpm-5.4.9-generate-haskell-dependencies.patch
 # status: same as for other dep gen patches
 Patch95:	rpm-5.4.5-drop-some-interpreter-deps.patch
 # status: probably okay to merge..
@@ -355,6 +354,14 @@ Patch161:	rpm-5.4.10-search-through-buildroot-library-dirs-for-uclibc-deps.patch
 # status: same as for other dep gen patches
 Patch162:	rpm-5.4.10-fix-uninitialized-variable.patch
 
+# our own helper scripts needs to be run first so that library permissions gets
+# fixed for find-debuginfo.sh to properly strip them
+# status: ready as they only modify our own distribution specific macros..
+Patch165:       rpm-5.4.10-post-install-helper-order.patch
+# fixes issue with ldflags getting duplicated when configure is run more than once
+# status: ready
+Patch166:       rpm-5.4.10-fix-ldflags-passing.patch
+
 # this patch updates the upstream brp-compress scripts, which will be replacing
 # our own locally maintained compress-files script from spec-helper
 # status: ready
@@ -364,13 +371,30 @@ Patch170:	rpm-5.4.10-dbconvert-5.2.patch
 
 # Do not generate pythonegg provides for python3 until we find a better solution
 Patch171:	rpm-5.4.10-python3-egg-reqs.patch
-
+# status: ready
+Patch1710:       rpm-5.4.10-set-lc_ctype-to-utf8-when-building-gem.patch
+# resolve absolute path before setting $RPM_BUILD_DIR rather to fix same issue
+# without regression
+# status: ready
+Patch172:       rpm-5.4.10-resolve-absolute-path-to-RPM_BUILD_DIR-for-debugedit.patch
 # just fix a couple of minor memleaks at exit..
 # status: ready
 Patch173:       rpm-5.4.10-fix-a-couple-of-debugedit-memleaks.patch
 # make "canonicalization(...)shrank by one character" error message more useful
 # status: ready
 Patch174:       rpm-5.4.10-debugedit-saner-error-msg.patch
+# files added with %%doc gets copied to buildroot after %%install, preventing
+# ie. fix_eol to be run on these files (where it's usually most relevant),
+# so let's add support for specific scripts to be run after this and make sure
+# to execute fix_eol then..
+# status: kinda breaks use of (prolly' never used) $DONT_FIX_EOL variable,
+# while not feeling exactly perfectly implemented either, but works more than
+# satisfactory 'nuff for us, so should be discussed before merging upstream..
+Patch175:       rpm-5.4.10-run-spec-helper-at-end-of-doc-stage.patch
+# reverts change upstream that adds rpath to perl module
+# status: as it reverts a previous upstream change, it prolly' shouldn't be
+# merged, but probably worthwhile a discussion at least...
+Patch176:       rpm-5.4.10-drop-rpath-from-perl-module.patch
 
 # tool for automatically checking and fixing broken rpmdb
 # status: probably' worth merging upstream
@@ -391,6 +415,8 @@ Patch181:       rpm-5.4.10-printspec.patch
 Patch185:       rpm-5.4.10-disable-generation-of-buildid-provides.patch
 # backport from upstream
 Patch186:       rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch
+# backport from upstream
+Patch187:       rpm-5.4.10-adjust-trigger-counts-for-delayed-commit.patch
 
 Patch191:       rpm-5.4.10-enhance-rename-macro-to-accept-optional-second-version-arg.patch
 
@@ -444,8 +470,6 @@ Patch504:       rpm-5.4.10-postpone_subpackage_build_failures.patch
 # the new one doesn't work in ROSA atm
 Patch505:       rpm-5.4.10-turn-back-urlgetfile.patch
 
-
-
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	bzip2-devel
 BuildRequires:	automake >= 1.8
@@ -542,7 +566,6 @@ Requires(pre):	coreutils
 %rename		rpm-manbo-setup
 #rename		rpm-%{_target_vendor}-setup
 %rename		rpm-mandriva-setup
-Obsoletes:	haskell-macros < 6.4-5
 
 %description
 RPM is a powerful command line driven package management system capable of
@@ -753,7 +776,7 @@ This package contains the RPM API documentation generated in HTML format.
 %patch91 -p1 -b .fc_deps~
 %patch92 -p1 -b .rpmfc_ruby~
 %patch93 -p1 -b .rb_newline~
-%patch94 -p1 -b .haskell~
+# %patch94 -p1 -b .haskell~
 %patch95 -p1 -b .interpret_deps~
 %patch96 -p1 -b .uclibc~
 %patch97 -p1 -b .env_color~
@@ -817,12 +840,19 @@ This package contains the RPM API documentation generated in HTML format.
 %patch161 -p1 -b .uclibc_buildroot~
 %patch162 -p1 -b .uninitialized~
 
+%patch165 -p1 -b .helper_order~
+%patch166 -p1 -b .ldflags~
+
 %patch169 -p1 -b .brpcomp~
 %patch170 -p1 -b .dbconvert52~
 %patch171 -p1 -b .python3~
+%patch1710 -p1 -b .ruby_utf8~
+%patch172 -p1 -b .debug_path~
 
 %patch173 -p1 -b .debugedit_memleaks~
 %patch174 -p1 -b .debugedit_errmsg~
+%patch175 -p1 -b .doc_post~
+%patch176 -p1 -b .droprpath~
 
 %patch179 -p1 -b .rpmdbchk~
 %patch180 -p1 -b .typecast~
@@ -830,6 +860,7 @@ This package contains the RPM API documentation generated in HTML format.
 
 %patch185 -p1 -b .buildid_deps~
 %patch186 -p1 -b .rpkg_justdb~
+%patch187 -p1 -b .trig_cnt~
 
 %patch191 -p1 -b .rename~
 %patch192 -p1 -b .mem_assert~
@@ -1182,7 +1213,7 @@ ln -f %{buildroot}%{_rpmhome}/bin/{rpmluac,luac}
 %{_rpmhome}/gem_helper.rb
 %{_rpmhome}/getpo.sh
 %{_rpmhome}/gstreamer.sh
-%{_rpmhome}/haskelldeps.sh
+# %{_rpmhome}/haskelldeps.sh
 %{_rpmhome}/http.req
 %{_rpmhome}/javadeps.sh
 %{_rpmhome}/kmod-deps.sh