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 16:58:46
Branch: rpm-5_4 Handle: 2012072014584501
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros mandriva.in
Log:
applied mdv rpm-5.4.9-ditch-install-info-macros.patch
Summary:
Revision Changes Path
1.3501.2.305+2 -0 rpm/CHANGES
1.7.2.22 +0 -9 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.304 -r1.3501.2.305 CHANGES
--- rpm/CHANGES 6 Jul 2012 16:31:55 -0000 1.3501.2.304
+++ rpm/CHANGES 20 Jul 2012 14:58:45 -0000 1.3501.2.305
@@ -1,3 +1,5 @@
+5.4.10 -> 5.4.11:
+ - mdawkins: applied mdv rpm-5.4.9-ditch-install-info-macros.patch
5.4.9 -> 5.4.10:
- mdawkins: tagged 5.4.10
- jbj: rpmns: reserve set(...) and dpkg(...) namespace syntax.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.7.2.21 -r1.7.2.22 mandriva.in
--- rpm/macros/mandriva.in 19 May 2012 20:37:44 -0000 1.7.2.21
+++ rpm/macros/mandriva.in 20 Jul 2012 14:58:46 -0000 1.7.2.22
@@ -137,15 +137,6 @@
%_extension .xz
-%__install_info /sbin/install-info
-
-%_install_info() if [[ -f %{_infodir}/%{1}%{_extension} ]]; then
%{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir; fi \
-%{nil}
-# (nb: keep the "alone on its line ';'")
-%_remove_install_info() if [ "$1" = "0" ]; then if [[ -f
%{_infodir}/%{1}%{_extension} ]]; then %{__install_info}
%{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir --remove ; fi; fi \
-%{nil}
-
-
# Macro: %{mklibname <name> [<major> [<minor>]] [-s] [-d]}
# - %{mklibname test} => lib64test, on a lib64 platform
# - %{mklibname test 1 -d} => libtest1-devel
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
