[packages/rpm-pld-macros/rpm.org] - extract rpm-*prov version to macro on top - some scripts are derived from LGPL v2.1+, so GPL versi
baggins
baggins at pld-linux.org
Mon May 18 09:17:18 CEST 2020
commit 0c6b13d6e2a72e61c1c06e847b8d75401d85429f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Feb 6 21:23:14 2020 +0100
- extract rpm-*prov version to macro on top
- some scripts are derived from LGPL v2.1+, so GPL version must be v2+
rpm-pld-macros.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index a0dda50..350ff73 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,11 +1,13 @@
%define rpm_macros_rev 1.747
%define find_lang_rev 1.40
+# split into individual X_prov_ver if there is a reason to desync
+%define prov_ver 4.15
Summary: PLD Linux RPM macros
Summary(pl.UTF-8): Makra RPM dla Linuksa PLD
Name: rpm-pld-macros
Version: %{rpm_macros_rev}
Release: 3.1
-License: GPL
+License: GPL v2+
Group: Development/Building
Source0: macros.pld
Source1: service_generator.sh
@@ -107,7 +109,7 @@ Requires: %{name}-build = %{version}-%{release}
Requires: ruby
Requires: ruby-modules
Requires: ruby-rubygems
-Provides: rpm-rubyprov = 4.15
+Provides: rpm-rubyprov = %{prov_ver}
Obsoletes: rpm-rubyprov
%description rubyprov
@@ -129,7 +131,7 @@ Requires: file
Requires: findutils >= 1:4.2.26
Requires: mktemp
Requires: unzip
-Provides: rpm-javaprov = 4.15
+Provides: rpm-javaprov = %{prov_ver}
Obsoletes: rpm-javaprov
%description javaprov
@@ -147,7 +149,7 @@ Group: Applications/File
Requires: %{name}-build = %{version}-%{release}
Requires: sed >= 4.0
Suggests: php-pear-PHP_CompatInfo
-Provides: rpm-php-pearprov = 4.15
+Provides: rpm-php-pearprov = %{prov_ver}
Obsoletes: rpm-php-pearprov
%description php-pearprov
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/bc90070308b23913a2fb5df86c6415de9be5d991
More information about the pld-cvs-commit
mailing list