rpms/mediawiki/EL-5 mediawiki.spec,1.13,1.14 sources,1.9,1.10

[Stephen J Smoogen (smooge)]

Author: smooge

Update of /cvs/pkgs/rpms/mediawiki/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29729

Modified Files:
	mediawiki.spec sources 
Log Message:
Parced changes from old spec file and new spec file together. Need to be
reviewed to confirm I met standards.




Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/mediawiki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mediawiki.spec	22 Feb 2007 12:24:32 -0000	1.13
+++ mediawiki.spec	9 Apr 2008 19:05:53 -0000	1.14
@@ -1,49 +1,41 @@
-%define wikidir %{_var}/www/mediawiki
-
-Name: mediawiki
-Version: 1.8.4
-Release: 8%{?dist}
 Summary: A wiki engine
-
-Group: Applications/Internet
+Name: mediawiki
+Version: 1.10.4
+Release: 39%{?dist}
 License: GPL
+Group: Applications/Internet
 URL: http://www.mediawiki.org/
-Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz
-Source1: mediawiki-httpd.conf
-Source2: mediawiki-install.txt
+Source0: http://download.wikimedia.org/mediawiki/1.10/%{name}-%{version}.tar.gz
+Patch0: mediawiki-1.9.1-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-Requires: httpd
-Requires: php >= 5
-Requires: php-mysql
-Requires: php-gd, diffutils, ImageMagick
+BuildRequires: ocaml >= 3.06
 # to make sure the "apache" group is created before mediawiki is installed
 Requires(pre): httpd
+Requires: php >= 5, php-xml
+Requires: php-mysql, php-pgsql
+Requires: diffutils, ImageMagick, php-gd
+Requires: tetex-latex, tetex-dvips
+Provides: mediawiki-math = %{version}-%{release}
+Obsoletes: mediawiki-math < %{version}-%{release}
+
+# Ugly workaround, don't do that at home, kids!
+# #250992
+ExcludeArch: ppc64
 
 %description
-MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
-the other Wikimedia Foundation websites. Compared to other wikis, it has a
-wide range of features and support for high-traffic websites using
-multiple servers.
-
-Mathematics support is included in the package mediawiki-math.
-
-%package math
-Summary: Mathematical formula support for MediaWiki
-Group: Applications/Internet
-
-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.
+MediaWiki is the software used for Wikipedia and the other Wikimedia
+Foundation websites. Compared to other wikis, it has an excellent
+range of features and support for high-traffic websites using multiple
+servers
+
+This package supports wiki farms. Copy /var/www/wiki over to the
+desired wiki location and configure it through the web
+interface. Remember to remove the config dir after completing the
+configuration.
 
 %prep
 %setup -q
-install -D -m 644 %{SOURCE2} ./INSTALL.fedora
-rm -rf tests includes/zhtable skins/disabled
-rm -f `find -name ".[ch]*"`
+%patch -p1 -b .commoncode
 
 %build
 cd math
@@ -51,50 +43,84 @@
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{wikidir}
-#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
-#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
-cp -a * %{buildroot}%{wikidir}/
-rm -fr %{buildroot}%{wikidir}/docs %{buildroot}%{wikidir}/math
-find %{buildroot} -name .svnignore | xargs -r rm
-%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
-
-install -d %{buildroot}%{wikidir}/math
-install math/texvc %{buildroot}%{wikidir}/math
+mkdir -p %{buildroot}%{_datadir}/mediawiki
+cp -a * %{buildroot}%{_datadir}/mediawiki/
 
