Accepting request 109807 from devel:libraries:c_c++

- Ensure libxml2 is present in .pc file

OBS-URL: https://build.opensuse.org/request/show/109807
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/augeas?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2012-03-22 11:31:13 +00:00 committed by Git OBS Bridge
commit 2a06a78e63
3 changed files with 29 additions and 2 deletions

22
augeas-pkgdeps.diff Normal file
View File

@ -0,0 +1,22 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-17 15:49:17.431507472 +0100
Public augeas header files (for use by 3rd party programs) include
<libxml/tree.h>, so the .pc file must require xml2 for it to work.
---
augeas.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: augeas-0.10.0/augeas.pc.in
===================================================================
--- augeas-0.10.0.orig/augeas.pc.in
+++ augeas-0.10.0/augeas.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: augeas
Version: @VERSION@
Description: Augeas configuration editing library
-Requires:
+Requires: libxml-2.0
Libs: -L${libdir} -laugeas @LIBS@
Cflags: -I${includedir}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 17 14:54:10 UTC 2012 - jengelh@medozas.de
- Ensure libxml2 is present in .pc file
-------------------------------------------------------------------
Wed Feb 29 10:19:56 UTC 2012 - dmacvicar@suse.de

View File

@ -14,8 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: augeas
Version: 0.10.0
Release: 0
@ -28,6 +26,7 @@ Source1: baselibs.conf
Patch0: augeas-modprobe-lense.patch
# PATCH-FIX-OPENSUSE bnc-729491-recognize-suse-sysconfig-files.patch [bnc#729491]
Patch1: bnc-729491-recognize-suse-sysconfig-files.patch
Patch2: augeas-pkgdeps.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel
BuildRequires: libxml2-devel
@ -101,6 +100,7 @@ modifying the official lenses, or when creating new ones.
%setup -q
%patch0 -p1
%patch1 -p1
%patch -P 2 -p1
%build
export CFLAGS="-Wno-error $RPM_OPT_FLAGS"