Author: glen Date: Thu May 8 12:12:28 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify
---- Files affected:
SPECS:
dokuwiki-tpl-minimalmobile.spec (1.4 -> 1.5) , dokuwiki-tpl-monobook.spec
(1.4 -> 1.5) , dokuwiki-tpl-multitemplate.spec (1.6 -> 1.7) ,
dokuwiki-tpl-sidebar.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/dokuwiki-tpl-minimalmobile.spec
diff -u SPECS/dokuwiki-tpl-minimalmobile.spec:1.4
SPECS/dokuwiki-tpl-minimalmobile.spec:1.5
--- SPECS/dokuwiki-tpl-minimalmobile.spec:1.4 Thu May 8 13:23:25 2008
+++ SPECS/dokuwiki-tpl-minimalmobile.spec Thu May 8 14:12:22 2008
@@ -1,8 +1,8 @@
# $Revision$, $Date$
-%define _tpl minimalmobile
+%define tpl minimalmobile
Summary: Minimal Mobile template for DokuWiki
Summary(pl.UTF-8): Szablon Minimal Mobile dla DokuWiki
-Name: dokuwiki-tpl-%{_tpl}
+Name: dokuwiki-tpl-%{tpl}
Version: 20070712
Release: 1
License: GPL
@@ -15,8 +15,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _dokudir /usr/share/dokuwiki
-%define _tpldir %{_dokudir}/lib/tpl/%{_tpl}
+%define dokudir /usr/share/dokuwiki
+%define tpldir %{dokudir}/lib/tpl/%{tpl}
%description
A very minimal template, with almost no margins, modified from the
@@ -46,8 +46,8 @@
%setup -qc
cat > INSTALL <<'EOF'
-To activate this template add the following to your conf/local.php file:
-$conf['template'] = '%{_tpl}';
+To activate this template add the following to your conf/local.php file:
+$conf['template'] = '%{tpl}';
Get rid of the TOC, that takes a lot of space in mobile screens.
$conf['toptoclevel'] = 0; // Level starting with and below to include in
AutoTOC (max. 5)
@@ -56,8 +56,8 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_tpldir}
-cp -a minimalmobile/* $RPM_BUILD_ROOT%{_tpldir}
+install -d $RPM_BUILD_ROOT%{tpldir}
+cp -a minimalmobile/* $RPM_BUILD_ROOT%{tpldir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -65,7 +65,7 @@
%files
%defattr(644,root,root,755)
%doc INSTALL
-%{_tpldir}
+%{tpldir}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -73,6 +73,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2008-05-08 12:12:22 glen
+- unify
+
Revision 1.4 2008-05-08 11:23:25 glen
- unify; rel 1
================================================================
Index: SPECS/dokuwiki-tpl-monobook.spec
diff -u SPECS/dokuwiki-tpl-monobook.spec:1.4
SPECS/dokuwiki-tpl-monobook.spec:1.5
--- SPECS/dokuwiki-tpl-monobook.spec:1.4 Thu May 8 13:23:25 2008
+++ SPECS/dokuwiki-tpl-monobook.spec Thu May 8 14:12:22 2008
@@ -1,10 +1,10 @@
# $Revision$, $Date$
%define _snap 07202007
%define _ver %(echo %{_snap} | sed -e
's,\\(..\\)\\(..\\)\\(....\\),\\3\\1\\2,')
-%define _tpl monobook
+%define tpl monobook
Summary: Monobook template for DokuWiki
Summary(pl.UTF-8): Szablon Monobook dla DokuWiki
-Name: dokuwiki-tpl-%{_tpl}
+Name: dokuwiki-tpl-%{tpl}
Version: %{_ver}
Release: 1
License: GPL v2
@@ -18,8 +18,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _dokudir /usr/share/dokuwiki
-%define _tpldir %{_dokudir}/lib/tpl/%{_tpl}
+%define dokudir /usr/share/dokuwiki
+%define tpldir %{dokudir}/lib/tpl/%{tpl}
%description
Gives DokuWiki the Wikipedia/Mediawiki look and feel, as well as more
@@ -33,20 +33,20 @@
wiki.
%prep
-%setup -q -n %{_tpl}
+%setup -q -n %{tpl}
rm -f LICENSE # GPL v2
cat > INSTALL <<'EOF'
To activate this template add the following to your conf/local.php file:
-$conf['template'] = '%{_tpl}';
+$conf['template'] = '%{tpl}';
EOF
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_tpldir}
-cp -a . $RPM_BUILD_ROOT%{_tpldir}
-rm -f $RPM_BUILD_ROOT%{_tpldir}/{INSTALL,README}
+install -d $RPM_BUILD_ROOT%{tpldir}
+cp -a . $RPM_BUILD_ROOT%{tpldir}
+rm -f $RPM_BUILD_ROOT%{tpldir}/{INSTALL,README}
# find locales
sh %{SOURCE1} %{name}.lang
@@ -57,16 +57,16 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc INSTALL README
-%dir %{_tpldir}
-%{_tpldir}/*.php
-%{_tpldir}/style.ini
-%{_tpldir}/common
-%{_tpldir}/conf
-%{_tpldir}/dokuwiki
-%{_tpldir}/monobook
-%{_tpldir}/user
+%dir %{tpldir}
+%{tpldir}/*.php
+%{tpldir}/style.ini
+%{tpldir}/common
+%{tpldir}/conf
+%{tpldir}/dokuwiki
+%{tpldir}/monobook
+%{tpldir}/user
# TODO: lang dirs inside. check if these can be also rpm lang tagged
-%{_tpldir}/wikipedia
+%{tpldir}/wikipedia
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -74,6 +74,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2008-05-08 12:12:22 glen
+- unify
+
Revision 1.4 2008-05-08 11:23:25 glen
- unify; rel 1
================================================================
Index: SPECS/dokuwiki-tpl-multitemplate.spec
diff -u SPECS/dokuwiki-tpl-multitemplate.spec:1.6
SPECS/dokuwiki-tpl-multitemplate.spec:1.7
--- SPECS/dokuwiki-tpl-multitemplate.spec:1.6 Thu May 8 13:23:25 2008
+++ SPECS/dokuwiki-tpl-multitemplate.spec Thu May 8 14:12:22 2008
@@ -1,7 +1,7 @@
# $Revision$, $Date$
%define _snap 01022007
%define _ver %(echo %{_snap} | sed -e
's,\\(..\\)\\(..\\)\\(....\\),\\3\\1\\2,')
-%define _tpl multitemplate
+%define tpl multitemplate
Summary: Multitemplate for DokuWiki
Summary(pl.UTF-8): Wielokrotne szablony dla DokuWiki
Name: dokuwiki-tpl-multitemplate
@@ -16,8 +16,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _dokudir /usr/share/dokuwiki
-%define _tpldir %{_dokudir}/lib/tpl/%{_tpl}
+%define dokudir /usr/share/dokuwiki
+%define tpldir %{dokudir}/lib/tpl/%{tpl}
%description
This template allows you to use any templates you wish for any
@@ -28,12 +28,12 @@
dowolnej przestrzeni nazw (lub strony).
%prep
-%setup -q -n %{_tpl}
+%setup -q -n %{tpl}
cat > INSTALL <<'EOF'
To activate this template add something like this to your conf/local.php file:
-$conf['template'] = '%{_tpl}';
+$conf['template'] = '%{tpl}';
and configure defaults:
$multitemplate['playground'] = 'default';
@@ -43,9 +43,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_tpldir}
-cp -a . $RPM_BUILD_ROOT%{_tpldir}
-rm -f $RPM_BUILD_ROOT%{_tpldir}/INSTALL
+install -d $RPM_BUILD_ROOT%{tpldir}
+cp -a . $RPM_BUILD_ROOT%{tpldir}
+rm -f $RPM_BUILD_ROOT%{tpldir}/INSTALL
%clean
rm -rf $RPM_BUILD_ROOT
@@ -53,7 +53,7 @@
%files
%defattr(644,root,root,755)
%doc INSTALL
-%{_tpldir}
+%{tpldir}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -61,6 +61,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2008-05-08 12:12:22 glen
+- unify
+
Revision 1.6 2008-05-08 11:23:25 glen
- unify; rel 1
================================================================
Index: SPECS/dokuwiki-tpl-sidebar.spec
diff -u SPECS/dokuwiki-tpl-sidebar.spec:1.4 SPECS/dokuwiki-tpl-sidebar.spec:1.5
--- SPECS/dokuwiki-tpl-sidebar.spec:1.4 Thu May 8 13:23:25 2008
+++ SPECS/dokuwiki-tpl-sidebar.spec Thu May 8 14:12:22 2008
@@ -1,7 +1,7 @@
# $Revision$, $Date$
%define _snap 2007-03-12
%define _ver %(echo %{_snap} | tr -d -)
-%define _tpl sidebar
+%define tpl sidebar
Summary: Sidebar navigation with DokuWiki
Summary(pl.UTF-8): Nawigacja po sidebarze przy użyciu DokuWiki
Name: dokuwiki-tpl-sidebar
@@ -17,8 +17,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _dokudir /usr/share/dokuwiki
-%define _tpldir %{_dokudir}/lib/tpl/%{_tpl}
+%define dokudir /usr/share/dokuwiki
+%define tpldir %{dokudir}/lib/tpl/%{tpl}
%description
Better navigation with DokuWiki. Features a navigation sidebar, a
@@ -34,11 +34,11 @@
na ile to możliwe.
%prep
-%setup -q -n %{_tpl}
+%setup -q -n %{tpl}
cat > INSTALL <<'EOF'
To activate this template add the following to your conf/local.php file:
-$conf['template'] = '%{_tpl}';
+$conf['template'] = '%{tpl}';
If you want a tagline, you can define it as follows:
$conf['tagline'] = 'Your own tagline';
@@ -46,9 +46,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_tpldir}
-cp -a . $RPM_BUILD_ROOT%{_tpldir}
-rm -f $RPM_BUILD_ROOT%{_tpldir}/INSTALL
+install -d $RPM_BUILD_ROOT%{tpldir}
+cp -a . $RPM_BUILD_ROOT%{tpldir}
+rm -f $RPM_BUILD_ROOT%{tpldir}/INSTALL
%clean
rm -rf $RPM_BUILD_ROOT
@@ -56,7 +56,7 @@
%files
%defattr(644,root,root,755)
%doc INSTALL
-%{_tpldir}
+%{tpldir}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -64,6 +64,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2008-05-08 12:12:22 glen
+- unify
+
Revision 1.4 2008-05-08 11:23:25 glen
- unify; rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-minimalmobile.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-monobook.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-multitemplate.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki-tpl-sidebar.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
