rpms/mediawiki/EL-5 mediawiki.spec,1.14,1.15 sources,1.10,1.11

[Stephen J Smoogen]

Author: smooge

Update of /cvs/pkgs/rpms/mediawiki/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32483/EL-5

Modified Files:
	mediawiki.spec sources 
Log Message:
Mediawiki-1.11.2 used by Fedora Infrastructure


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/mediawiki.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mediawiki.spec	9 Apr 2008 19:05:53 -0000	1.14
+++ mediawiki.spec	1 Oct 2008 20:15:26 -0000	1.15
@@ -1,12 +1,11 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.10.4
-Release: 39%{?dist}
+Version: 1.11.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.mediawiki.org/
-Source0: http://download.wikimedia.org/mediawiki/1.10/%{name}-%{version}.tar.gz
-Patch0: mediawiki-1.9.1-commoncode.patch
+Source0: http://download.wikimedia.org/mediawiki/1.11/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ocaml >= 3.06
 # to make sure the "apache" group is created before mediawiki is installed
@@ -35,23 +34,45 @@
 
 %prep
 %setup -q
-%patch -p1 -b .commoncode
 
 %build
-cd math
+cd ./math
 make
+cd ..
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/mediawiki
 cp -a * %{buildroot}%{_datadir}/mediawiki/
 
-# remove undeeded parts
+# remove Test Trees
 rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test}
+
+# remove tables for ZH char sets. Breaks build.
 rm -fr %{buildroot}%{_datadir}/mediawiki/includes/zhtable
-find %{buildroot}%{_datadir}/mediawiki/ \
-  \( -name .htaccess -or -name \*.cmi \) \
-  | xargs rm
+
+## Remove any .htaccess files that might have creeped in.
+## Many directories have them there.
+for file in $( find %{buildroot} -type f -print | grep .htaccess$); do
+	rm $file
+done
+
+## Remove any *.cmi files that might have creeped in 
+#find %{buildroot}%{_datadir}/mediawiki/ -name \*.cmi | xargs rm
+for file in $( find %{buildroot} -type f -print | grep .cmi$); do
+	rm $file
+done
+
+## Find and remove subversion files
+for file in $( find %{buildroot} -type f -print | grep .svnignore$); do
+	rm $file
+done
+
+## Find and remove .commoncode files. Changed construct to not break
+## build if files do not exist
+for file in $( find %{buildroot} -type f -print | grep .commoncode$ ); do
+	rm $file
+done
 
 # fix permissions
 chmod +x %{buildroot}%{_datadir}/mediawiki/bin/*
@@ -64,9 +85,6 @@
      %{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
@@ -88,6 +106,9 @@
 /var/www/wiki/config/*
 
 %changelog
+* Fri May 16 2008 Stephen John Smoogen <smooge at canopus.unm.edu> - 1.12.0-1
+- Began testing. {remove commoncode entry.}
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Apr 2008 19:05:53 -0000	1.10
+++ sources	1 Oct 2008 20:15:26 -0000	1.11
@@ -1,2 +1 @@
-d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
-d81e5607a365b71f09496864e0aa93bb  mediawiki-1.10.4.tar.gz
+12e81f27a37b15b9d1ed110d6f48b35f  mediawiki-1.11.2.tar.gz