-install -D -m 644 %{SOURCE1} \
-  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+# remove undeeded parts
+rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test}
+rm -fr %{buildroot}%{_datadir}/mediawiki/includes/zhtable
+find %{buildroot}%{_datadir}/mediawiki/ \
+  \( -name .htaccess -or -name \*.cmi \) \
+  | xargs rm
+
+# fix permissions
+chmod +x %{buildroot}%{_datadir}/mediawiki/bin/*
+find %{buildroot}%{_datadir}/mediawiki -name \*.pl | xargs chmod +x
+
+# move arch dependent parts
+if test ! -d %{buildroot}%{_libdir}/mediawiki/math; then
+  mkdir -p %{buildroot}%{_libdir}/mediawiki
+  mv %{buildroot}%{_datadir}/mediawiki/math \
+     %{buildroot}%{_libdir}/mediawiki/
+fi
+
+find %{buildroot} -name .svnignore | xargs rm
+find %{buildroot} -name \*.commoncode | xargs rm
+
+mkdir -p %{buildroot}/var/www/wiki
+cd %{buildroot}/var/www/wiki/
+mkdir images
+cp -a %{buildroot}%{_datadir}/mediawiki/config .
+ln -s %{_datadir}/mediawiki/index.php index.php
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE
-%doc INSTALL.fedora
-%doc docs
+%{_datadir}/mediawiki
+%attr(-,apache,apache) %dir %{_datadir}/mediawiki/config
+%{_datadir}/mediawiki/config
+%{_libdir}/mediawiki
+/var/www/wiki
+%attr(-,apache,apache) %dir /var/www/wiki/config
+/var/www/wiki/config/*
 
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mediawiki.conf
+%changelog
+* Mon Mar 24 2008 Stephen John Smoogen <smooge at canopus.unm.edu> - 1.10.4-39
+- Merge spec files from EL-5 and F-8 to keep history of package
 
-%dir %{wikidir}
-%{wikidir}/[^cd]*[^h]
-%attr(770,root,apache) %dir %{wikidir}/config
-%{wikidir}/config/index.php
+* Tue Mar 04 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.4-38
+- Update to 1.10.4.
 
+* Tue Feb 17 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.3-37
+- Update to 1.10.3.
+- Fixes CVE-2008-0460 (bug #430286).
 
-%files math
-%defattr(-,root,root,-)
-%dir %{wikidir}/math
-%doc math/README math/TODO
-%{wikidir}/math/texvc
+* Wed Sep 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.10.2-36
+- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)
 
+* Wed May 09 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.0-35
+- Update to 1.10.0.
+
+* Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34
+- Update to 1.9.4.
 
-%changelog
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.4-8
 - Update to 1.8.4.
 
-* Tue Jan  9 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.3-7
+* Mon Feb 05 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.2-33
+- Update to 1.9.2.
+
+* Fri Feb 02 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.1-32
+- Fix permissions.
+- Remove some parts not needed at runtime anymore.
+
+* Thu Feb 01 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.1-31
+- Update to 1.9.1.
+
+* Tue Jan 09 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.3-7
 - Update to 1.8.3.
 - Update fixes an XSS injection vulnerability in the AJAX module.
 
@@ -117,6 +143,24 @@
 - Update to 1.8.0.
 - And php-gd, diffutils, ImageMagick as dependencies
 
+* Mon Jul 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.7.1.
+
+* Wed Jun 07 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.7.
+
+* Fri May 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.6.
+
+* Thu Apr 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.3.
+
+* Sat Apr  8 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.2.
+
+* Fri Apr  7 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.1.
+
 * Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
 - Update to upstream 1.5.8 (contains security fixes)
 
@@ -146,6 +190,9 @@
 * Tue Jan 31 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-1
 - Update to upstream 1.5.6
 
+* Thu Jan 19 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.6.
+
 * Sun Jan 15 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.5-3
 - Add PreReq for httpd, since we use the apache user
 - Make mediawiki-math dependencies more specific
@@ -156,3 +203,31 @@
 
 * Thu Jan 12 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.5-1
 - Initial packaging
+
+* Sun Dec 04 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.3.
+
+* Fri Nov 04 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.2.
+
+* Mon Oct 31 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.1.
+
+* Thu Oct 06 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.0.
+
+* Fri Sep 02 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5rc4.
+
+* Sun Jul 31 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta4.
+
+* Fri Jul 08 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta3.
+
+* Tue Jul 05 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta2.
+
+* Sun Jul 03 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Initial build.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Feb 2007 12:24:32 -0000	1.9
+++ sources	9 Apr 2008 19:05:53 -0000	1.10
@@ -1 +1,2 @@
-deda96c093bc0f16df5ded6228e6275a  mediawiki-1.8.4.tar.gz
+d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
+d81e5607a365b71f09496864e0aa93bb  mediawiki-1.10.4.tar.gz