- unify

Changed files:
    dokuwiki-tpl-monobook.spec -> 1.5

diff --git a/dokuwiki-tpl-monobook.spec b/dokuwiki-tpl-monobook.spec
index 9a00384c015b2a48eec5fa91bf01205a14611304..65df59903a89125aae9415c19c9f15c30b85fc3d 100644 (file)
--- a/dokuwiki-tpl-monobook.spec
+++ b/dokuwiki-tpl-monobook.spec
@@ -1,9 +1,9 @@
 %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
@@ -17,8 +17,8 @@ Requires:     dokuwiki >= 20070626
 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
@@ -32,20 +32,20 @@ osobnej wtyczki, a nawigację można modyfikować podobnie jak stronę
 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
@@ -56,13 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 %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