[CVS] RPM: 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:50:40 Branch: HEAD Handle: 2011072807503901 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in Log: add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br). Summary: RevisionChanges Path 1.3663 +1 -0 rpm/CHANGES 1.9 +2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3662 -r1.3663 CHANGES --- rpm/CHANGES 12 Jul 2011 10:41:19 - 1.3662 +++ rpm/CHANGES 28 Jul 2011 07:50:39 - 1.3663 @@ -1,4 +1,5 @@ HEAD: +- 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.8 -r1.9 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 26 May 2011 14:26:27 - 1.8 +++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 - 1.9 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.8 2011/05/26 14:26:27 devzero2000 Exp $ +# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -634,7 +634,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/ 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:11:59 Branch: HEAD Handle: 2011072901115900 Modified files: 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.3664 +1 -1 rpm/CHANGES 1.10+2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3663 -r1.3664 CHANGES --- rpm/CHANGES 28 Jul 2011 07:50:39 - 1.3663 +++ rpm/CHANGES 29 Jul 2011 01:11:59 - 1.3664 @@ -1,5 +1,5 @@ HEAD: -- 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.9 -r1.10 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 - 1.9 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 - 1.10 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -634,7 +634,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/ 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:59:41 Branch: HEAD Handle: 2011072901594100 Modified files: 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.3665 +3 -0 rpm/CHANGES 1.11+3 -3 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3664 -r1.3665 CHANGES --- rpm/CHANGES 29 Jul 2011 01:11:59 - 1.3664 +++ rpm/CHANGES 29 Jul 2011 01:59:41 - 1.3665 @@ -1,4 +1,7 @@ HEAD: +- 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.10 -r1.11 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 - 1.10 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 - 1.11 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -640,10 +640,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/ 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:26:06 Branch: HEAD Handle: 2011072904260600 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in Log: add sparc64v2 arch to %sparcx Summary: RevisionChanges Path 1.3666 +2 -1 rpm/CHANGES 1.12+2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3665 -r1.3666 CHANGES --- rpm/CHANGES 29 Jul 2011 01:59:41 - 1.3665 +++ rpm/CHANGES 29 Jul 2011 04:26:06 - 1.3666 @@ -1,7 +1,8 @@ HEAD: +- 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.11 -r1.12 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 - 1.11 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:26:06 - 1.12 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.12 2011/07/29 04:26:06 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -643,7 +643,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/ CHANGES rpm/macros/ macros.rpmbuild.in mandriva.in
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:34:01 Branch: HEAD Handle: 2011041100340100 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in mandriva.in Log: - move multiarch* to mandriva.in. Summary: RevisionChanges Path 1.3612 +1 -0 rpm/CHANGES 1.7 +2 -20 rpm/macros/macros.rpmbuild.in 1.14+18 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3611 -r1.3612 CHANGES --- rpm/CHANGES 10 Apr 2011 22:53:03 - 1.3611 +++ rpm/CHANGES 11 Apr 2011 00:34:01 - 1.3612 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- 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.6 -r1.7 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 10 Apr 2011 13:50:28 - 1.6 +++ rpm/macros/macros.rpmbuild.in 11 Apr 2011 00:34:01 - 1.7 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.6 2011/04/10 13:50:28 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.7 2011/04/11 00:34:01 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.13 -r1.14 mandriva.in --- rpm/macros/mandriva.in1 Apr 2011 00:00:29 - 1.13 +++ rpm/macros/mandriva.in11 Apr 2011 00:34:01 - 1.14 @@ -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 Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: 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-Feb-2010 13:57:37 Branch: HEAD Handle: 2010022812573601 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in Log: add a %EVRD macro for use with versioned provides/requires to automatically add all the tags used for version comparison. Summary: RevisionChanges Path 1.3277 +2 -0 rpm/CHANGES 1.2 +6 -1 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3276 -r1.3277 CHANGES --- rpm/CHANGES 28 Feb 2010 03:20:39 - 1.3276 +++ rpm/CHANGES 28 Feb 2010 12:57:36 - 1.3277 @@ -1,5 +1,7 @@ 5.2b1 - 5.3a1 +- proyvind: add a %EVRD macro for use with versioned provides/requires to + automatically add all the tags used for version comparison. - proyvind: python: make sure that we always use our own rpm build and macros. - proyvind: filetriggers: don't pass filename as argument to scripts, @@ . patch -p0 '@@ .' Index: rpm/macros/macros.rpmbuild.in $ cvs diff -u -r1.1 -r1.2 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 21 Aug 2009 19:17:31 - 1.1 +++ rpm/macros/macros.rpmbuild.in 28 Feb 2010 12:57:37 - 1.2 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.1 2009/08/21 19:17:31 jbj Exp $ +# $Id: macros.rpmbuild.in,v 1.2 2010/02/28 12:57:37 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -277,6 +277,11 @@ # XXXNote: escaped %% for use in headerSprintf() %_build_name_fmt %%{ARCH}/%{___NVRA}.rpm +# +# Dynamic EVRD tags macro for use with versioned provides/requires in place of +# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present +%EVRD %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}%{?distepoch::%{distepoch}} + #== # per-platform macros. #Macros that are specific to an individual platform. The values here @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: 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-Feb-2010 14:37:01 Branch: HEAD Handle: 2010022813370001 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in Log: cowardly back out %EVRD per jbj's objections Summary: RevisionChanges Path 1.3278 +0 -2 rpm/CHANGES 1.3 +0 -5 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3277 -r1.3278 CHANGES --- rpm/CHANGES 28 Feb 2010 12:57:36 - 1.3277 +++ rpm/CHANGES 28 Feb 2010 13:37:00 - 1.3278 @@ -1,7 +1,5 @@ 5.2b1 - 5.3a1 -- proyvind: add a %EVRD macro for use with versioned provides/requires to - automatically add all the tags used for version comparison. - proyvind: python: make sure that we always use our own rpm build and macros. - proyvind: filetriggers: don't pass filename as argument to scripts, @@ . patch -p0 '@@ .' Index: rpm/macros/macros.rpmbuild.in $ cvs diff -u -r1.2 -r1.3 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 28 Feb 2010 12:57:37 - 1.2 +++ rpm/macros/macros.rpmbuild.in 28 Feb 2010 13:37:01 - 1.3 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.2 2010/02/28 12:57:37 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.3 2010/02/28 13:37:01 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -277,11 +277,6 @@ # XXXNote: escaped %% for use in headerSprintf() %_build_name_fmt %%{ARCH}/%{___NVRA}.rpm -# -# Dynamic EVRD tags macro for use with versioned provides/requires in place of -# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present -%EVRD %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}%{?distepoch::%{distepoch}} - #== # per-platform macros. #Macros that are specific to an individual platform. The values here @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org