[CVS] RPM: rpm-5_4: 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:44:19
Branch: rpm-5_4 Handle: 2011071210441900
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
change dependency loop errors to warnings
Summary:
RevisionChanges Path
1.7.2.10+2 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.9 -r1.7.2.10 mandriva.in
--- rpm/macros/mandriva.in4 May 2011 12:19:54 - 1.7.2.9
+++ rpm/macros/mandriva.in12 Jul 2011 10:44:19 - 1.7.2.10
@@ -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_4: 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:55 Branch: rpm-5_4 Handle: 2011050412195400 Modified files: (Branch: rpm-5_4) rpm/macros mandriva.in Log: add %disturl Summary: RevisionChanges Path 1.7.2.9 +1 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.7.2.8 -r1.7.2.9 mandriva.in --- rpm/macros/mandriva.in28 Apr 2011 15:59:35 - 1.7.2.8 +++ rpm/macros/mandriva.in4 May 2011 12:19:54 - 1.7.2.9 @@ -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-5_4: 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:53 Branch: rpm-5_4 Handle: 201104015300 Modified files: (Branch: rpm-5_4) rpm/macros mandriva.in Log: add %distribution, %vendor %bugurl Summary: RevisionChanges Path 1.7.2.6 +4 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.7.2.5 -r1.7.2.6 mandriva.in --- rpm/macros/mandriva.in30 Mar 2011 14:34:36 - 1.7.2.5 +++ rpm/macros/mandriva.in1 Apr 2011 00:00:53 - 1.7.2.6 @@ -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_4: 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: 30-Mar-2011 16:28:25
Branch: rpm-5_4 Handle: 2011033014282500
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
sync with rpm-5_3
Summary:
RevisionChanges Path
1.7.2.4 +3 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.3 -r1.7.2.4 mandriva.in
--- rpm/macros/mandriva.in29 Mar 2011 17:09:04 - 1.7.2.3
+++ rpm/macros/mandriva.in30 Mar 2011 14:28:25 - 1.7.2.4
@@ -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
@@ -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_4: 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: 29-Mar-2011 19:09:04
Branch: rpm-5_4 Handle: 2011032917090400
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
use %_target_cpu rather than %_arch in %buildroot to make it
consistent with NVRA
Summary:
RevisionChanges Path
1.7.2.3 +1 -1 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.2 -r1.7.2.3 mandriva.in
--- rpm/macros/mandriva.in22 Feb 2011 16:55:45 - 1.7.2.2
+++ rpm/macros/mandriva.in29 Mar 2011 17:09:04 - 1.7.2.3
@@ -14,7 +14,7 @@
%_buildrootdir %{_topdir}/BUILDROOT
# Build root path, where %install installs the package during build.
-%buildroot
%{_buildrootdir}/%{name}-%{version}-%{release}%{?disttag:-%{disttag}%{?distepoch:%{distepoch}}}.%{_arch}-buildroot
+%buildroot
%{_buildrootdir}/%{name}-%{version}-%{release}%{?disttag:-%{disttag}%{?distepoch:%{distepoch}}}.%{_target_cpu}-buildroot
# Path to top of build area.
%_topdir%(echo $HOME)/rpmbuild
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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:18
Branch: rpm-5_4 Handle: 2011022216481800
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
fix correct paths for some tool macros on mandriva mdvbz#62322
Summary:
RevisionChanges Path
1.7.2.1 +7 -0 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7 -r1.7.2.1 mandriva.in
--- rpm/macros/mandriva.in6 Dec 2010 00:04:32 - 1.7
+++ rpm/macros/mandriva.in22 Feb 2011 16:48:18 - 1.7.2.1
@@ -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_4: 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:45
Branch: rpm-5_4 Handle: 2011022216554500
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
use %_specfile with %apply_patches now
Summary:
RevisionChanges Path
1.7.2.2 +1 -3 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.1 -r1.7.2.2 mandriva.in
--- rpm/macros/mandriva.in22 Feb 2011 16:48:18 - 1.7.2.1
+++ rpm/macros/mandriva.in22 Feb 2011 16:55:45 - 1.7.2.2
@@ -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
