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.1 has been updated
via 7a58ec4bb58a2cadb2d88537bab76a3e859ba15c (commit)
from 23c87cd69e2493ede67d5947f24da57517c5d2b2 (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=7a58ec4bb58a2cadb2d88537bab76a3e859ba15c
commit 7a58ec4bb58a2cadb2d88537bab76a3e859ba15c
Author: Franck Villaume <[email protected]>
Date: Sun Mar 18 12:06:51 2018 +0100
mediawiki not available in EPEL anymore... dont know why. rely on fedora
22. specific backport
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 246e024..ca4436f 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -4,7 +4,7 @@
# Copyright (C) 2011 Roland Mas
# Copyright (C) 2011 Olivier Berger - Institut Telecom
# Copyright (C) 2014 Inria (Sylvain Beucler)
-# Copyright 2017, Franck Villaume - TrivialDev
+# Copyright 2017-2018, Franck Villaume - TrivialDev
#
# This file is part of FusionForge. FusionForge is free software;
# you can redistribute it and/or modify it under the terms of the
@@ -44,7 +44,11 @@ function rebuild_one_rpm {
enablefedsrc=
enablefed=
if [ "$1" = "--enablefedora" ] ; then
- enablefedsrc="--enablerepo=fedora-source
--enablerepo=fedora-updates-source"
+ if [ "$2" = "mediawiki" ] ; then
+ enablefedsrc="--enablerepo=fedora-source"
+ else
+ enablefedsrc="--enablerepo=fedora-source
--enablerepo=fedora-updates-source"
+ fi
shift
fi
@@ -88,7 +92,15 @@ function rebuild_one_rpm {
for i in $src-*.src.rpm ; do
if [ $rebuild = yes ] || [ ! -e "$i.done" ] ; then
- rpmbuild --rebuild $src-*.src.rpm
+ if [ $src = "mediawiki" ] ; then
+ rpm -i $src-*.src.rpm
+ cd ~/rpmbuild
+ sed -e 's/, php-pecl-jsonc//g' -i SPECS/mediawiki.spec
+ rpmbuild --define='_unpackaged_files_terminate_build 0'
-ba SPECS/mediawiki.spec
+ cd -
+ else
+ rpmbuild --rebuild $src-*.src.rpm
+ fi
fi
mv -f "$i" "$i.done"
done
@@ -180,6 +192,10 @@ EOF
REMOVEDEPS=$DEPS
backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
+ DEPS=""
+ REMOVEDEPS=$DEPS
+ backport_rpm_from_fedora mediawiki
+
mkdir -p /usr/src/fusionforge/build/RPMS/
cp -r ~/rpmbuild/RPMS/* /usr/src/fusionforge/build/RPMS/
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index ec4fa1e..d674446 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -82,7 +82,7 @@ else
cvs subversion viewvc python-pycurl git gitweb mercurial xinetd
\
moin mod_wsgi python-psycopg2 \
unoconv poppler-utils libreoffice-headless \
- mediawiki ImageMagick php-markdown \
+ ImageMagick php-markdown \
vsftpd \
dejavu-fonts-common
fi
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 22 +++++++++++++++++++---
autoinstall/install-src.sh | 2 +-
2 files changed, 20 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
