[packages/munin-plugins-muninexchange] - move package macro definition down (distfiles hacking)

baggins baggins at pld-linux.org
Fri Aug 23 20:38:33 CEST 2013


commit d77b176767ecfd4389eac8238ac71d8f08e87e7c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Aug 23 20:38:09 2013 +0200

    - move package macro definition down (distfiles hacking)

 munin-plugins-muninexchange.spec | 41 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/munin-plugins-muninexchange.spec b/munin-plugins-muninexchange.spec
index ecdab70..18d6305 100644
--- a/munin-plugins-muninexchange.spec
+++ b/munin-plugins-muninexchange.spec
@@ -1,25 +1,6 @@
 # TODO:
 #	- better descriptions?
 #
-%define	contrib_package()\
-%package %1\
-Summary:	Munin plugins from MuninExchange - %1\
-Summary(pl.UTF-8):	Wtyczki munina z MuninExchange - %1\
-Group:		Daemons\
-Requires:	munin-node\
-\
-%description %1\
-This package contains plugins for Munin from MuninExchange repository\
-located at https://github.com/munin-monitoring/contrib/.\
-\
-%description %1 -l pl.UTF-8\
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,\
-znajdującym się na https://github.com/munin-monitoring/contrib/.\
-\
-%files %1 -f %1.list\
-%defattr(644,root,root,755)\
-%{nil}
-
 %include	/usr/lib/rpm/macros.perl
 Summary:	Munin plugins from MuninExchange
 Summary(pl.UTF-8):	Wtyczki munina z MuninExchange
@@ -55,6 +36,26 @@ located at <http://muninexchange.projects.linpro.no/>.
 Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
 znajdującym się na <http://muninexchange.projects.linpro.no/>.
 
+%define	contrib_package()\
+%package %1\
+Summary:	Munin plugins from MuninExchange - %1\
+Summary(pl.UTF-8):	Wtyczki munina z MuninExchange - %1\
+Group:		Daemons\
+Requires:	munin-node\
+Obsoletes:	%*\
+\
+%description %1\
+This package contains plugins for Munin from MuninExchange repository\
+located at https://github.com/munin-monitoring/contrib/.\
+\
+%description %1 -l pl.UTF-8\
+Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,\
+znajdującym się na https://github.com/munin-monitoring/contrib/.\
+\
+%files %1 -f %1.list\
+%defattr(644,root,root,755)\
+%{nil}
+
 %package databases
 Summary:	Munin plugins from MuninExchange - databases
 Summary(pl.UTF-8):	Wtyczki munina z MuninExchange - databases
@@ -266,4 +267,4 @@ rm -rf $RPM_BUILD_ROOT
 %files web-servers -f web-servers.list
 %defattr(644,root,root,755)
 
-%contrib_package dupa
+%contrib_package dupa a b c
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/munin-plugins-muninexchange.git/commitdiff/d77b176767ecfd4389eac8238ac71d8f08e87e7c



More information about the pld-cvs-commit mailing list