Accepting request 109804 from home:jengelh:branches:devel:libraries:c_c++
- Ensure libxml2 is present in .pc file OBS-URL: https://build.opensuse.org/request/show/109804 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/augeas?expand=0&rev=35
This commit is contained in:
parent
e6b2a25725
commit
b3504b4e5d
22
augeas-pkgdeps.diff
Normal file
22
augeas-pkgdeps.diff
Normal 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}
|
@ -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
|
Wed Feb 29 10:19:56 UTC 2012 - dmacvicar@suse.de
|
||||||
|
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: augeas
|
Name: augeas
|
||||||
Version: 0.10.0
|
Version: 0.10.0
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -28,6 +26,7 @@ Source1: baselibs.conf
|
|||||||
Patch0: augeas-modprobe-lense.patch
|
Patch0: augeas-modprobe-lense.patch
|
||||||
# PATCH-FIX-OPENSUSE bnc-729491-recognize-suse-sysconfig-files.patch [bnc#729491]
|
# PATCH-FIX-OPENSUSE bnc-729491-recognize-suse-sysconfig-files.patch [bnc#729491]
|
||||||
Patch1: bnc-729491-recognize-suse-sysconfig-files.patch
|
Patch1: bnc-729491-recognize-suse-sysconfig-files.patch
|
||||||
|
Patch2: augeas-pkgdeps.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
@ -101,6 +100,7 @@ modifying the official lenses, or when creating new ones.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch -P 2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
|
export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user