pool/libdatrie
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 323991 from home:dimstar:Factory

Browse Source 
Fix build with doxygen 1.8.10... the configure check is plain stupid

OBS-URL: https://build.opensuse.org/request/show/323991
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdatrie?expand=0&rev=18
This commit is contained in:
Ismail Dönmez 2015-08-18 13:38:54 +00:00 committed by Git OBS Bridge
parent a81f3b9505
commit 4337395185
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libdatrie-doxygen-found-is-enough.patch Normal file
View File

@ -0,0 +1,18 @@
Index: libdatrie-0.2.8/configure.ac
===================================================================
--- libdatrie-0.2.8.orig/configure.ac
+++ libdatrie-0.2.8/configure.ac
@@ -112,12 +112,7 @@ if test "x$enable_doxygen_doc" = "xyes";
else
AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
DOXYGEN_VER=$($DOXYGEN --version)
- if expr $DOXYGEN_VER \< $DOXYGEN_REQ_VER > /dev/null; then
- AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled])
- enable_doxygen_doc="no"
- else
- AC_MSG_RESULT([$DOXYGEN_VER, yes])
- fi
+ AC_MSG_RESULT([$DOXYGEN_VER, yes])
fi
fi

9
libdatrie.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 18 11:28:57 UTC 2015 - dimstar@opensuse.org
- Add libdatrie-doxygen-found-is-enough.patch: when we find
doxygen, we assume it is new enough. The configure script uses
'expr 1.8.4 \< $DOXYGEN_VER', which returns false for 1.8.10.
- For safeguard, we specify the minimal required version of
doxygen (1.8.4) in the buildrequirements.
-------------------------------------------------------------------
Wed Feb 4 12:34:37 UTC 2015 - p.drouand@gmail.com

8
libdatrie.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libdatrie
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,9 @@ Group: System/Libraries
Url: http://linux.thai.net/~thep/datrie/datrie.html
Source: ftp://linux.thai.net/pub/ThaiLinux/software/libthai/%{name}-%{version}.tar.xz
Source99: baselibs.conf
BuildRequires: doxygen
Patch0: libdatrie-doxygen-found-is-enough.patch
BuildRequires: doxygen >= 1.8.4
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -55,8 +57,10 @@ This package contains the development files for libdatrie.
%prep
%setup -q
%patch0 -p1
%build
autoreconf -fiv
%configure \
--disable-static --with-pic \
--with-html-docdir=%{_docdir}/libdatrie/html