[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 12-Jul-2011 12:45:17
Branch: rpm-5_3 Handle: 2011071210451600
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
change dependency loop errors to warnings
Summary:
RevisionChanges Path
1.1.2.19+2 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.18 -r1.1.2.19 mandriva.in
--- rpm/macros/mandriva.in4 May 2011 12:20:06 - 1.1.2.18
+++ rpm/macros/mandriva.in12 Jul 2011 10:45:16 - 1.1.2.19
@@ -75,9 +75,9 @@
%__xar %{_bindir}/xar
# mdvbz#61851
-%__tar_wildcards --wildcards
+%__tar_wildcards --wildcards
-%_loop_detection_loglevel 3
+%_loop_detection_loglevel 4
# mdvbz#62741
# standard systemd directories
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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-Apr-2011 18:00:54
Branch: rpm-5_3 Handle: 2011042816005400
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix multiarch path (from funda)
Summary:
RevisionChanges Path
1.1.2.17+3 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.16 -r1.1.2.17 mandriva.in
--- rpm/macros/mandriva.in11 Apr 2011 00:35:30 - 1.1.2.16
+++ rpm/macros/mandriva.in28 Apr 2011 16:00:54 - 1.1.2.17
@@ -30,6 +30,7 @@
# 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.
@@ -101,8 +102,8 @@
%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}
+%multiarch_binaries()%{_rpmhome}/mkmultiarch binaries %{1}
+%multiarch_includes()%{_rpmhome}/mkmultiarch includes %{1}
# Check for need of multiarch, terminate build if needed and not used.
#
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 01-Apr-2011 02:01:08 Branch: rpm-5_3 Handle: 2011040100010800 Modified files: (Branch: rpm-5_3) rpm/macros mandriva.in Log: add %distribution, %vendor %bugurl Summary: RevisionChanges Path 1.1.2.15+4 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.1.2.14 -r1.1.2.15 mandriva.in --- rpm/macros/mandriva.in30 Mar 2011 14:35:32 - 1.1.2.14 +++ rpm/macros/mandriva.in1 Apr 2011 00:01:08 - 1.1.2.15 @@ -1,3 +1,7 @@ +%distributionMandriva Linux +%vendor Mandriva +%bugurl http://qa.mandriva.com + # 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 # install src.rpms as regular user. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 24-Mar-2011 17:56:24
Branch: rpm-5_3 Handle: 2011032416562400
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
change log level of dependency loops
Summary:
RevisionChanges Path
1.1.2.11+2 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.10 -r1.1.2.11 mandriva.in
--- rpm/macros/mandriva.in22 Feb 2011 16:55:57 - 1.1.2.10
+++ rpm/macros/mandriva.in24 Mar 2011 16:56:24 - 1.1.2.11
@@ -71,4 +71,6 @@
# mdvbz#61851
%__tar_wildcards --wildcards
+%_loop_detection_loglevel 3
+
%{load:/etc/rpm/macros.d/*.macros}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 24-Mar-2011 17:59:22
Branch: rpm-5_3 Handle: 2011032416592200
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
add distsuffix fallback for PLF (from Anssi)
Summary:
RevisionChanges Path
1.1.2.12+1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.11 -r1.1.2.12 mandriva.in
--- rpm/macros/mandriva.in24 Mar 2011 16:56:24 - 1.1.2.11
+++ rpm/macros/mandriva.in24 Mar 2011 16:59:22 - 1.1.2.12
@@ -31,7 +31,7 @@
# %release with such.
%evr_tuple_select1234
%evr_tuple_order EVRD
-%disttag mdv
+%disttag %{!?distsuffix:mdv}%{?distsuffix}
%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
# Dynamic EVRD tags macro for use with versioned provides/requires in place
of
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 22-Feb-2011 17:48:34
Branch: rpm-5_3 Handle: 2011022216483300
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix correct paths for some tool macros on mandriva mdvbz#62322
Summary:
RevisionChanges Path
1.1.2.9 +7 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.8 -r1.1.2.9 mandriva.in
--- rpm/macros/mandriva.in6 Dec 2010 00:05:26 - 1.1.2.8
+++ rpm/macros/mandriva.in22 Feb 2011 16:48:33 - 1.1.2.9
@@ -63,6 +63,13 @@
%make%{__make} %{_smp_mflags}
%makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install
+# mdvbz#62322
+%__grep /bin/grep
+%__gzip /bin/gzip
+%__lua %{_bindir}/lua
+%__rc%{_bindir}/rc
+%__xar %{_bindir}/xar
+
# mdvbz#61851
%__tar_wildcards --wildcards
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 22-Feb-2011 17:55:57
Branch: rpm-5_3 Handle: 2011022216555700
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
use %_specfile with %apply_patches now
Summary:
RevisionChanges Path
1.1.2.10+1 -3 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.9 -r1.1.2.10 mandriva.in
--- rpm/macros/mandriva.in22 Feb 2011 16:48:33 - 1.1.2.9
+++ rpm/macros/mandriva.in22 Feb 2011 16:55:57 - 1.1.2.10
@@ -46,10 +46,8 @@
%_default_patch_flags-s -U
%_default_patch_fuzz 0
-# FIXME: will break if spec file is ever differently named, shouldn't parse
-# the spec file itself...
%apply_patches %{lua:\
-f = io.open(rpm.expand(%{_specdir}/%{name}.spec))\
+f = io.open(rpm.expand(%{_specfile}))\
if f then\
for l in f:lines() do\
match,b,num = string.find(string.lower(l), ^%s*patch(%d+)%s*:.*$)\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 06-Dec-2010 01:05:27
Branch: rpm-5_3 Handle: 2010120600052600
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
add %__tar_wildcards for mdvbz#61851
Summary:
RevisionChanges Path
1.1.2.8 +3 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.7 -r1.1.2.8 mandriva.in
--- rpm/macros/mandriva.in5 Dec 2010 06:18:43 - 1.1.2.7
+++ rpm/macros/mandriva.in6 Dec 2010 00:05:26 - 1.1.2.8
@@ -63,4 +63,7 @@
%make%{__make} %{_smp_mflags}
%makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install
+# mdvbz#61851
+%__tar_wildcards --wildcards
+
%{load:/etc/rpm/macros.d/*.macros}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 05-Dec-2010 06:57:58
Branch: rpm-5_3 Handle: 2010120505575700
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix %manbo_mkrel()
Summary:
RevisionChanges Path
1.1.2.6 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 mandriva.in
--- rpm/macros/mandriva.in21 Nov 2010 06:28:11 - 1.1.2.5
+++ rpm/macros/mandriva.in5 Dec 2010 05:57:57 - 1.1.2.6
@@ -25,7 +25,7 @@
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
-%manbo_mkrel %mkrel
+%manbo_mkrel() mkrel
# This will enable the use of distepoch and disttag in stead of polluting
# %release with such.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 05-Dec-2010 07:18:43
Branch: rpm-5_3 Handle: 2010120506184300
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
*really* fix %manbo_mkrel()
Summary:
RevisionChanges Path
1.1.2.7 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.6 -r1.1.2.7 mandriva.in
--- rpm/macros/mandriva.in5 Dec 2010 05:57:57 - 1.1.2.6
+++ rpm/macros/mandriva.in5 Dec 2010 06:18:43 - 1.1.2.7
@@ -25,7 +25,7 @@
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
-%manbo_mkrel() mkrel
+%manbo_mkrel() %mkrel
# This will enable the use of distepoch and disttag in stead of polluting
# %release with such.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 05-Nov-2010 18:10:10
Branch: rpm-5_3 Handle: 2010110517100900
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
set %_rpmlock_path to %{nil}
Summary:
RevisionChanges Path
1.1.2.4 +5 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 mandriva.in
--- rpm/macros/mandriva.in5 Nov 2010 03:38:28 - 1.1.2.3
+++ rpm/macros/mandriva.in5 Nov 2010 17:10:09 - 1.1.2.4
@@ -1,3 +1,8 @@
+# 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
+# install src.rpms as regular user.
+%_rpmlock_path %{nil}
+
%_upgrade_tagname
%_obsolete_tag name
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.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: 05-Nov-2010 04:38:28
Branch: rpm-5_3 Handle: 2010110503382800
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix sed escaping for %distepoch
Summary:
RevisionChanges Path
1.1.2.3 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 mandriva.in
--- rpm/macros/mandriva.in16 Oct 2010 04:47:34 - 1.1.2.2
+++ rpm/macros/mandriva.in5 Nov 2010 03:38:28 - 1.1.2.3
@@ -23,7 +23,7 @@
%evr_tuple_select1234
%evr_tuple_order EVRD
%disttag mdv
-%distepoch %(sed -e 's#.*release\ \(\S*\).*#\1#' /etc/release)
+%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
# Dynamic EVRD tags macro for use with versioned provides/requires in place
of
# '%{version}-%{release}', ie. to automatically add distepoch or epoch if
present
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
