[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply              |    5 -----
 patches/dev300/build-ant-1.6.diff |   13 -------------
 2 files changed, 18 deletions(-)

New commits:
commit 4b73f866281d4fd249ebf5a68984132ca9a9a70e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 14:32:19 2011 +0200

    pushed build-ant-1.6.diff to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4fc7eb8..9e8956a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -229,11 +229,6 @@ gui-sw-scroll.diff, i#20826, michael
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
-[ NovellOnly ]
-# allow build with ant-1.6
-# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
-build-ant-1.6.diff, i#90830, pmladek
-
 [ Fixes ]
 # printf arguments cleanup
 buildfix-fmtargs.diff, cabral
diff --git a/patches/dev300/build-ant-1.6.diff b/patches/dev300/build-ant-1.6.diff
deleted file mode 100644
index 05e3651..0000000
--- a/patches/dev300/build-ant-1.6.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -6612,10 +6612,6 @@ else
- AC_SUBST(ANT_LIB)
- 
- ant_minver=1.6.0
--# update for more extensions...
--if test "$ENABLE_MEDIAWIKI" = "YES"; then
--  ant_minver=1.7.0
--fi
- ant_minminor1=`echo $ant_minver | cut -d"." -f2`
- 
- AC_MSG_CHECKING([whether ant is >= $ant_minver])