rpms/mediawiki/devel .cvsignore, 1.8, 1.9 mediawiki.spec, 1.13, 1.14 sources, 1.8, 1.9
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Mon Feb 5 01:12:07 UTC 2007
Author: athimm
Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2935
Modified Files:
.cvsignore mediawiki.spec sources
Log Message:
Update to 1.9.2 - sync with ATrpms' version.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 9 Jan 2007 12:35:07 -0000 1.8
+++ .cvsignore 5 Feb 2007 01:11:34 -0000 1.9
@@ -1 +1,2 @@
-mediawiki-1.8.3.tar.gz
+mediawiki-1.9.2.tar.gz
+mediawiki-1.9.1-commoncode.patch
Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mediawiki.spec 9 Jan 2007 12:35:07 -0000 1.13
+++ mediawiki.spec 5 Feb 2007 01:11:34 -0000 1.14
@@ -1,49 +1,37 @@
-%define wikidir %{_var}/www/mediawiki
-
-Name: mediawiki
-Version: 1.8.3
-Release: 7%{?dist}
Summary: A wiki engine
-
-Group: Applications/Internet
+Name: mediawiki
+Version: 1.9.2
+Release: 33%{?dist}
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
+Group: Development/Tools
+URL: http://wikipedia.sourceforge.net/
+Source0: http://prdownloads.sourceforge.net/wikipedia/%{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}
%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,105 +39,122 @@
%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 Feb 5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.2-33
+- Update to 1.9.2.
-%dir %{wikidir}
-%{wikidir}/[^cd]*[^h]
-%attr(770,root,apache) %dir %{wikidir}/config
-%{wikidir}/config/index.php
+* Fri Feb 2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.1-32
+- Fix permissions.
+- Remove some parts not needed at runtime anymore.
+* Thu Feb 1 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.1-31
+- Update to 1.9.1.
-%files math
-%defattr(-,root,root,-)
-%dir %{wikidir}/math
-%doc math/README math/TODO
-%{wikidir}/math/texvc
+* Sat Oct 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-28
+- Update to 1.8.2.
+* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-27
+- Update to 1.8.1.
+- Update to 1.8.0.
-%changelog
-* Tue Jan 9 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.
-
-* Thu Nov 23 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-6
-- Crude all-in-opt-out file inclusion policy for now to quick-fix some
- open bugs.
-
-* 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.
+* Mon Jul 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.7.1.
-* Sat Oct 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-4
-- Update to 1.8.2.
+* Wed Jun 7 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.7.
-* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-3
-- Update to 1.8.1.
+* Fri May 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.6.6.
-* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.0-2
-- Update to 1.8.0.
-- And php-gd, diffutils, ImageMagick as dependencies
+* 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 3 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.8.
+
+* Thu Mar 2 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.7.
+
+* Thu Jan 19 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.6.
-* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
-- Update to upstream 1.5.8 (contains security fixes)
+* Fri Jan 6 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.5.
-* Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
-- Update to upstream 1.5.7
+* Sun Dec 4 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.3.
-* Mon Feb 13 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-6
-- Rebuild for Fedora Extras 5
+* Fri Nov 4 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.2.
-* 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)
+* Mon Oct 31 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.1.
-* Sat Feb 04 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-4
-- Use Requires(pre) instead of PreReq (Mike McGrath)
+* Thu Oct 6 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5.0.
-* Thu Feb 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-3
-- Refactor the %%files section (Mike McGrath)
-- Replace "/etc" with macro
-- Package docs under %%{_defaultdocdir}/internals
-- Minor change in description
+* Fri Sep 2 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5rc4.
-* Tue Jan 31 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-2
-- Add %%defattr for -math subpackage
-- Fixed typo in description
+* Sun Jul 31 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta4.
-* Tue Jan 31 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.6-1
-- Update to upstream 1.5.6
+* Fri Jul 8 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta3.
-* 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
-- Package documentation for mediawiki-math
+* Tue Jul 5 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.5beta2.
-* Sat Jan 14 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.5-2
-- Separate math support into a subpackage
+* Sun Jul 3 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Initial build.
-* Thu Jan 12 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.5-1
-- Initial packaging
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 9 Jan 2007 12:35:07 -0000 1.8
+++ sources 5 Feb 2007 01:11:35 -0000 1.9
@@ -1 +1,2 @@
-9ef825abfcf0888b22571bbb097480f0 mediawiki-1.8.3.tar.gz
+c11aa0fd7ac10529606511913649a411 mediawiki-1.9.2.tar.gz
+d2fa9f438e9af6cc88ded2cf2af3a07c mediawiki-1.9.1-commoncode.patch
More information about the fedora-extras-commits
mailing list