packages: glib2/glib2.spec, glib2/glib2-libelf.patch (NEW)=?UTF-8?Q?=20?=- added libelf p...

[qboosh]

Author: qboosh                       Date: Thu Apr 19 14:56:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added libelf patch: hack to use -lelf to link only gresource tool instead of everything
- BR: elfutils-devel
- release 2

---- Files affected:
packages/glib2:
   glib2.spec (1.258 -> 1.259) , glib2-libelf.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/glib2/glib2.spec
diff -u packages/glib2/glib2.spec:1.258 packages/glib2/glib2.spec:1.259
--- packages/glib2/glib2.spec:1.258	Sat Apr 14 12:04:42 2012
+++ packages/glib2/glib2.spec	Thu Apr 19 16:55:58 2012
@@ -20,18 +20,20 @@
 Summary(zh_CN.UTF-8):	实用工具函数库
 Name:		glib2
 Version:	2.32.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-%{version}.tar.xz
 # Source0-md5:	032c7cf9868c9aa186b490b155a41144
 Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-libelf.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	elfutils-devel
 BuildRequires:	fam-devel
 BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.17}
@@ -202,6 +204,7 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if !%{with apidocs}
 %{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -382,6 +385,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.259  2012/04/19 14:55:58  qboosh
+- added libelf patch: hack to use -lelf to link only gresource tool instead of everything
+- BR: elfutils-devel
+- release 2
+
 Revision 1.258  2012/04/14 10:04:42  megabajt
 - updated to 2.32.1
 

================================================================
Index: packages/glib2/glib2-libelf.patch
diff -u /dev/null packages/glib2/glib2-libelf.patch:1.1
--- /dev/null	Thu Apr 19 16:56:04 2012
+++ packages/glib2/glib2-libelf.patch	Thu Apr 19 16:55:58 2012
@@ -0,0 +1,21 @@
+--- glib-2.32.1/configure.ac.orig	2012-04-13 15:39:41.000000000 +0200
++++ glib-2.32.1/configure.ac	2012-04-18 21:22:32.292969778 +0200
+@@ -1816,14 +1816,14 @@
+ PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
+ 
+ if test $have_libelf = maybe; then
+-  AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
+-  AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
+-  AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
++  AC_CHECK_LIB([elf], [elf_begin], [:], [have_libelf=no])
++  AC_CHECK_LIB([elf], [elf_getshdrstrndx], [:], [have_libelf=no])
++  AC_CHECK_LIB([elf], [elf_getshdrnum], [:], [have_libelf=no])
+   AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
+ 
+   if test $have_libelf != no; then
+     LIBELF_LIBS=-lelf
+-    have_libelf = yes
++    have_libelf=yes
+   fi
+ fi
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/glib2/glib2.spec?r1=1.258&r2=1.259