[packages/rpm-build-tools] require rpm-build-macros 1.651, where shrc.sh was moved from there to here
glen
glen at pld-linux.org
Fri Nov 13 20:57:05 CET 2015
commit ada86dc3ca0af617e2ce3f706a73f84ba53cc7eb
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Nov 13 21:55:59 2015 +0200
require rpm-build-macros 1.651, where shrc.sh was moved from there to here
otherwise we end up with file conflict
==> default: file /etc/shrc.d/rpm-build.sh from install of rpm-build-tools-4.7-1.noarch conflicts with file from package rpm-build-macros-1.650-2.noarch
and poldek is not smart enough to resolve that by it's own
rpm-build-tools.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-tools.spec b/rpm-build-tools.spec
index b5859c5..216cd41 100644
--- a/rpm-build-tools.spec
+++ b/rpm-build-tools.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл
Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів
Name: rpm-build-tools
Version: 4.8
-Release: 1
+Release: 2
License: GPL
Group: Applications/File
Group: Base
@@ -23,7 +23,7 @@ Requires: less
Requires: openssh-clients
Requires: perl-base
Requires: rpm-build
-Requires: rpmbuild(macros) >= 1.539
+Requires: rpmbuild(macros) >= 1.651
Requires: sed >= 4.0
Requires: time
Requires: util-linux
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/ada86dc3ca0af617e2ce3f706a73f84ba53cc7eb
More information about the pld-cvs-commit
mailing list