SPECS: dokuwiki-tpl-minimalmobile.spec, dokuwiki-tpl-multitemplate...

[glen]

Author: glen                         Date: Fri Sep  7 09:26:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   dokuwiki-tpl-minimalmobile.spec (1.1 -> 1.2) , dokuwiki-tpl-multitemplate.spec (1.4 -> 1.5) , dokuwiki-tpl-sidebar.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/dokuwiki-tpl-minimalmobile.spec
diff -u SPECS/dokuwiki-tpl-minimalmobile.spec:1.1 SPECS/dokuwiki-tpl-minimalmobile.spec:1.2
--- SPECS/dokuwiki-tpl-minimalmobile.spec:1.1	Fri Sep  7 11:23:35 2007
+++ SPECS/dokuwiki-tpl-minimalmobile.spec	Fri Sep  7 11:26:17 2007
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
-%define		_tpl		minimalmobile
+%define		_tpl	minimalmobile
 Summary:	Minimal Mobile template for DokuWiki
 Name:		dokuwiki-tpl-%{_tpl}
-Version:	0
+Version:	20070712
 Release:	0.1
 License:	GPL
 Group:		Applications/WWW
@@ -10,7 +10,7 @@
 # Source0-md5:	4be0786c41b63d9988e51aa51d659670
 URL:		http://wiki.splitbrain.org/wiki:tpl:minimal_mobile
 BuildRequires:	rpmbuild(macros) >= 1.268
-Requires:	dokuwiki >= 20061106
+Requires:	dokuwiki
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/09/07 09:26:17  glen
+- unified
+
 Revision 1.1  2007/09/07 09:23:35  glen
 - new
 

================================================================
Index: SPECS/dokuwiki-tpl-multitemplate.spec
diff -u SPECS/dokuwiki-tpl-multitemplate.spec:1.4 SPECS/dokuwiki-tpl-multitemplate.spec:1.5
--- SPECS/dokuwiki-tpl-multitemplate.spec:1.4	Sat Sep  1 21:06:34 2007
+++ SPECS/dokuwiki-tpl-multitemplate.spec	Fri Sep  7 11:26:17 2007
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 %define		_snap	01022007
 %define		_ver	%(echo %{_snap} | sed -e 's,\\(..\\)\\(..\\)\\(....\\),\\3\\1\\2,')
+%define		_tpl	multitemplate
 Summary:	Multitemplate for DokuWiki
 Summary(pl.UTF-8):	Wielokrotne szablony dla DokuWiki
 Name:		dokuwiki-tpl-multitemplate
@@ -16,7 +17,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_dokudir	/usr/share/dokuwiki
-%define		_tpl		multitemplate
 %define		_tpldir		%{_dokudir}/lib/tpl/%{_tpl}
 
 %description
@@ -31,14 +31,14 @@
 %setup -q -n %{_tpl}
 
 cat > INSTALL <<'EOF'
-To activate this template add something like this to your conf/local.php file: 
+To activate this template add something like this to your conf/local.php file:
 
+$conf['template'] = '%{_tpl}';
+
+and configure defaults:
 $multitemplate['playground'] = 'default';
 $multitemplate[''] = 'monobook';
 
-and
-$conf['template'] = 'multitemplate';
-
 EOF
 
 %install
@@ -61,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007/09/07 09:26:17  glen
+- unified
+
 Revision 1.4  2007/09/01 19:06:34  qboosh
 - pl
 

================================================================
Index: SPECS/dokuwiki-tpl-sidebar.spec
diff -u SPECS/dokuwiki-tpl-sidebar.spec:1.2 SPECS/dokuwiki-tpl-sidebar.spec:1.3
--- SPECS/dokuwiki-tpl-sidebar.spec:1.2	Sat Sep  1 21:14:29 2007
+++ SPECS/dokuwiki-tpl-sidebar.spec	Fri Sep  7 11:26:17 2007
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 %define		_snap	2007-03-12
 %define		_ver	%(echo %{_snap} | tr -d -)
+%define		_tpl	sidebar
 Summary:	Sidebar navigation with DokuWiki
 Summary(pl.UTF-8):	Nawigacja po sidebarze przy użyciu DokuWiki
 Name:		dokuwiki-tpl-sidebar
@@ -17,7 +18,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_dokudir	/usr/share/dokuwiki
-%define		_tpl		sidebar
 %define		_tpldir		%{_dokudir}/lib/tpl/%{_tpl}
 
 %description
@@ -37,10 +37,10 @@
 %setup -q -n %{_tpl}
 
 cat > INSTALL <<'EOF'
-To activate this template add the following to your conf/local.php file: 
-$conf['template']    = 'sidebar';
+To activate this template add the following to your conf/local.php file:
+$conf['template']    = '%{_tpl}';
 
-If you want a tagline, you can define it as follows: 
+If you want a tagline, you can define it as follows:
 $conf['tagline']    = 'Your own tagline';
 EOF
 
@@ -64,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/09/07 09:26:17  glen
+- unified
+
 Revision 1.2  2007/09/01 19:14:29  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-minimalmobile.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-multitemplate.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-sidebar.spec?r1=1.2&r2=1.3&f=u