RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 28-Apr-2011 18:00:54
Branch: rpm-5_3 Handle: 2011042816005400
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix multiarch path (from funda)
Summary:
Revision Changes Path
1.1.2.17 +3 -2 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.1.2.16 -r1.1.2.17 mandriva.in
--- rpm/macros/mandriva.in 11 Apr 2011 00:35:30 -0000 1.1.2.16
+++ rpm/macros/mandriva.in 28 Apr 2011 16:00:54 -0000 1.1.2.17
@@ -30,6 +30,7 @@
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
%manbo_mkrel() %mkrel
+%multiarch() %{1}
# This will enable the use of distepoch and disttag in stead of polluting
# %release with such.
@@ -101,8 +102,8 @@
%multiarch_platform multiarch-%{_arch}-%{_target_os}
%multiarch_bindir %{_bindir}/%{multiarch_platform}
%multiarch_includedir %{_includedir}/%{multiarch_platform}
-%multiarch_binaries() %{_rpmhome}/rpm/mkmultiarch binaries
%{1}
-%multiarch_includes() %{_rpmhome}/rpm/mkmultiarch includes
%{1}
+%multiarch_binaries() %{_rpmhome}/mkmultiarch binaries %{1}
+%multiarch_includes() %{_rpmhome}/mkmultiarch includes %{1}
# Check for need of multiarch, terminate build if needed and not used.
#
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
