packages: dokuwiki-plugin-database/dokuwiki-plugin-database.spec - add data...

glen glen at pld-linux.org
Mon Jun 15 22:48:23 CEST 2009


Author: glen                         Date: Mon Jun 15 20:48:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add datadir.patch, simplify

---- Files affected:
packages/dokuwiki-plugin-database:
   dokuwiki-plugin-database.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec
diff -u packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec:1.2 packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec:1.3
--- packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec:1.2	Mon Jun 15 17:36:23 2009
+++ packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec	Mon Jun 15 22:48:18 2009
@@ -4,15 +4,16 @@
 Summary(pl.UTF-8):	Wtyczka database dla DokuWiki
 Name:		dokuwiki-plugin-%{plugin}
 Version:	1.0.4
-Release:	0.1
+Release:	0.3
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.langhamassociates.com/media/database.tgz
 # Source0-md5:	14ae5bb2f6c40a525220a815611892ee
+Patch0:		datadir.patch
 URL:		http://wiki.splitbrain.org/plugin:database
 BuildRequires:	rpmbuild(macros) >= 1.520
 BuildRequires:	sed >= 4.0
-Requires:	dokuwiki >= 20061106
+Requires:	dokuwiki >= 20090214b-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,9 +37,11 @@
 
 %prep
 %setup -q -cn %{plugin}
-%{__sed} -i -e 's,\r$,,' lib/plugins/%{plugin}/*.php
+mv lib/plugins/%{plugin}/* .
+%{__sed} -i -e 's,\r$,,' *.php
+%patch0 -p1
 
-version=$(awk -Fv '$0 == " * v%{version}"{print $2}' lib/plugins/%{plugin}/action.php)
+version=$(awk -Fv '$0 == " * v%{version}"{print $2}' action.php)
 if [ "$version" != %{version} ]; then
 	: %%{version} mismatch
 	exit 1
@@ -47,7 +50,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
-cp -a lib/plugins/%{plugin}/* $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 rm -f $RPM_BUILD_ROOT%{plugindir}/{CREDITS,changelog}
 rm -f $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION}
 
@@ -75,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/06/15 20:48:18  glen
+- add datadir.patch, simplify
+
 Revision 1.2  2009/06/15 15:36:23  glen
 - use %_usrlibrpm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-database/dokuwiki-plugin-database.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list