[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
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-Jul-2011 09:52:58
Branch: rpm-5_3 Handle: 2011072807525701
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br).
Summary:
RevisionChanges Path
1.3296.2.245+1 -0 rpm/CHANGES
1.4.2.4 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.244 -r1.3296.2.245 CHANGES
--- rpm/CHANGES 12 Jul 2011 10:45:05 - 1.3296.2.244
+++ rpm/CHANGES 28 Jul 2011 07:52:57 - 1.3296.2.245
@@ -1,4 +1,5 @@
5.3.12 - 5.3.13
+- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.3 -r1.4.2.4 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 9 May 2011 16:01:41 - 1.4.2.3
+++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:52:58 - 1.4.2.4
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.3 2011/05/09 16:01:41 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -633,7 +633,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
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: 29-Jul-2011 03:14:07
Branch: rpm-5_3 Handle: 2011072901140600
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
rename armv7hl to armv7l
(http://lists.fedoraproject.org/pipermail/arm/2011-July/001596.html)
Summary:
RevisionChanges Path
1.3296.2.246+1 -1 rpm/CHANGES
1.4.2.5 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.245 -r1.3296.2.246 CHANGES
--- rpm/CHANGES 28 Jul 2011 07:52:57 - 1.3296.2.245
+++ rpm/CHANGES 29 Jul 2011 01:14:06 - 1.3296.2.246
@@ -1,5 +1,5 @@
5.3.12 - 5.3.13
-- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
+- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.4 -r1.4.2.5 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:52:58 - 1.4.2.4
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 - 1.4.2.5
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -633,7 +633,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
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: 29-Jul-2011 06:16:07
Branch: rpm-5_3 Handle: 2011072904160600
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs
Summary:
RevisionChanges Path
1.3296.2.247+3 -0 rpm/CHANGES
1.4.2.6 +3 -3 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.246 -r1.3296.2.247 CHANGES
--- rpm/CHANGES 29 Jul 2011 01:14:06 - 1.3296.2.246
+++ rpm/CHANGES 29 Jul 2011 04:16:06 - 1.3296.2.247
@@ -1,4 +1,7 @@
5.3.12 - 5.3.13
+- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
+ all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
+ 64 bit archs
- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.5 -r1.4.2.6 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 - 1.4.2.5
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 - 1.4.2.6
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -639,10 +639,10 @@
%alpha alpha alphaev56 alphaev6 alphaev67
# and sparc
-%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
+%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v
sparcv9v2
# add alternative sparc architectures macro (bugzilla #455972 patch)
-%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+%sparcx %sparc sparc64 sparc64v
# also for mips
%mips mips mips2 mips3 mips4 octeon
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
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: 29-Jul-2011 06:27:50 Branch: rpm-5_3 Handle: 2011072904274901 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/macros macros.rpmbuild.in Log: add sparc64v2 arch to %sparcx Summary: RevisionChanges Path 1.3296.2.248+2 -1 rpm/CHANGES 1.4.2.7 +2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.247 -r1.3296.2.248 CHANGES --- rpm/CHANGES 29 Jul 2011 04:16:06 - 1.3296.2.247 +++ rpm/CHANGES 29 Jul 2011 04:27:49 - 1.3296.2.248 @@ -1,7 +1,8 @@ 5.3.12 - 5.3.13 +- proyvind: add sparc64v2 arch to %sparcx. - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND - 64 bit archs + 64 bit archs. - proyvind: add armv7l to %arm (from Paulo Andrade p...@mandriva.com.br). - proyvind: fix rpm not comparing distepoch if missing from one package when doing comparision. @@ . patch -p0 '@@ .' Index: rpm/macros/macros.rpmbuild.in $ cvs diff -u -r1.4.2.6 -r1.4.2.7 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 - 1.4.2.6 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:27:50 - 1.4.2.7 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.4.2.7 2011/07/29 04:27:50 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -642,7 +642,7 @@ %sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v sparcv9v2 # add alternative sparc architectures macro (bugzilla #455972 patch) -%sparcx %sparc sparc64 sparc64v +%sparcx %sparc sparc64 sparc64v sparc64v2 # also for mips %mips mips mips2 mips3 mips4 octeon @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in rpm/sc...
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: 10-Apr-2011 15:54:20
Branch: rpm-5_3 Handle: 2011041013541901
Added files: (Branch: rpm-5_3)
rpm/scripts check-multiarch-files mkmultiarch
multiarch-dispatch multiarch-dispatch.h
multiarch-platform
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
rpm/scripts Makefile.am
Log:
merge multiarch-utils from mandriva.
Summary:
RevisionChanges Path
1.3296.2.207+2 -1 rpm/CHANGES
1.4.2.1 +20 -2 rpm/macros/macros.rpmbuild.in
1.65.2.9+7 -1 rpm/scripts/Makefile.am
1.1.4.2 +92 -0 rpm/scripts/check-multiarch-files
1.1.4.2 +91 -0 rpm/scripts/mkmultiarch
1.1.4.2 +31 -0 rpm/scripts/multiarch-dispatch
1.1.4.2 +172 -0 rpm/scripts/multiarch-dispatch.h
1.1.4.2 +14 -0 rpm/scripts/multiarch-platform
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.206 -r1.3296.2.207 CHANGES
--- rpm/CHANGES 10 Apr 2011 11:20:51 - 1.3296.2.206
+++ rpm/CHANGES 10 Apr 2011 13:54:20 - 1.3296.2.207
@@ -1,5 +1,6 @@
5.3.10 - 5.3.11
- - proyvind: macros: sync with updated python macros from mandriva.
+- proyvind: merge multiarch-utils from mandriva.
+- proyvind: macros: sync with updated python macros from mandriva.
- proyvind: rpmfc: add internel dep generator helper for kernel modules.
- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4 -r1.4.2.1 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 31 Mar 2010 12:22:06 - 1.4
+++ rpm/macros/macros.rpmbuild.in 10 Apr 2011 13:54:19 - 1.4.2.1
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4 2010/03/31 12:22:06 jbj Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.1 2011/04/10 13:54:19 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -214,9 +214,27 @@
%_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_build1
+
+#
# Path to scripts to autogenerate package dependencies,
#
-# Note: Used iff _use_internal_dependency_generator is zero.
+# Note: Used if _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/scripts/Makefile.am
$ cvs diff -u -r1.65.2.8 -r1.65.2.9 Makefile.am
--- rpm/scripts/Makefile.am 10 Apr 2011 11:00:07 - 1.65.2.8
+++ rpm/scripts/Makefile.am 10 Apr 2011 13:54:19 - 1.65.2.9
@@ -21,6 +21,8 @@
check-java-closure.sh java.prov.sh java.req.sh \
gstreamer.sh javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
+ check-multiarch-files multiarch-platform multiarch-dispatch
+ multiarch-dispatch.h mkmultiarch \
nix_meta \
osgideps.pl pkgconfigdeps.sh \
perldeps.pl perl.prov perl.req pythondeps.sh pythoneggs.py \
@@ -42,7
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in mandri...
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:
RevisionChanges 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 - 1.3296.2.208
+++ rpm/CHANGES 11 Apr 2011 00:35:29 - 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 - 1.4.2.1
+++ rpm/macros/macros.rpmbuild.in 11 Apr 2011 00:35:30 - 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_build1
-
-#
# 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.in1 Apr 2011 00:01:08 - 1.1.2.15
+++ rpm/macros/mandriva.in11 Apr 2011 00:35:30 - 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_build1
+
%{load:/etc/rpm/macros.d/*.macros}
@@ .
__
RPM Package Manager
