Changes of Revision 44

aMule.spec Changed
x
 
1
@@ -9,7 +9,6 @@
2
 Patch:     0001-Fix-desktop-files.patch
3
 # git diff 20f3a3b..origin/master | xz -e -9 > update.diff.xz
4
 Patch1:         update.diff.xz
5
-Patch2:         0002-Fix-gdlib-detection.patch
6
 BuildRequires:  autoconf
7
 BuildRequires:  automake >= 1.9
8
 BuildRequires:  binutils-devel
9
@@ -51,7 +50,6 @@
10
 %setup -q -n %{name}
11
 %patch -p1
12
 %patch1 -p1
13
-%patch2 -p1
14
 
15
 %build
16
 ./autogen.sh
17
0002-Fix-gdlib-detection.patch Deleted
28
 
1
@@ -1,26 +0,0 @@
2
-From 3ddceee70a54ec6532e3d5e3caacd97f9c9a97d3 Mon Sep 17 00:00:00 2001
3
-From: Johannes Obermayr <johannesobermayr@gmx.de>
4
-Date: Thu, 4 Feb 2016 17:37:46 +0100
5
-Subject: [PATCH] Fix gdlib detection.
6
-
7
-Bad hack but needed because "gdlib-config --version" returns ".." due to a bug in the script.
8
----
9
- m4/gdlib.m4 | 2 +-
10
- 1 file changed, 1 insertion(+), 1 deletion(-)
11
-
12
-diff --git a/m4/gdlib.m4 b/m4/gdlib.m4
13
-index 236da4b..7d359b8 100644
14
---- a/m4/gdlib.m4
15
-+++ b/m4/gdlib.m4
16
-@@ -69,7 +69,7 @@ m4_define([REQUIRED_VERSION_MICRO], [m4_bregexp(REQUIRED_VERSION, [\([0-9]+\)\.\
17
-       gdlib_config_minor_version=`echo $GDLIB_VERSION | sed ['s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/']`
18
-       gdlib_config_micro_version=`echo $GDLIB_VERSION | sed ['s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/']`
19
- 
20
--      gdlib_ver_ok=
21
-+      gdlib_ver_ok=yes
22
-       MULE_IF([test $gdlib_config_major_version -gt REQUIRED_VERSION_MAJOR], [gdlib_ver_ok=yes],
23
-           [test $gdlib_config_major_version -eq REQUIRED_VERSION_MAJOR], [
24
-               MULE_IF([test $gdlib_config_minor_version -gt REQUIRED_VERSION_MINOR], [gdlib_ver_ok=yes],
25
--- 
26
-2.7.0
27
-
28