[projects/template-specs] - rpmbuild(macros) for all macros included

qboosh qboosh at pld-linux.org
Sat Mar 14 12:54:57 CET 2020


commit 58b78444a80ae8a767265730b74fc1a46c60a759
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 14 12:56:03 2020 +0100

    - rpmbuild(macros) for all macros included

 cacti-plugin.spec      | 4 +---
 cacti-template.spec    | 4 +---
 dokuwiki-plugin.spec   | 2 +-
 dotnet.spec            | 2 +-
 horde.spec             | 2 +-
 java-webapp.spec       | 2 +-
 java.spec              | 7 +------
 jira-plugin.spec       | 2 +-
 monitoring-plugin.spec | 2 +-
 perl.spec              | 3 +--
 php-package.spec       | 2 +-
 php-pear.spec          | 2 +-
 12 files changed, 12 insertions(+), 22 deletions(-)
---
diff --git a/cacti-plugin.spec b/cacti-plugin.spec
index 593661d..4098b96 100644
--- a/cacti-plugin.spec
+++ b/cacti-plugin.spec
@@ -11,9 +11,7 @@ Source0:	http://docs.cacti.net/_media/plugin:%{plugin}-v%{version}-1.tgz
 # Source0-md5:	a114638444967822e498ca28a81119e9
 URL:		http://docs.cacti.net/plugin:PLUGIN_NAME
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.554
-# for %%undos macro
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	cacti
 Requires:	cacti(pia) >= 2.0
 Requires:	php-common >= 4:%{php_min_version}
diff --git a/cacti-template.spec b/cacti-template.spec
index 555bddb..00d5794 100644
--- a/cacti-template.spec
+++ b/cacti-template.spec
@@ -12,9 +12,7 @@ Source0:	http://mirror.cactiusers.org/downloads/templates/%{template}-%{version}
 # Source0-md5:
 URL:		http://docs.cacti.net/plugin:TEMPLATE_NAME
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.554
-# for %%undos macro
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	cacti >= 0.8.7e-8
 Requires:	php-common >= 4:%{php_min_version}
 BuildArch:	noarch
diff --git a/dokuwiki-plugin.spec b/dokuwiki-plugin.spec
index 039abe9..52c0769 100644
--- a/dokuwiki-plugin.spec
+++ b/dokuwiki-plugin.spec
@@ -13,7 +13,7 @@ Source0:	https://github.com/-/%{plugin}/archive/%{subver}/%{plugin}-%{subver}.ta
 # Source0-md5:	-
 URL:		https://www.dokuwiki.org/plugin:PLUGIN_NAME
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	dokuwiki >= 20061106
 # See https://www.dokuwiki.org/changes for detailed changed features
 # plugin with .less support (Binky)
diff --git a/dotnet.spec b/dotnet.spec
index e9cc539..c9dab08 100644
--- a/dotnet.spec
+++ b/dotnet.spec
@@ -10,7 +10,7 @@ Group:		Libraries
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	-
 URL:		-
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.745
 BuildRequires:	rpmbuild(monoautodeps)
 Requires:	mono
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/horde.spec b/horde.spec
index f239b6b..7c30d28 100644
--- a/horde.spec
+++ b/horde.spec
@@ -19,7 +19,7 @@ Source1:	apache.conf
 Patch0:		prefs.patch
 URL:		http://www.horde.org/skeleton/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	horde >= 3.0
 Requires:	webapps
 Requires:	webserver(access)
diff --git a/java-webapp.spec b/java-webapp.spec
index afa17ec..f89d5b8 100644
--- a/java-webapp.spec
+++ b/java-webapp.spec
@@ -10,7 +10,7 @@ Source0:	-
 Source1:	%{name}-context.xml
 URL:		-
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.546
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	jpackage-utils
 Requires:	tomcat >= 6
 BuildArch:	noarch
diff --git a/java.spec b/java.spec
index 210e585..0b05110 100644
--- a/java.spec
+++ b/java.spec
@@ -34,12 +34,7 @@ BuildRequires:	glibc-localedb-all
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
-# for %%undos macro
-BuildRequires:	rpmbuild(macros) >= 1.553
-%if %{with source}
-BuildRequires:	rpmbuild(macros) >= 1.555
-%endif
+BuildRequires:	rpmbuild(macros) >= 1.745
 BuildRequires:	sed >= 4.0
 # for %{_javadir}
 Requires:	jpackage-utils
diff --git a/jira-plugin.spec b/jira-plugin.spec
index 8f23611..22ea26b 100644
--- a/jira-plugin.spec
+++ b/jira-plugin.spec
@@ -9,7 +9,7 @@ Source0:	-
 # Source0-md5:	-
 URL:		-
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.745
 # For "managed" type plugins
 Requires:	jira >= 4.1.1-2
 # For other plugins
diff --git a/monitoring-plugin.spec b/monitoring-plugin.spec
index a06cb55..173d677 100644
--- a/monitoring-plugin.spec
+++ b/monitoring-plugin.spec
@@ -14,7 +14,7 @@ URL:		-
 # enable for Perl based plugins
 #BuildRequires:	perl-devel >= 1:5.8.0
 #BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.685
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	nagios-common
 # Requires:	nagios-plugins-libs for utils.{sh,pm,php}, for Perl set noautoreq for perl(utils)
 #Requires:	nagios-plugins-libs
diff --git a/perl.spec b/perl.spec
index d8bae37..633267d 100644
--- a/perl.spec
+++ b/perl.spec
@@ -27,10 +27,9 @@ Source0:	http://www.cpan.org/modules/by-module/PDIR/%{pdir}-%{pnam}-%{version}.t
 Patch0:		%{name}-foo.patch
 # most of CPAN modules have generic URL (substitute pdir and pnam here)
 URL:		http://search.cpan.org/dist/PDIR-PNAM/
-# macros BR if _noautoreq_perl is used
-#BuildRequires:	rpmbuild(macros) >= 1.654
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	rpmbuild(macros) >= 1.745
 BuildRequires:	-
 %if %{with autodeps} || %{with tests}
 BuildRequires:	perl-
diff --git a/php-package.spec b/php-package.spec
index ef138a2..0a7db3f 100644
--- a/php-package.spec
+++ b/php-package.spec
@@ -13,7 +13,7 @@ URL:		-
 BuildRequires:	/usr/bin/php
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.654
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	php(core) >= %{php_min_version}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/php-pear.spec b/php-pear.spec
index 6b78527..9cda0d3 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -21,7 +21,7 @@ URL:		http://pear.php.net/package/Class_Subclass/
 BuildRequires:	php-packagexml2cl
 BuildRequires:	php-pear-PEAR
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.654
+BuildRequires:	rpmbuild(macros) >= 1.745
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/58b78444a80ae8a767265730b74fc1a46c60a759



More information about the pld-cvs-commit mailing list