rpms/mediawiki/devel mediawiki.spec,1.8,1.9

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26883

Modified Files:
	mediawiki.spec 
Log Message:
Forward-port changes for FC-6.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mediawiki.spec	14 Oct 2006 09:35:59 -0000	1.8
+++ mediawiki.spec	5 Nov 2006 22:09:03 -0000	1.9
@@ -1,24 +1,24 @@
 %define wikidir %{_var}/www/mediawiki
 
-Name:           mediawiki
-Version:        1.8.2
-Release:        4%{?dist}
-Summary:        The PHP-based wiki software behind Wikipedia
-
-Group:          Applications/Internet
-License:        GPL
-URL:            http://www.mediawiki.org/
-Source0:        http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz
-Source1:	mediawiki-httpd.conf
-Source2:        mediawiki-install.txt
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       httpd
-Requires:       php >= 4.1.2
-Requires:	php-mysql
-Requires:	php-gd, diffutils, ImageMagick
+Name: mediawiki
+Version: 1.8.2
+Release: 5%{?dist}
+Summary: A wiki engine
+
+Group: Applications/Internet
+License: GPL
+URL: http://www.mediawiki.org/
+Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz
+Source1: mediawiki-httpd.conf
+Source2: mediawiki-install.txt
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: httpd
+Requires: php >= 5
+Requires: php-mysql
+Requires: php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
-Requires(pre):  httpd
+Requires(pre): httpd
 
 %description
 MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
@@ -30,12 +30,12 @@
 
 
 %package math
-Summary:        Mathematical formula support for MediaWiki
-Group:          Applications/Internet
+Summary: Mathematical formula support for MediaWiki
+Group: Applications/Internet
 
-BuildRequires:  ocaml
-Requires:	mediawiki = %{version}-%{release}
-Requires:       ImageMagick tetex-latex tetex-dvips
+BuildRequires: ocaml >= 3.06
+Requires: mediawiki = %{version}-%{release}
+Requires: ImageMagick, tetex-latex, tetex-dvips
 
 %description math
 This package includes the support for mathematical formulas in MediaWiki.
@@ -50,22 +50,22 @@
 
 %build
 cd math
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikidir}
-cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.*  $RPM_BUILD_ROOT%{wikidir}
-%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl
-
-install -d $RPM_BUILD_ROOT%{wikidir}/math
-install math/texvc $RPM_BUILD_ROOT%{wikidir}/math
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+rm -rf %{buildroot}
+install -d %{buildroot}%{wikidir}
+cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
+cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
+
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -90,6 +90,11 @@
 
 
 %changelog
+* Thu Nov 2 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-5
+- Fix depenencies, add versions.
+- Add missing *.php files.
+- Cosmetic changes.
+
 * Sat Oct 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-4
 - Update to 1.8.2.
 
@@ -111,7 +116,7 @@
 
 * Mon Feb 06 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
-  back to docs (#180177)
+ back to docs (#180177)
 
 * Sat Feb 04 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-4
 - Use Requires(pre) instead of PreReq (Mike McGrath)