[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in mandri...

2017-06-30 Thread Jeff Johnson 
  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:   01-Jul-2017 06:35:47
  Branch: rpm-5_4  Handle: 2017070104354700

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in mandriva.in

  Log:
- macros: update %efi (http://rpm5.org/community/rpm-devel/5699.html).

  Summary:
RevisionChanges Path
1.3501.2.581+1  -0  rpm/CHANGES
1.4.4.21+5  -4  rpm/macros/macros.rpmbuild.in
1.7.2.24+6  -10 rpm/macros/mandriva.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.580 -r1.3501.2.581 CHANGES
  --- rpm/CHANGES   1 Jul 2017 04:32:20 -   1.3501.2.580
  +++ rpm/CHANGES   1 Jul 2017 04:35:47 -   1.3501.2.581
  @@ -1,4 +1,5 @@
   5.4.17 -> 5.4.18:
  +- jbj: macros: update %efi 
(http://rpm5.org/community/rpm-devel/5699.html)/
   - jbj: scripts: honor COMPRESS envvar (if set) 
(http://rpm5.org/community/rpm-devel/5698.html)
   - jbj: scripts: get rid of unused 
(http://rpm5.org/community/rpm-devel/5697.html)
   - jbj: argv: attempt input trimming in argvFgets (if requested).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.20 -r1.4.4.21 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 17 Sep 2014 03:00:52 -  1.4.4.20
  +++ rpm/macros/macros.rpmbuild.in 1 Jul 2017 04:35:47 -   1.4.4.21
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.20 2014/09/17 03:00:52 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.21 2017/07/01 04:35:47 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -669,9 +669,6 @@
   #
   %ix86   i386 i486 i586 i686 pentium3 pentium4 athlon
   
  -# arch macro for all EFI-compatible architectures
  -%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 armv7l armv7hl armv7lh armv7hln 
armv7hnl armv7lhn armv7lnh armv7nhl armv7nlh
   
  @@ -692,6 +689,10 @@
   %mipsel mipsel mips2el mips3el mips4el loongson2e loongson2f octeonel
   
   %mipsx %mips %mipsel mips64 mips64el
  +
  +# arch macro for all EFI-compatible architectures
  +%efi %{ix86} x86_64 ia64 %{arm} aarch64
  +

   #
   # Use in %install to generate locale specific file lists. For example,
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/mandriva.in
  
  $ cvs diff -u -r1.7.2.23 -r1.7.2.24 mandriva.in
  --- rpm/macros/mandriva.in20 Jul 2012 15:02:58 -  1.7.2.23
  +++ rpm/macros/mandriva.in1 Jul 2017 04:35:47 -   1.7.2.24
  @@ -1,7 +1,7 @@
  -%distributionMandriva Linux
  -%vendor  Mandriva
  -%bugurl  http://qa.mandriva.com
  -%disturl http://mandriva.org
  +%distributionOpenMandriva Lx
  +%vendor  OpenMandriva
  +%bugurl  http://issues.openmandriva.org/
  +%disturl http://openmandriva.org/
   
   # This macro will disable the transaction lock on /var/lib/rpm/__db.*.
   # This lock is of no use to us and will also result in errors when trying to
  @@ -32,11 +32,6 @@
   # mdvbz#64914
   %_rpmgio .ufdio
   
  -# 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.
   %evr_tuple_select1234
  @@ -133,8 +128,9 @@
   %_enable_debug_packages 1
   
   
  -# Default extension to use (for info files)
  +# Default extension to use (for man & info files)
   %_extension .xz
  +%_compress xz -0f --text -T0
   
   
   # Macro: %{mklibname  [ []] [-s] [-d]}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in rpm/rp...

2014-09-16 Thread Jeff Johnson 
  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:   17-Sep-2014 05:00:53
  Branch: rpm-5_4  Handle: 2014091703005102

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in
rpm/rpmio   rpmpgp.c

  Log:
- rpmpgp: switch to LibTomCrypt, default to ECDSA/SHA256 signing.

  Summary:
RevisionChanges Path
1.3501.2.442+1  -0  rpm/CHANGES
1.4.4.20+2  -2  rpm/macros/macros.rpmbuild.in
2.127.2.14  +5  -5  rpm/rpmio/rpmpgp.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.441 -r1.3501.2.442 CHANGES
  --- rpm/CHANGES   17 Sep 2014 02:08:17 -  1.3501.2.441
  +++ rpm/CHANGES   17 Sep 2014 03:00:51 -  1.3501.2.442
  @@ -1,4 +1,5 @@
   5.4.15 - 5.4.16:
  +- jbj: rpmpgp: switch to LibTomCrypt, default to ECDSA/SHA256 signing.
   - jbj: java: bsh-2.0b5.jar in a linux jdk1.7.0_03 JVM using JNI 
embedding.
   - jbj: rpmdav: handle NE_REDIRECT, take #1.
   - jbj: rpmio: use funopen(3) on *BSD when available (untested).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.19 -r1.4.4.20 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 26 Jul 2014 20:20:33 -  1.4.4.19
  +++ rpm/macros/macros.rpmbuild.in 17 Sep 2014 03:00:52 -  1.4.4.20
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.19 2014/07/26 20:20:33 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.20 2014/09/17 03:00:52 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -282,7 +282,7 @@
   #ECDSA/SHA384(using NIST P-384)
   #ECDSA/SHA512(using NIST P-521)
   #
  -%_build_sign RSA/SHA1
  +%_build_sign ECDSA/SHA256
   
   #
   # Choose metadata file digest algorithm:
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.13 -r2.127.2.14 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c18 Jul 2014 19:48:05 -  2.127.2.13
  +++ rpm/rpmio/rpmpgp.c17 Sep 2014 03:00:53 -  2.127.2.14
  @@ -50,7 +50,9 @@
   /*@unchecked@*/
   pgpImplVecs_t * pgpImplVecs =
   /* explicit selection (order DOES NOT matter here) */
  -#if defined(USE_CRYPTO_BEECRYPT)  defined(WITH_BEECRYPT)
  +#if defined(USE_CRYPTO_TOMCRYPT)  defined(WITH_TOMCRYPT)
  + rpmltcImplVecs;
  +#elif defined(USE_CRYPTO_BEECRYPT)  defined(WITH_BEECRYPT)
rpmbcImplVecs;
   #elif defined(USE_CRYPTO_GCRYPT)  defined(WITH_GCRYPT)
rpmgcImplVecs;
  @@ -58,11 +60,11 @@
rpmnssImplVecs;
   #elif defined(USE_CRYPTO_OPENSSL)  defined(WITH_SSL)
rpmsslImplVecs;
  -#elif defined(USE_CRYPTO_TOMCRYPT)  defined(WITH_TOMCRYPT)
  - rpmltcImplVecs;
   #elif defined(USE_CRYPTO_CDSA)  defined(WITH_CDSA)
rpmcdsaImplVecs;
   /* implict selection (order DOES matter) */
  +#elif defined(WITH_TOMCRYPT)
  + rpmltcImplVecs;
   #elif defined(WITH_BEECRYPT)
rpmbcImplVecs;
   #elif defined(WITH_GCRYPT)
  @@ -71,8 +73,6 @@
rpmnssImplVecs;
   #elif defined(WITH_SSL)
rpmsslImplVecs;
  -#elif defined(WITH_TOMCRYPT)
  - rpmltcImplVecs;
   #elif defined(WITH_CDSA)
rpmcdsaImplVecs;
   #else
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2014-07-26 Thread Jeff Johnson 
  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:   26-Jul-2014 22:20:36
  Branch: rpm-5_4  Handle: 2014072620202706

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
- config: switch from zlib - blake2p.
- config: switch from DSA - RSA/SHA1.

  Summary:
RevisionChanges Path
1.3501.2.416+2  -0  rpm/CHANGES
1.4.4.19+13 -3  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.415 -r1.3501.2.416 CHANGES
  --- rpm/CHANGES   26 Jul 2014 20:13:32 -  1.3501.2.415
  +++ rpm/CHANGES   26 Jul 2014 20:20:27 -  1.3501.2.416
  @@ -1,4 +1,6 @@
   5.4.14 - 5.4.15:
  +- jbj: config: switch from zlib - blake2p.
  +- jbj: config: switch from DSA - RSA/SHA1.
   - jbj: macros: move an error check earlier.
   - jbj: rpmio: permit URI's everywhere that .fdio isn't appended.
   - jbj: l10n: mixed {bdb,sqlite3} dbenv issues w db-6.1.19, disable.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.18 -r1.4.4.19 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 5 May 2014 19:49:32 -   1.4.4.18
  +++ rpm/macros/macros.rpmbuild.in 26 Jul 2014 20:20:33 -  1.4.4.19
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.18 2014/05/05 19:49:32 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.19 2014/07/26 20:20:33 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -267,6 +267,11 @@
   #DSA (default)
   #RSA (implies SHA1)
   #ECDSA   (implies SHA256)
  +#DSA/SHA1
  +#DSA/SHA224
  +#DSA/SHA256
  +#DSA/SHA384
  +#DSA/SHA512
   #RSA/SHA1
   #RSA/SHA224
   #RSA/SHA256
  @@ -277,7 +282,7 @@
   #ECDSA/SHA384(using NIST P-384)
   #ECDSA/SHA512(using NIST P-521)
   #
  -%_build_sign DSA
  +%_build_sign RSA/SHA1
   
   #
   # Choose metadata file digest algorithm:
  @@ -298,8 +303,13 @@
   #109 Jenkins lookup3.c hashlittle()
   #111 RIPEMD-256
   #112 RIPEMD-320
  +#188 BLAKE2B
  +#189 BLAKE2BP
  +#190 BLAKE2S
  +#191 BLAKE2SP
   #
  -%_build_file_digest_algo 1
  +#%_build_file_digest_algo1
  +%_build_file_digest_algo 189
   %_build_binary_file_digest_algo  %{_build_file_digest_algo}
   %_build_source_file_digest_algo  %{_build_file_digest_algo}
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-10-21 Thread Per �yvind Karlsen 
  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:   21-Oct-2011 15:51:40
  Branch: rpm-5_4  Handle: 2011102113513901

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
add back $RPM_BUILD_DIR to scriptlet envvar's as it's required by
scripts/find-debuginfo.sh.

  Summary:
RevisionChanges Path
1.3501.2.185+2  -0  rpm/CHANGES
1.4.4.11+3  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.184 -r1.3501.2.185 CHANGES
  --- rpm/CHANGES   19 Oct 2011 12:59:18 -  1.3501.2.184
  +++ rpm/CHANGES   21 Oct 2011 13:51:39 -  1.3501.2.185
  @@ -1,4 +1,6 @@
   5.4.3 - 5.4.4:
  +- proyvind: add back $RPM_BUILD_DIR to scriptlet envvar's as it's 
required
  + by scripts/find-debuginfo.sh.
   - proyvind: fix different epoch being ignored when comparing two packages
with same NVRA.
   - proyvind: add %ruby_sitedir and %ruby_vendor macros.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.10 -r1.4.4.11 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:54:29 -  1.4.4.10
  +++ rpm/macros/macros.rpmbuild.in 21 Oct 2011 13:51:40 -  1.4.4.11
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.10 2011/09/30 19:54:29 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.11 2011/10/21 13:51:40 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -301,8 +301,9 @@
   %___build_args   -e
   %___build_cmd%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} 
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} 
}%{___build_shell} %{___build_args}
   %___build_pre\
  +  RPM_BUILD_DIR=\%{u2p:%{_builddir}}\\
 RPM_OPT_FLAGS=\%{optflags}\\
  -  export RPM_OPT_FLAGS\
  +  export RPM_BUILD_DIR RPM_OPT_FLAGS\
 %{?buildroot:RPM_BUILD_ROOT=\%{u2p:%{buildroot}}\\
 export RPM_BUILD_ROOT}\
 %{?_javaclasspath:CLASSPATH=\%{_javaclasspath}\\
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in rpm/sc...

2011-10-21 Thread Jeff Johnson 
  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:   21-Oct-2011 17:39:03
  Branch: rpm-5_4  Handle: 2011102115390101

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in
rpm/scripts find-debuginfo.sh

  Log:
- debuginfo: use current dir instead of $RPM_BUILD_DIR.

  Summary:
RevisionChanges Path
1.3501.2.186+1  -2  rpm/CHANGES
1.4.4.12+2  -3  rpm/macros/macros.rpmbuild.in
1.14.2.2+1  -0  rpm/scripts/find-debuginfo.sh
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.185 -r1.3501.2.186 CHANGES
  --- rpm/CHANGES   21 Oct 2011 13:51:39 -  1.3501.2.185
  +++ rpm/CHANGES   21 Oct 2011 15:39:01 -  1.3501.2.186
  @@ -1,6 +1,5 @@
   5.4.3 - 5.4.4:
  -- proyvind: add back $RPM_BUILD_DIR to scriptlet envvar's as it's 
required
  - by scripts/find-debuginfo.sh.
  +- jbj: debuginfo: use current dir instead of $RPM_BUILD_DIR.
   - proyvind: fix different epoch being ignored when comparing two packages
with same NVRA.
   - proyvind: add %ruby_sitedir and %ruby_vendor macros.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.11 -r1.4.4.12 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 21 Oct 2011 13:51:40 -  1.4.4.11
  +++ rpm/macros/macros.rpmbuild.in 21 Oct 2011 15:39:02 -  1.4.4.12
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.11 2011/10/21 13:51:40 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.12 2011/10/21 15:39:02 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -301,9 +301,8 @@
   %___build_args   -e
   %___build_cmd%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} 
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} 
}%{___build_shell} %{___build_args}
   %___build_pre\
  -  RPM_BUILD_DIR=\%{u2p:%{_builddir}}\\
 RPM_OPT_FLAGS=\%{optflags}\\
  -  export RPM_BUILD_DIR RPM_OPT_FLAGS\
  +  export RPM_OPT_FLAGS\
 %{?buildroot:RPM_BUILD_ROOT=\%{u2p:%{buildroot}}\\
 export RPM_BUILD_ROOT}\
 %{?_javaclasspath:CLASSPATH=\%{_javaclasspath}\\
  @@ .
  patch -p0 '@@ .'
  Index: rpm/scripts/find-debuginfo.sh
  
  $ cvs diff -u -r1.14.2.1 -r1.14.2.2 find-debuginfo.sh
  --- rpm/scripts/find-debuginfo.sh 18 May 2011 13:34:35 -  1.14.2.1
  +++ rpm/scripts/find-debuginfo.sh 21 Oct 2011 15:39:02 -  1.14.2.2
  @@ -28,6 +28,7 @@
   # Barf on missing build IDs.
   strict=false
   
  +RPM_BUILD_DIR=`pwd`
   BUILDDIR=.
   out=debugfiles.list
   nout=0
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-09-30 Thread Jeff Johnson 
  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:   30-Sep-2011 21:20:32
  Branch: rpm-5_4  Handle: 2011093019203100

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
- reduce the scriptlet envar's for real world usage cases.

  Summary:
RevisionChanges Path
1.3501.2.175+1  -0  rpm/CHANGES
1.4.4.8 +2  -12 rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.174 -r1.3501.2.175 CHANGES
  --- rpm/CHANGES   30 Sep 2011 12:43:32 -  1.3501.2.174
  +++ rpm/CHANGES   30 Sep 2011 19:20:31 -  1.3501.2.175
  @@ -1,4 +1,5 @@
   5.4.2 - 5.4.3:
  +- jbj: reduce the scriptlet envar's for real world usage cases.
   - devzero2000: call umask before mkstemp.
 The mkstemp() function generates a unique temporary file name from the 
supplied template, 
 opens a file of that name using the O_EXCL flag (guaranteeing the 
current process to be the only user)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.7 -r1.4.4.8 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:26:52 -  1.4.4.7
  +++ rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:20:31 -  1.4.4.8
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.7 2011/07/29 04:26:52 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.8 2011/09/30 19:20:31 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -301,18 +301,8 @@
   %___build_args   -e
   %___build_cmd%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} 
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} 
}%{___build_shell} %{___build_args}
   %___build_pre\
  -  RPM_SOURCE_DIR=\%{u2p:%{_sourcedir}}\\
  -  RPM_BUILD_DIR=\%{u2p:%{_builddir}}\\
 RPM_OPT_FLAGS=\%{optflags}\\
  -  RPM_ARCH=\%{_arch}\\
  -  RPM_OS=\%{_os}\\
  -  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
  -  RPM_DOC_DIR=\%{_docdir}\\
  -  export RPM_DOC_DIR\
  -  RPM_PACKAGE_NAME=\%{name}\\
  -  RPM_PACKAGE_VERSION=\%{version}\\
  -  RPM_PACKAGE_RELEASE=\%{release}\\
  -  export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
  +  export RPM_OPT_FLAGS\
 %{?buildroot:RPM_BUILD_ROOT=\%{u2p:%{buildroot}}\\
 export RPM_BUILD_ROOT}\
 %{?_javaclasspath:CLASSPATH=\%{_javaclasspath}\\
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-09-30 Thread Jeff Johnson 
  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:   30-Sep-2011 21:27:22
  Branch: rpm-5_4  Handle: 2011093019272101

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
- arm: add the next 6 armv7* permutations to demonstrate the futility
of Have it your own way! architectural naming in the ARM family.

  Summary:
RevisionChanges Path
1.3501.2.176+2  -0  rpm/CHANGES
1.4.4.9 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.175 -r1.3501.2.176 CHANGES
  --- rpm/CHANGES   30 Sep 2011 19:20:31 -  1.3501.2.175
  +++ rpm/CHANGES   30 Sep 2011 19:27:21 -  1.3501.2.176
  @@ -1,4 +1,6 @@
   5.4.2 - 5.4.3:
  +- jbj: arm: add the next 6 armv7* permutations to demonstrate the 
futility
  + of Have it your own way! architectural naming in the ARM family.
   - jbj: reduce the scriptlet envar's for real world usage cases.
   - devzero2000: call umask before mkstemp.
 The mkstemp() function generates a unique temporary file name from the 
supplied template, 
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.8 -r1.4.4.9 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:20:31 -  1.4.4.8
  +++ rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:27:22 -  1.4.4.9
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.8 2011/09/30 19:20:31 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.9 2011/09/30 19:27:22 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -623,7 +623,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 armv7l
  +%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l armv7hl armv7lh armv7hln 
armv7hnl armv7lhn armv7lnh armv7nhl armv7nlh
   
   # same for alpha
   %alpha  alpha alphaev56 alphaev6 alphaev67
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-09-30 Thread Jeff Johnson 
  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:   30-Sep-2011 21:54:29
  Branch: rpm-5_4  Handle: 2011093019542801

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
- leg: stub-in a fictional architecture to restructure the
ARM namespace based on attributes.

  Summary:
RevisionChanges Path
1.3501.2.177+2  -0  rpm/CHANGES
1.4.4.10+4  -1  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.176 -r1.3501.2.177 CHANGES
  --- rpm/CHANGES   30 Sep 2011 19:27:21 -  1.3501.2.176
  +++ rpm/CHANGES   30 Sep 2011 19:54:28 -  1.3501.2.177
  @@ -1,4 +1,6 @@
   5.4.2 - 5.4.3:
  +- jbj: leg: stub-in a fictional architecture to restructure the
  + ARM namespace based on attributes.
   - jbj: arm: add the next 6 armv7* permutations to demonstrate the 
futility
of Have it your own way! architectural naming in the ARM family.
   - jbj: reduce the scriptlet envar's for real world usage cases.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.9 -r1.4.4.10 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:27:22 -  1.4.4.9
  +++ rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:54:29 -  1.4.4.10
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.9 2011/09/30 19:27:22 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.10 2011/09/30 19:54:29 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -625,6 +625,9 @@
   # same thing for arm
   %armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l armv7hl armv7lh armv7hln 
armv7hnl armv7lhn armv7lnh armv7nhl armv7nlh
   
  +# same thing for leg
  +%legleg legv3 legv3l legv3b legv4 legv4l legv4b legv5 legv5l legv5b 
legv5te legv5tel legv5teb xscale legv6 legv6l legv7l legv7hl legv7lh legv7hln 
legv7hnl legv7lhn legv7lnh legv7nhl legv7nlh
  +
   # same for alpha
   %alpha  alpha alphaev56 alphaev6 alphaev67
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen 
  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:13:23
  Branch: rpm-5_4  Handle: 2011072901132300

  Modified files:   (Branch: rpm-5_4)
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.3501.2.149+1  -1  rpm/CHANGES
1.4.4.5 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.148 -r1.3501.2.149 CHANGES
  --- rpm/CHANGES   28 Jul 2011 07:51:47 -  1.3501.2.148
  +++ rpm/CHANGES   29 Jul 2011 01:13:23 -  1.3501.2.149
  @@ -1,5 +1,5 @@
   5.4.1 - 5.4.2
  -- 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.4.4 -r1.4.4.5 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:51:48 -  1.4.4.4
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 -  1.4.4.5
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.4 2011/07/28 07:51:48 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 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_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen 
  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 04:03:02
  Branch: rpm-5_4  Handle: 2011072902030100

  Modified files:   (Branch: rpm-5_4)
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.3501.2.150+3  -0  rpm/CHANGES
1.4.4.6 +3  -3  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.149 -r1.3501.2.150 CHANGES
  --- rpm/CHANGES   29 Jul 2011 01:13:23 -  1.3501.2.149
  +++ rpm/CHANGES   29 Jul 2011 02:03:01 -  1.3501.2.150
  @@ -1,4 +1,7 @@
   5.4.1 - 5.4.2
  +- 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.4.5 -r1.4.4.6 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 -  1.4.4.5
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 02:03:01 -  1.4.4.6
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.6 2011/07/29 02:03:01 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