[projects/template-specs] - really stop including rpm macros everywhere
baggins
baggins at pld-linux.org
Sat Jan 25 14:10:04 CET 2020
commit 46ab3ebd31464733489736c17e3b140d6a56ffc8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jan 25 14:08:02 2020 +0100
- really stop including rpm macros everywhere
cacti-plugin.spec | 1 -
cacti-template.spec | 1 -
dokuwiki-plugin.spec | 1 -
dotnet.spec | 1 -
horde.spec | 1 -
java-webapp.spec | 1 -
java.spec | 1 -
jira-plugin.spec | 1 -
monitoring-plugin.spec | 2 --
php-package.spec | 5 -----
php-pear.spec | 1 -
11 files changed, 16 deletions(-)
---
diff --git a/cacti-plugin.spec b/cacti-plugin.spec
index dc816f3..593661d 100644
--- a/cacti-plugin.spec
+++ b/cacti-plugin.spec
@@ -1,7 +1,6 @@
# NOTE: existing plugins http://forums.cacti.net/viewtopic.php?t=14985
%define plugin PLUGIN_NAME
%define php_min_version 5.0.0
-%include /usr/lib/rpm/macros.php
Summary: -
Name: cacti-plugin-%{plugin}
Version: 0.1
diff --git a/cacti-template.spec b/cacti-template.spec
index 955bf28..555bddb 100644
--- a/cacti-template.spec
+++ b/cacti-template.spec
@@ -2,7 +2,6 @@
# NOTE: existing templates http://forums.cacti.net/viewtopic.php?p=161928
%define template TEMPLATE_NAME
%define php_min_version 5.0.0
-%include /usr/lib/rpm/macros.php
Summary: Template for Cacti -
Name: cacti-template-%{template}
Version: 0.1
diff --git a/dokuwiki-plugin.spec b/dokuwiki-plugin.spec
index 5da369a..039abe9 100644
--- a/dokuwiki-plugin.spec
+++ b/dokuwiki-plugin.spec
@@ -2,7 +2,6 @@
%define ver %(echo %{subver} | tr -d -)
%define plugin PLUGIN_NAME
%define php_min_version 5.3.0
-%include /usr/lib/rpm/macros.php
Summary: DokuWiki PLUGIN_NAME plugin
Summary(pl.UTF-8): Wtyczka PLUGIN_NAME dla DokuWiki
Name: dokuwiki-plugin-%{plugin}
diff --git a/dotnet.spec b/dotnet.spec
index 747fa99..e9cc539 100644
--- a/dotnet.spec
+++ b/dotnet.spec
@@ -1,4 +1,3 @@
-%include /usr/lib/rpm/macros.mono
%define module TEMPLATE
Summary: template for mono/dotnet/.Net packages
Summary(pl.UTF-8): -
diff --git a/horde.spec b/horde.spec
index 52e48a1..f239b6b 100644
--- a/horde.spec
+++ b/horde.spec
@@ -7,7 +7,6 @@
# THOSE DIRS: find -name '.??*' IS EASY TO LOCATE.
%define hordeapp skeleton
-%include /usr/lib/rpm/macros.php
Summary: Template for horde projects
Name: horde-%{hordeapp}
Version: 0.1
diff --git a/java-webapp.spec b/java-webapp.spec
index cb7144a..afa17ec 100644
--- a/java-webapp.spec
+++ b/java-webapp.spec
@@ -1,4 +1,3 @@
-%include /usr/lib/rpm/macros.java
Summary: -
Summary(pl.UTF-8): -
Name: -
diff --git a/java.spec b/java.spec
index 87b7468..210e585 100644
--- a/java.spec
+++ b/java.spec
@@ -15,7 +15,6 @@
# Name without java- prefix. If it is application, not a library,
# just do s/srcname/name/g
%define srcname -
-%include /usr/lib/rpm/macros.java
Summary: -
Summary(pl.UTF-8): -
Name: java-%{srcname}
diff --git a/jira-plugin.spec b/jira-plugin.spec
index 25fcda7..8f23611 100644
--- a/jira-plugin.spec
+++ b/jira-plugin.spec
@@ -1,5 +1,4 @@
%define plugin foobar
-%include /usr/lib/rpm/macros.java
Summary: JIRA foobar plugin
Name: jira-plugin-%{plugin}
Version: -
diff --git a/monitoring-plugin.spec b/monitoring-plugin.spec
index 8919746..a06cb55 100644
--- a/monitoring-plugin.spec
+++ b/monitoring-plugin.spec
@@ -1,6 +1,4 @@
%define plugin check_template
-# enable here and BR deps, and noautoreq for Perl based plugins
-#%include /usr/lib/rpm/macros.perl
Summary: Monitoring plugin to check ...
Summary(pl.UTF-8): Wtyczka Monitoringa sprawdzająca ...
Name: monitoring-plugin-%{plugin}
diff --git a/php-package.spec b/php-package.spec
index 36bfef2..ef138a2 100644
--- a/php-package.spec
+++ b/php-package.spec
@@ -1,10 +1,5 @@
%define pkgname PACKAGE_NAME
%define php_min_version 5.0.0
-%if %{with phpdeps}
-# new php based depsolver will look into this macro, however it works in static
-# manner too.
-%include /usr/lib/rpm/macros.php
-%endif
Summary: -
Name: php-%{pkgname}
Version: _
diff --git a/php-pear.spec b/php-pear.spec
index e56faa1..6b78527 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -9,7 +9,6 @@
#
%define status stable
%define pearname class_subclass
-%include /usr/lib/rpm/macros.php
Summary: %{pearname} -
Summary(pl.UTF-8): %{pearname} -
Name: php-pear-%{pearname}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/46ab3ebd31464733489736c17e3b140d6a56ffc8
More information about the pld-cvs-commit
mailing list