diff --git a/.gitignore b/.gitignore index f4fc043..24b319c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /babeltrace-1.0.3.tar.bz2 /babeltrace-1.1.0.tar.bz2 /babeltrace-1.1.1.tar.bz2 +/babeltrace-1.2.0.tar.bz2 diff --git a/babeltrace-1.1.0-nopoptpc.patch b/babeltrace-1.1.0-nopoptpc.patch deleted file mode 100644 index 77f2f78..0000000 --- a/babeltrace-1.1.0-nopoptpc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 d57962e..900a4b0 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: MIT and GPLv2 URL: http://www.efficios.com/babeltrace Source0: http://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2 @@ -8,8 +8,6 @@ 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 @@ -44,7 +42,6 @@ to/from another trace format. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build #Re-run libtoolize and autoreconf to remove rpath @@ -78,8 +75,14 @@ rm -vf %{buildroot}%{_libdir}/*.la %{_prefix}/include/* %{_libdir}/*.so %{_libdir}/pkgconfig/babeltrace.pc +%{_libdir}/pkgconfig/babeltrace-ctf.pc %changelog +* Sat Mar 01 2014 Suchakra Sharma - 1.2.0-1 +- New upstream release +- Popt patch for babeltrace.pc.in removed. Its fixed in Fedora now +- Add new file (babeltrace-ctf.pc) + * Mon Aug 05 2013 Yannick Brosseau - 1.1.1-3 - Remove reference to versionned docdir (#992011) diff --git a/sources b/sources index 5de08e3..07ce8d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15cf79cb2407a75874e41c9e7658f987 babeltrace-1.1.1.tar.bz2 +104793ae3576ad9d1ef7d505f0ea5144 babeltrace-1.2.0.tar.bz2