diff --git a/0001-drop-useless-test-for-ant-apache-regexp.patch b/0001-drop-useless-test-for-ant-apache-regexp.patch new file mode 100644 index 0000000..961915b --- /dev/null +++ b/0001-drop-useless-test-for-ant-apache-regexp.patch @@ -0,0 +1,71 @@ +From cb6511354b500d1b1bd8ff140fdf0ea106b174d4 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 3 Sep 2014 16:20:40 +0200 +Subject: [PATCH] drop useless test for ant-apache-regexp + +It has not been needed since commit +1de48c417404464ca1e34e5c5d1c82a9342349bb 4 years ago. + +Change-Id: I53ceb5d8d6c02c7a13c86cdd884e4fc378a2c492 +--- + configure.ac | 44 -------------------------------------------- + 1 file changed, 44 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f65ab66..897cb1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12311,50 +12311,6 @@ EOF + AC_MSG_ERROR([no, you need at least Ant >= $ant_minver]) + fi + +- if test "$ENABLE_MEDIAWIKI" = "TRUE"; then +- AC_MSG_CHECKING([whether Ant supports mapper type="regexp"]) +- rm -rf confdir +- mkdir confdir +- cat > conftest.java << EOF +- public class conftest { +- int testmethod(int a, int b) { +- return a + b; +- } +- } +-EOF +- +- cat > conftest.xml << EOF +- +- +- +- +- +- +- +- +- +- +- +- +- +-EOF +- +- if test "$JAVACISGCJ" = "yes"; then +- JAVA_HOME=; export JAVA_HOME +- ant_gcj="-Dbuild.compiler=gcj" +- fi +- AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2) +- if test $? = 0 -a -f ./conftest.class; then +- AC_MSG_RESULT([yes]) +- rm -rf confdir +- else +- echo "configure: Ant test failed" >&5 +- cat conftest.java >&5 +- cat conftest.xml >&5 +- rm -rf confdir +- AC_MSG_ERROR([no. Did you install ant-apache-regexp?]) +- fi +- fi + rm -f conftest* core core.* *.core + fi + +-- +1.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index e7bfa6e..e306f99 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -218,7 +218,6 @@ BuildRequires: pkgconfig(zlib) # java stuff BuildRequires: ant -BuildRequires: ant-apache-regexp %if 0%{?rhel} && 0%{?rhel} < 7 BuildRequires: jakarta-commons-codec BuildRequires: jakarta-commons-lang @@ -309,6 +308,7 @@ Patch53: 0001-cast-arg-to-the-right-type.patch Patch54: 0001-sigh-simply-forgot-to-include-the-endian-header.patch Patch55: 0002-Linux-AArch64-port.patch Patch56: 0001-fix-KDE4-detection-on-aarch64.patch +Patch57: 0001-drop-useless-test-for-ant-apache-regexp.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice