- merged macros.java and find-java-requires script from AC-branch

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 777d0fb6968b4d8c1a26aee3769c1336b41efdf7..b6a340233938b022edb2e34b96ed2399d1ba0181 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -54,6 +54,8 @@ Source11:     %{name}.sysinfo
 Source12:      perl.prov
 Source13:      %{name}-user_group.sh
 Source14:      %{name}.sysconfig
+Source15:      %{name}-macros.java
+Source16:      %{name}-java-requires
 Source30:      builder
 Source31:      adapter.awk
 Source32:      pldnotify.awk
@@ -70,7 +72,7 @@ Patch7:               %{name}-scripts-closefds.patch
 Patch8:                %{name}-python-macros.patch
 Patch9:                %{name}-gettext-in-header.patch
 Patch10:       %{name}-compress-doc.patch
-Patch11:       %{name}-rpmdeps-segv.patch
+
 Patch12:       %{name}-system_libs.patch
 Patch13:       %{name}-bb-and-short-circuit.patch
 Patch14:       %{name}-etc_dir.patch
@@ -84,12 +86,11 @@ Patch21:    %{name}-dontneedutils.patch
 Patch22:       %{name}-provides-dont-obsolete.patch
 Patch23:       %{name}-pkgconfigdeps.patch
 Patch24:       %{name}-po.patch
-Patch25:       %{name}-glob.patch
+
 Patch26:       %{name}-notsc.patch
 Patch27:       %{name}-hack-norpmlibdep.patch
 Patch28:       %{name}-makefile-no_myLDADD_deps.patch
-Patch29:       %{name}-ds.patch
-Patch30:       %{name}-locale.patch
+
 Patch31:       %{name}-missing-prototypes.patch
 Patch32:       %{name}-pld-autodep.patch
 Patch33:       %{name}-arch-x86_64.patch
@@ -97,8 +98,7 @@ Patch34:      %{name}-epoch0.patch
 Patch35:       %{name}-perl_req-INC_dirs.patch
 Patch36:       %{name}-debuginfo.patch
 Patch37:       %{name}-doxygen_hack.patch
-Patch38:       %{name}-empty-rpmlock-path.patch
-Patch39:       %{name}-version.patch
+
 Patch41:       %{name}-reduce-stack-usage.patch
 Patch42:       %{name}-old-fileconflicts-behaviour.patch
 
@@ -116,8 +116,6 @@ Patch55:    %{name}-truncate-cvslog.patch
 Patch57:       %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
-
-Patch64:       %{name}-iconv-translit.patch
 URL:           http://wraptastic.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -627,8 +625,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q
-# merged
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -639,8 +636,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-# obsolete
-#%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -661,42 +656,27 @@ install %{SOURCE5} scripts/find-lang.sh
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-# obsolete
-#%patch19 -p1
+%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-# merged
-#%patch24 -p1
-# merged
-#%patch25 -p1
+%patch24 -p1
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-# merged
-#%patch29 -p1
-# merged
-#%patch30 -p1
 %patch31 -p1
-# FIXME!
-# %patch32 -p1
-# merged
+%patch32 -p1
+# needed? I doubt
 # %patch33 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
-# FIXME
-#%patch37 -p1
-# CHECK ME
-#%patch38 -p1
-# obsolete
-#%patch39 -p1
+%patch37 -p1
 %patch41 -p1
 %patch42 -p1
 %{!?with_neon:%patch44 -p1}
-# WTF? this is merged?
-#%patch45 -p1
+%patch45 -p1
 %patch46 -p1
 %patch49 -p1
 %patch50 -p1
@@ -706,8 +686,6 @@ install %{SOURCE12} scripts/perl.prov
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
-# CHECK ME
-#%patch64 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -809,6 +787,7 @@ install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
 install macros.python  $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
 install macros.php     $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
+install %{SOURCE15}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -816,6 +795,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
+install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/find-java-requires
 install scripts/find-php*      $RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
@@ -1041,7 +1021,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmdeps
 %{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile}
 %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
-%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
 %attr(755,root,root) %{_rpmlibdir}/tgpg
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
 %{_mandir}/man8/rpm2cpio.8*