[babeltrace] Add patch removing popt in the pkg-config file

Yannick Brosseau greenscientist at fedoraproject.org
Tue May 28 20:17:22 UTC 2013


commit 7e5b90af69d0c6d8a6daa761f602dfebe1243ed6
Author: Yannick Brosseau <yannick.brosseau at gmail.com>
Date:   Tue May 28 16:05:32 2013 -0400

    Add patch removing popt in the pkg-config file
    
    popt version in fedora is old and does not contain the pkg-config file

 babeltrace-1.1.0-nopoptpc.patch |   12 ++++++++++++
 babeltrace.spec                 |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/babeltrace-1.1.0-nopoptpc.patch b/babeltrace-1.1.0-nopoptpc.patch
new file mode 100644
index 0000000..77f2f78
--- /dev/null
+++ b/babeltrace-1.1.0-nopoptpc.patch
@@ -0,0 +1,12 @@
+diff -up babeltrace-1.1.0/babeltrace.pc.in.orig babeltrace-1.1.0/babeltrace.pc.in
+--- babeltrace-1.1.0/babeltrace.pc.in.orig	2013-05-28 15:13:42.257000000 -0400
++++ babeltrace-1.1.0/babeltrace.pc.in	2013-05-28 15:13:49.529000000 -0400
+@@ -8,7 +8,7 @@ Description: libbabeltrace provides a re
+ Common Trace Format (CTF).
+ Version: @PACKAGE_VERSION@
+ Requires:
+-Requires.private: uuid popt
++Requires.private: uuid
+ Libs: -L${libdir} -lbabeltrace -lbabeltrace-ctf
+ Cflags: -I${includedir} 
+ 
diff --git a/babeltrace.spec b/babeltrace.spec
index 79f69d7..bd3e3f3 100644
--- a/babeltrace.spec
+++ b/babeltrace.spec
@@ -8,6 +8,8 @@ Group:          Development/Tools
 Summary:        Trace Viewer and Converter, mainly for the Common Trace Format
 BuildRequires:  pkgconfig bison flex glib2-devel popt-devel libuuid-devel libtool
 Requires:       lib%{name}%{?_isa} = %{version}-%{release}
+# The fedora popt package does not include the pkg-config file
+Patch0: 	babeltrace-1.1.0-nopoptpc.patch 
 
 %description
 This project provides trace read and write libraries, as well as a trace
@@ -42,6 +44,7 @@ to/from another trace format.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 #Re-run libtoolize and autoreconf to remove rpath


More information about the scm-commits mailing list