From d42b3063100915d876c801d523c5b10dd7ee0bcd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 15 Jan 2015 11:19:28 +0100 Subject: [PATCH] Update to 1.3.1 (rhbz#1182372) --- .gitignore | 1 + libebml.spec | 23 +++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 17fe726..14c6a68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.1.tar.bz2 /libebml-1.2.2.tar.bz2 /libebml-1.3.0.tar.bz2 +/libebml-1.3.1.tar.bz2 diff --git a/libebml.spec b/libebml.spec index aa7f237..f2eda90 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -16,7 +16,7 @@ pendant to XML. %package devel Summary: Development files for the Extensible Binary Meta Language library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Extensible Binary Meta Language access library A library for reading @@ -36,18 +36,13 @@ mv ChangeLog.tmp ChangeLog %build -CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install -make -C make/linux \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL="install -p" \ - install -rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a -# Needed for proper stripping of the library (still in 0.7.6) -chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* +%make_install +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %post -p /sbin/ldconfig @@ -62,9 +57,13 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %files devel %{_includedir}/ebml/ %{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 15 2015 Hans de Goede - 1.3.1-1 +- Update to 1.3.1 (rhbz#1182372) + * Sun Aug 17 2014 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 8c3da5e..b66ca4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efec729bf5a51e649e1d9d1f61c0ae7a libebml-1.3.0.tar.bz2 +2d5a0e502fabedfded2a890c6b5513a5 libebml-1.3.1.tar.bz2