[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-54-g27a3796

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Fri Sep 4 12:53:23 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.0 has been updated
       via  27a3796fff685b4fea466e8d74ae28b74698eb92 (commit)
      from  5aed90bb3165c1ee18832239a0db13b3e7f8e9f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=27a3796fff685b4fea466e8d74ae28b74698eb92

commit 27a3796fff685b4fea466e8d74ae28b74698eb92
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 4 12:53:16 2015 +0200

    testsuite: don't install mediawiki on CentOS since it can't be easily backported -- test was disabled anyway

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 37868b7..0279776 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -200,24 +200,28 @@ EOF
 
 	    # mediawiki not available in EPEL
 	    # Note: we don't support mediawiki > 1.19 as of 2015-06
-	    if yum list mediawiki >/dev/null 2>&1; then
-		yum install -y mediawiki
-	    else
-		DEPS="httpd-filesystem"
-		yum install --enablerepo=fedora -y $DEPS
-		yumdownloader --enablerepo=fedora-source --enablerepo=fedora-updates-source \
-			      --source mediawiki
-		rpm -ivh mediawiki-*.src.rpm
-	        # don't backport php-pecl-jsonc which has lots of deps, let's use built-in php-json
-		sed -i -e '/Requires/ s/, php-pecl-jsonc//' ~/rpmbuild/SPECS/mediawiki.spec
-		sed -i -e '/Requires: php-pecl-jsonc/d' ~/rpmbuild/SPECS/mediawiki.spec
-		# drop new-style php requires
-		sed -i -e '/Requires: php(/d' ~/rpmbuild/SPECS/mediawiki.spec
-		# drop test-suite
-		sed -i -e '/BuildRequires: /d' ~/rpmbuild/SPECS/mediawiki.spec
-		sed -i -e '/^%check/,/^php phpunit.php/d' ~/rpmbuild/SPECS/mediawiki.spec
-		rpmbuild -bb ~/rpmbuild/SPECS/mediawiki.spec
-		yum install -y ~/rpmbuild/RPMS/noarch/mediawiki-[0-9]*.rpm
+	    # Note: no stable/backportable mediawiki rpm as of 2015-09 -> manual install + mock rpm?
+	    if false; then
+                if yum list mediawiki >/dev/null 2>&1; then
+                    yum install -y mediawiki
+                else
+                    DEPS="httpd-filesystem"
+                    yum install --enablerepo=fedora -y $DEPS
+                    yumdownloader --enablerepo=fedora-source --enablerepo=fedora-updates-source \
+                                  --source mediawiki
+                    rpm -ivh mediawiki-*.src.rpm
+		    # Work-arounds for mediawiki-1.25.1-3.fc22
+                    # don't backport php-pecl-jsonc which has lots of deps, use built-in php-json
+                    sed -i -e '/Requires/ s/, php-pecl-jsonc//' ~/rpmbuild/SPECS/mediawiki.spec
+                    sed -i -e '/Requires: php-pecl-jsonc/d' ~/rpmbuild/SPECS/mediawiki.spec
+                    # drop new-style php requires
+                    sed -i -e '/Requires: php(/d' ~/rpmbuild/SPECS/mediawiki.spec
+                    # drop test-suite
+                    sed -i -e '/BuildRequires: /d' ~/rpmbuild/SPECS/mediawiki.spec
+                    sed -i -e '/^%check/,/^php phpunit.php/d' ~/rpmbuild/SPECS/mediawiki.spec
+                    rpmbuild -bb ~/rpmbuild/SPECS/mediawiki.spec
+                    yum install -y ~/rpmbuild/RPMS/noarch/mediawiki-[0-9]*.rpm
+                fi
 	    fi
 
 	    yum --enablerepo=epel -y install php-tidy
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index cfbc129..3817fd7 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -46,7 +46,6 @@ else
     yum install -y gettext php-cli php-pgsql php-process php-mbstring php-pear-HTTP \
 	httpd mod_dav_svn mod_ssl postgresql-server nscd \
 	subversion viewvc python-pycurl git gitweb xinetd \
-	mediawiki119 \
 	moin mod_wsgi python-psycopg2 \
 	unoconv poppler-utils
 fi
@@ -56,7 +55,7 @@ fi
     make
     make install-base install-shell install-scm \
         install-plugin-scmsvn install-plugin-scmgit \
-        install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin \
+        install-plugin-blocks install-plugin-moinmoin \
         install-plugin-online_help install-plugin-taskboard install-plugin-message
     make post-install
 )

-----------------------------------------------------------------------

Summary of changes:
 autoinstall/common-backports | 40 ++++++++++++++++++++++------------------
 autoinstall/install-src.sh   |  3 +--
 2 files changed, 23 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list