Author: qboosh Date: Mon May 21 22:50:40 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated pl.po,link,po,arch-x86_64 patches
- removed obsolete
rpmdeps-segv,ds,locale,empty-rpmlock-path,version,iconv-translit patches
---- Files affected:
SPECS:
rpm.spec (1.803 -> 1.804)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.803 SPECS/rpm.spec:1.804
--- SPECS/rpm.spec:1.803 Mon May 21 22:50:08 2007
+++ SPECS/rpm.spec Tue May 22 00:50:35 2007
@@ -71,7 +71,7 @@
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
@@ -89,8 +89,7 @@
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
@@ -98,8 +97,7 @@
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
@@ -117,8 +115,6 @@
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
@@ -628,8 +624,7 @@
%prep
%setup -q
-# merged
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -640,8 +635,6 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-# obsolete
-#%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -662,41 +655,31 @@
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
+%patch24 -p1
+# obsolete?
#%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
-# merged
-#%patch29 -p1
-# merged
-#%patch30 -p1
%patch31 -p1
# FIXME!
# %patch32 -p1
-# merged
+# needed? I doubt
# %patch33 -p1
%patch34 -p1
%patch35 -p0
%patch36 -p1
# FIXME
#%patch37 -p1
-# CHECK ME
-#%patch38 -p1
-# obsolete
-#%patch39 -p1
%patch41 -p1
%patch42 -p1
%{!?with_neon:%patch44 -p1}
-# WTF? this is merged?
+# UPDATEME
#%patch45 -p1
%patch46 -p1
%patch49 -p1
@@ -707,8 +690,6 @@
%patch57 -p1
%patch58 -p1
%patch59 -p1
-# CHECK ME
-#%patch64 -p1
cd scripts
mv -f perl.req perl.req.in
@@ -1184,6 +1165,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.804 2007/05/21 22:50:35 qboosh
+- updated pl.po,link,po,arch-x86_64 patches
+- removed obsolete
rpmdeps-segv,ds,locale,empty-rpmlock-path,version,iconv-translit patches
+
Revision 1.803 2007/05/21 20:50:08 arekm
- start messing with 4.4.9; patches need update
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.803&r2=1.804&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
