RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Apr-2011 02:35:30
Branch: rpm-5_3 Handle: 2011041100352901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in mandriva.in
Log:
- move multiarch* to mandriva.in.
Summary:
Revision Changes Path
1.3296.2.209+1 -0 rpm/CHANGES
1.4.2.2 +2 -20 rpm/macros/macros.rpmbuild.in
1.1.2.16 +18 -0 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.208 -r1.3296.2.209 CHANGES
--- rpm/CHANGES 10 Apr 2011 22:57:26 -0000 1.3296.2.208
+++ rpm/CHANGES 11 Apr 2011 00:35:29 -0000 1.3296.2.209
@@ -1,4 +1,5 @@
5.3.10 -> 5.3.11
+ - jbj: move multiarch* to mandriva.in.
- jbj: put "devel(libfoo)" deps under RPM_VENDOR_MANDRIVA.
- proyvind: merge multiarch-utils from mandriva.
- proyvind: macros: sync with updated python macros from mandriva.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.rpmbuild.in
============================================================================
$ cvs diff -u -r1.4.2.1 -r1.4.2.2 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 10 Apr 2011 13:54:19 -0000 1.4.2.1
+++ rpm/macros/macros.rpmbuild.in 11 Apr 2011 00:35:30 -0000 1.4.2.2
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.1 2011/04/10 13:54:19 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.2 2011/04/11 00:35:30 jbj Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -214,27 +214,9 @@
%_filter_GLIBC_PRIVATE 0
#
-# multiarch is used to deal with situations where headers that contain
-# ie. architecture specific parts to solve file conflicts between
-# packages of different archs in multilib environments.
-#
-# Note: more details at http://wiki.mandriva.com/en/Policies/Multiarch
-%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}
-
-# Check for need of multiarch, terminate build if needed and not used.
-#
-# Note: The default value should be 0 for legacy compatibility.
-# TODO: fix check script and implement support for using
-#%_multiarch_required_terminate_build 1
-
-#
# Path to scripts to autogenerate package dependencies,
#
-# Note: Used if _use_internal_dependency_generator is zero.
+# Note: Used iff _use_internal_dependency_generator is zero.
#%__find_provides %{_rpmhome}/rpmdeps --provides
#%__find_requires %{_rpmhome}/rpmdeps --requires
%__find_provides %{_rpmhome}/find-provides
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.1.2.15 -r1.1.2.16 mandriva.in
--- rpm/macros/mandriva.in 1 Apr 2011 00:01:08 -0000 1.1.2.15
+++ rpm/macros/mandriva.in 11 Apr 2011 00:35:30 -0000 1.1.2.16
@@ -92,4 +92,22 @@
%_systemdconfdir %{_sysconfdir}/systemd
+#
+# multiarch is used to deal with situations where headers that contain
+# ie. architecture specific parts to solve file conflicts between
+# packages of different archs in multilib environments.
+#
+# Note: more details at http://wiki.mandriva.com/en/Policies/Multiarch
+%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}
+
+# Check for need of multiarch, terminate build if needed and not used.
+#
+# Note: The default value should be 0 for legacy compatibility.
+# TODO: fix check script and implement support for using
+#%_multiarch_required_terminate_build 1
+
%{load:/etc/rpm/macros.d/*.macros}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
