- updated

Changed files:
    cacti-plugin.spec -> 1.2
    cacti-template.spec -> 1.14
    dokuwiki-plugin.spec -> 1.20

diff --git a/cacti-plugin.spec b/cacti-plugin.spec
index 0f8db3f3713f256339c345b153575e3666d09110..dc816f304499a2001351bdcd4adf895c9bcab894 100644 (file)
--- a/cacti-plugin.spec
+++ b/cacti-plugin.spec
@@ -15,7 +15,7 @@ BuildRequires:        rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.554
 # for %%undos macro
 BuildRequires: rpmbuild(macros) >= 1.553
-Requires:      cacti >= 0.8.7e-8
+Requires:      cacti
 Requires:      cacti(pia) >= 2.0
 Requires:      php-common >= 4:%{php_min_version}
 BuildArch:     noarch

diff --git a/cacti-template.spec b/cacti-template.spec
index e2bcd97f5e9359ea065f1dccac451f046ae6cdca..ec805573e8b805dfd56727a8cf5cbcedb63c830d 100644 (file)
--- a/cacti-template.spec
+++ b/cacti-template.spec
@@ -9,14 +9,15 @@ Version:      0.1
 Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://mirror.cactiusers.org/downloads/templates/%{namesrc}-%{version}.zip
+Source0:       http://mirror.cactiusers.org/downloads/templates/%{template}-%{version}.zip
 # Source0-md5:
-URL:           http://www.cactiusers.org/
+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
 Requires:      cacti >= 0.8.7e-8
+Requires:      cacti(pia) >= 2.0
 Requires:      php-common >= 4:%{php_min_version}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,7 +33,7 @@ Template for Cacti -
 #Wtyczka do Cacti -
 
 %prep
-%setup -q -c
+%setup -qc
 %setup -q -n cacti-%{template}-%{version}
 mv %{plugin}/{LICENSE,README} .
 

diff --git a/dokuwiki-plugin.spec b/dokuwiki-plugin.spec
index 447db49379724286ab4642e789f28b848c19213c..ea59fec526d74610cd8f9295a1a5cf5c94335b26 100644 (file)
--- a/dokuwiki-plugin.spec
+++ b/dokuwiki-plugin.spec
@@ -43,7 +43,7 @@ Wtyczka dla DokuWiki
 
 %prep
 %setup -qc
-# for githug urls:
+# for github urls:
 mv *-%{plugin}-*/* .
 # for other zip files:
 mv %{plugin}/* .
@@ -60,6 +60,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
+%{__rm} $RPM_BUILD_ROOT%{plugindir}/{COPYING,README}
 %{__rm} $RPM_BUILD_ROOT%{plugindir}/{CREDITS,changelog}
 %{__rm} $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION}