[CVS] RPM: 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: 04-May-2011 14:19:38 Branch: HEAD Handle: 2011050412193800 Modified files: rpm/macros mandriva.in Log: add %disturl Summary: RevisionChanges Path 1.16+1 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.15 -r1.16 mandriva.in --- rpm/macros/mandriva.in28 Apr 2011 15:58:12 - 1.15 +++ rpm/macros/mandriva.in4 May 2011 12:19:38 - 1.16 @@ -1,6 +1,7 @@ %distributionMandriva Linux %vendor Mandriva %bugurl http://qa.mandriva.com +%disturl http://mandriva.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 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: 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:00:29 Branch: HEAD Handle: 201104012900 Modified files: rpm/macros mandriva.in Log: add %distribution, %vendor %bugurl Summary: RevisionChanges Path 1.13+4 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.12 -r1.13 mandriva.in --- rpm/macros/mandriva.in30 Mar 2011 14:33:34 - 1.12 +++ rpm/macros/mandriva.in1 Apr 2011 00:00:29 - 1.13 @@ -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/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:47:51
Branch: HEAD Handle: 2011022216475000
Modified files:
rpm/macros mandriva.in
Log:
fix correct paths for some tool macros on mandriva mdvbz#62322
Summary:
RevisionChanges Path
1.8 +7 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7 -r1.8 mandriva.in
--- rpm/macros/mandriva.in6 Dec 2010 00:04:32 - 1.7
+++ rpm/macros/mandriva.in22 Feb 2011 16:47:50 - 1.8
@@ -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/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:04:33
Branch: HEAD Handle: 2010120600043200
Modified files:
rpm/macros mandriva.in
Log:
add %__tar_wildcards for mdvbz#61851
Summary:
RevisionChanges Path
1.7 +4 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.6 -r1.7 mandriva.in
--- rpm/macros/mandriva.in5 Dec 2010 06:17:56 - 1.6
+++ rpm/macros/mandriva.in6 Dec 2010 00:04:32 - 1.7
@@ -1,7 +1,7 @@
# 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}
+%_rpmlock_path %{nil}
%_upgrade_tagname
%_obsolete_tag name
@@ -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/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:14
Branch: HEAD Handle: 2010120505571400
Modified files:
rpm/macros mandriva.in
Log:
fix %manbo_mkrel
Summary:
RevisionChanges Path
1.5 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.4 -r1.5 mandriva.in
--- rpm/macros/mandriva.in21 Nov 2010 06:26:54 - 1.4
+++ rpm/macros/mandriva.in5 Dec 2010 05:57:14 - 1.5
@@ -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/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:17:57
Branch: HEAD Handle: 2010120506175600
Modified files:
rpm/macros mandriva.in
Log:
*really* fix %manbo_mkrel()
Summary:
RevisionChanges Path
1.6 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.5 -r1.6 mandriva.in
--- rpm/macros/mandriva.in5 Dec 2010 05:57:14 - 1.5
+++ rpm/macros/mandriva.in5 Dec 2010 06:17:56 - 1.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/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: 21-Nov-2010 07:26:54
Branch: HEAD Handle: 2010112106265400
Modified files:
rpm/macros mandriva.in
Log:
add %mkrel macro to help ease transition of killing it off
Summary:
RevisionChanges Path
1.4 +4 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.3 -r1.4 mandriva.in
--- rpm/macros/mandriva.in5 Nov 2010 17:08:52 - 1.3
+++ rpm/macros/mandriva.in21 Nov 2010 06:26:54 - 1.4
@@ -23,6 +23,10 @@
%_changelog_truncate 3 years ago
+# This will die as soon as remaining usage has been phased out...
+%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
+%manbo_mkrel %mkrel
+
# This will enable the use of distepoch and disttag in stead of polluting
# %release with such.
%evr_tuple_select1234
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: 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:08:53
Branch: HEAD Handle: 2010110517085200
Modified files:
rpm/macros mandriva.in
Log:
se %_rpmlock_path to %{nil}
Summary:
RevisionChanges Path
1.3 +5 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.2 -r1.3 mandriva.in
--- rpm/macros/mandriva.in5 Nov 2010 06:33:26 - 1.2
+++ rpm/macros/mandriva.in5 Nov 2010 17:08:52 - 1.3
@@ -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
