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:
Revision Changes 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 -0000 1.3501.2.580
+++ rpm/CHANGES 1 Jul 2017 04:35:47 -0000 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 -0000 1.4.4.20
+++ rpm/macros/macros.rpmbuild.in 1 Jul 2017 04:35:47 -0000 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
%arm arm 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.in 20 Jul 2012 15:02:58 -0000 1.7.2.23
+++ rpm/macros/mandriva.in 1 Jul 2017 04:35:47 -0000 1.7.2.24
@@ -1,7 +1,7 @@
-%distribution Mandriva Linux
-%vendor Mandriva
-%bugurl http://qa.mandriva.com
-%disturl http://mandriva.org
+%distribution OpenMandriva 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_select 1234
@@ -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 <name> [<major> [<minor>]] [-s] [-d]}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
