RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 20-Jul-2012 17:02:58
Branch: rpm-5_4 Handle: 2012072015025701
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros mandriva.in
Log:
applied mdv rpm-5.4.9-drop-dead-cputoolize-macro.patch
Summary:
Revision Changes Path
1.3501.2.306+1 -0 rpm/CHANGES
1.7.2.23 +0 -2 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.305 -r1.3501.2.306 CHANGES
--- rpm/CHANGES 20 Jul 2012 14:58:45 -0000 1.3501.2.305
+++ rpm/CHANGES 20 Jul 2012 15:02:57 -0000 1.3501.2.306
@@ -1,4 +1,5 @@
5.4.10 -> 5.4.11:
+ - mdawkins: applied mdv rpm-5.4.9-drop-dead-cputoolize-macro.patch
- mdawkins: applied mdv rpm-5.4.9-ditch-install-info-macros.patch
5.4.9 -> 5.4.10:
- mdawkins: tagged 5.4.10
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.7.2.22 -r1.7.2.23 mandriva.in
--- rpm/macros/mandriva.in 20 Jul 2012 14:58:46 -0000 1.7.2.22
+++ rpm/macros/mandriva.in 20 Jul 2012 15:02:58 -0000 1.7.2.23
@@ -342,8 +342,6 @@
%__fix_libtool_from_moving_options_after_libs
@USRLIBRPM@/@RPMCANONVENDOR@/fix-libtool-from-moving-options-after-libs
%__fix_dlsearch_path_in_libtool_for_multilib
@USRLIBRPM@/@RPMCANONVENDOR@/fix-dlsearch-path-in-libtool-for-multilib
-%__cputoolize cputoolize
-
%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ ! -f
configure.in -a ! -f configure.ac ] || %{__libtoolize} --copy --force)}
%ldflags %{?!_disable_ld_as_needed:
-Wl,--as-needed}%{?!_disable_ld_no_undefined:
-Wl,--no-undefined}%{?!_disable_ld_relro: -Wl,-z,relro}%{?!_disable_ld_O1:
-Wl,-O1}%{?!_disable_ld_build_id:
-Wl,--build-id}%{?!_disable_ld_enable_new_dtags:
-Wl,--enable-new-dtags}%{?_hardened_flags: %_hardened_flags}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
