rpms/mediawiki/devel README.RPM, NONE, 1.1 mediawiki.conf, NONE, 1.1 mediawiki.spec, 1.34, 1.35

[athimm]

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2004/devel

Modified Files:
	mediawiki.spec 
Added Files:
	README.RPM mediawiki.conf 
Log Message:
Add a README.RPM and a sample apache mediawiki.conf file.


--- NEW FILE README.RPM ---
This mediawiki package supports multiple instances, sometimes also
called Wiki Farms or Wiki Families, but you can use it for a single
instance just as well.

This works by copying /var/www/wiki as is to the new desired location
of your wiki(s) like

cp -a /var/www/wiki /srv/my.host/wiki

and creating an Apache config entry (if you use Apache for serving
mediawiki) like

DocumentRoot /srv/my.host/wiki
Alias /skins /usr/share/mediawiki/skins

(this example is for short URLs, e.g. ones w/o a "/wiki/" in the URL)


--- NEW FILE mediawiki.conf ---
# This is a sample configuration for a wiki instance located under
# /var/www/wiki and exposed as http://thishost/wiki. Please read
# /usr/share/doc/mediawiki-*/README.RPM on whether to use this
# instance or create copies of it.

# Alias /wiki/skins /usr/share/mediawiki/skins
# Alias /wiki /var/www/wiki

# If your DocumentRoot points into the wiki itself all that is needed is

# Alias /skins /usr/share/mediawiki/skins


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- mediawiki.spec	24 Jul 2009 10:37:59 -0000	1.34
+++ mediawiki.spec	24 Jul 2009 21:28:33 -0000	1.35
@@ -1,14 +1,16 @@
 Summary: A wiki engine
 Name: mediawiki
 Version: 1.15.1
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.mediawiki.org/
 Source0: http://download.wikimedia.org/mediawiki/1.15/%{name}-%{version}.tar.gz
+Source1: mediawiki.conf
+Source2: README.RPM
 Patch0: mediawiki-1.15.0-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-ExcludeArch:    sparc64 s390 s390x
+ExcludeArch: sparc64 s390 s390x
 BuildRequires: ocaml >= 3.06
 Requires: mediawiki-nomath = %{version}-%{release}
 Requires: mediawiki-math = %{version}-%{release}
@@ -59,10 +61,18 @@ make
 
 %install
 rm -rf %{buildroot}
+
+# move away the documentation to the final folder.
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+mv -f COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE CREDITS INSTALL docs \
+  %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
+install -p %{SOURCE2} %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
+
+# now copy the rest to the buildroot.
 mkdir -p %{buildroot}%{_datadir}/mediawiki
 cp -a * %{buildroot}%{_datadir}/mediawiki/
 
-# remove undeeded parts
+# remove unneeded parts
 rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test,tests}
 rm -fr %{buildroot}%{_datadir}/mediawiki/includes/zhtable
 find %{buildroot}%{_datadir}/mediawiki/ \
@@ -80,32 +90,36 @@ if test ! -d %{buildroot}%{_libdir}/medi
      %{buildroot}%{_libdir}/mediawiki/
 fi
 
+# remove version control/patch files
 find %{buildroot} -name .svnignore | xargs rm
 find %{buildroot} -name \*.commoncode | xargs rm
 
+# create a default instance of which other instances can be copied
 mkdir -p %{buildroot}/var/www/wiki
 cd %{buildroot}/var/www/wiki/
 mkdir -p images/{archive,deleted,temp,thumb}
 cp -a %{buildroot}%{_datadir}/mediawiki/config .
 ln -s %{_datadir}/mediawiki/index.php index.php
 ln -s %{_datadir}/mediawiki/api.php api.php
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
+install -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE
 
 %files nomath
-%defattr(-,root,root,-)
-%doc COPYING
+%{_defaultdocdir}/%{name}-%{version}
 %{_datadir}/mediawiki
 %attr(-,apache,apache) %dir %{_datadir}/mediawiki/config
 %{_datadir}/mediawiki/config/*
 /var/www/wiki
 %attr(-,apache,apache) %dir /var/www/wiki/config
 /var/www/wiki/config/*
+%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %files math
 %defattr(-,root,root,-)
@@ -113,6 +127,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 24 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.15.1-50
+- Add a README.RPM and a sample apache mediawiki.conf file.
+
 * Thu Jul 23 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.15.1-49
 - All (runtime) dependencies from mediawiki need to move to
   mediawiki-nomath.