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

This commit is contained in:
Denis Silakov 2014-02-27 03:00:17 -05:00
parent 6b7663cc91
commit 9b3e50ac5b

View file

@ -203,6 +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
# Superseeded by haskell-scripts
# 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
@ -776,7 +777,6 @@ 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~
%patch95 -p1 -b .interpret_deps~
%patch96 -p1 -b .uclibc~
%patch97 -p1 -b .env_color~
@ -1213,7 +1213,6 @@ ln -f %{buildroot}%{_rpmhome}/bin/{rpmluac,luac}
%{_rpmhome}/gem_helper.rb
%{_rpmhome}/getpo.sh
%{_rpmhome}/gstreamer.sh
# %{_rpmhome}/haskelldeps.sh
%{_rpmhome}/http.req
%{_rpmhome}/javadeps.sh
%{_rpmhome}/kmod-deps.sh