SPECS: mediawiki.spec - use more common %{_appdir} macro

[glen]

Author: glen                         Date: Sun Jul 10 13:21:59 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use more common %{_appdir} macro

---- Files affected:
SPECS:
   mediawiki.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/mediawiki.spec
diff -u SPECS/mediawiki.spec:1.21 SPECS/mediawiki.spec:1.22
--- SPECS/mediawiki.spec:1.21	Sun Jul 10 15:19:55 2005
+++ SPECS/mediawiki.spec	Sun Jul 10 15:21:54 2005
@@ -10,7 +10,7 @@
 Summary(pl):	MediaWiki - oprogramowanie do wspólnej edycji, na którym działa Wikipedia
 Name:		mediawiki
 Version:	1.4.6
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/wikipedia/%{name}-%{version}.tar.gz
@@ -34,8 +34,8 @@
 Requires:	apache >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		wikiroot	%{_datadir}/%{name}
 %define		_sysconfdir	/etc/%{name}
+%define		_appdir		%{_datadir}/%{name}
 
 %description
 MediaWiki is the collaborative editing software that runs Wikipedia,
@@ -72,11 +72,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikiroot} \
+install -d $RPM_BUILD_ROOT%{_appdir} \
 	$RPM_BUILD_ROOT%{_sysconfdir}
 
-cp -a config extensions images includes irc languages maintenance math skins $RPM_BUILD_ROOT%{wikiroot}
-cp *.php install-utils.inc $RPM_BUILD_ROOT%{wikiroot}
+cp -a config extensions images includes irc languages maintenance math skins $RPM_BUILD_ROOT%{_appdir}
+cp *.php install-utils.inc $RPM_BUILD_ROOT%{_appdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
 
@@ -137,24 +137,24 @@
 %doc docs FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE *.sample tests 
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache-%{name}.conf
-%dir %{wikiroot}
+%dir %{_appdir}
 %attr(770,root,http)
-%{wikiroot}/languages
-%{wikiroot}/math
-%{wikiroot}/irc
-%{wikiroot}/maintenance
-%{wikiroot}/images
-%{wikiroot}/extensions
-%{wikiroot}/skins
-%{wikiroot}/includes
-%{wikiroot}/*.php
+%{_appdir}/languages
+%{_appdir}/math
+%{_appdir}/irc
+%{_appdir}/maintenance
+%{_appdir}/images
+%{_appdir}/extensions
+%{_appdir}/skins
+%{_appdir}/includes
+%{_appdir}/*.php
 
 %files setup
 %defattr(644,root,root,755)
-%dir %attr(775,root,http) %{wikiroot}/config
-%{wikiroot}/install-utils.inc
+%dir %attr(775,root,http) %{_appdir}/config
+%{_appdir}/install-utils.inc
 # it's not configuration file actually.
-%{wikiroot}/config/index.php
+%{_appdir}/config/index.php
 
 # move here, as used only by setup?
 #require_once( "../includes/DefaultSettings.php" );
@@ -171,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2005/07/10 13:21:54  glen
+- use more common %{_appdir} macro
+
 Revision 1.21  2005/07/10 13:19:55  glen
 - use apache config triggers
 - 1.4.6 (security and bugfix release)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mediawiki.spec?r1=1.21&r2=1.22&f=u