diff --git a/.gitignore b/.gitignore index c2b9664..166e2f9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.3.0.tar.bz2 /libmatroska-1.4.0.tar.bz2 /libmatroska-1.4.1.tar.bz2 +/libmatroska-1.4.2.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 18cf8ed..588594b 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,12 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: libebml-devel >= 1.3.0 +BuildRequires: libebml-devel >= 1.3.1 %description Matroska is an extensible open standard Audio/Video container. It @@ -19,7 +19,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.3.0 +Requires: libebml-devel >= 1.3.1 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -36,17 +36,13 @@ will use the Matroska container format. %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 -rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a -# Needed for proper stripping of the library (still in 0.8.0) -chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* +%make_install +rm %{buildroot}%{_libdir}/%{name}.la %post -p /sbin/ldconfig @@ -61,9 +57,15 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %files devel %{_includedir}/matroska/ %{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 14 2015 Dominik Mierzejewski - 1.4.2-1 +- Update to 1.4.2 +- Bump min required libebml version to 1.3.1 +- Adapt specfile to the new autotools-based build system + * Sun Aug 17 2014 Fedora Release Engineering - 1.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 95303a8..7c03f1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f61b2e5086f4bb9d24a43cc8af43a719 libmatroska-1.4.1.tar.bz2 +f8fe42003e072a42a19ed40405f9efdb libmatroska-1.4.2.tar.bz2