Merge branch 'f29' into f30

epel8
Dominik 'Rathann' Mierzejewski 6 years ago
commit d21ebb6c40

1
.gitignore vendored

@ -10,3 +10,4 @@ libmatroska-1.0.0.tar.bz2
/libmatroska-1.4.7.tar.bz2
/libmatroska-1.4.8.tar.xz
/libmatroska-1.4.9.tar.xz
/libmatroska-1.5.0.tar.xz

@ -1,13 +1,15 @@
Summary: Open audio/video container format library
Name: libmatroska
Version: 1.4.9
Release: 3%{?dist}
Version: 1.5.0
Release: 1%{?dist}
License: LGPLv2+
URL: https://www.matroska.org/
Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz
BuildRequires: cmake
Patch0: %{name}-memory.patch
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: libebml-devel >= 1.3.6
BuildRequires: libebml-devel >= 1.3.7
Requires: libebml%{_isa} >= 1.3.7
%description
Matroska is an extensible open standard Audio/Video container. It
@ -19,8 +21,8 @@ is usually found as .mkv files (matroska video) and .mka files
%package devel
Summary: Matroska container format library development files
Requires: %{name}%{_isa} = %{version}-%{release}
Requires: cmake-filesystem
Requires: libebml-devel >= 1.3.6
Requires: %{_libdir}/cmake
Requires: libebml-devel >= 1.3.7
Requires: pkgconfig
%description devel
@ -35,10 +37,11 @@ will use the Matroska container format.
%prep
%setup -q
%patch0 -p1 -b .m
%build
%cmake .
%cmake3 .
%make_build
@ -52,12 +55,13 @@ will use the Matroska container format.
%files
%license LICENSE.LGPL
%doc ChangeLog
%{_libdir}/%{name}.so.*
%{_libdir}/%{name}.so.6*
%files devel
%{_includedir}/matroska/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_libdir}/cmake/matroska
%{_libdir}/cmake/matroska/MatroskaConfig.cmake
%{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake
%{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake
@ -65,6 +69,11 @@ will use the Matroska container format.
%changelog
* Sat Jun 08 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.5.0-1
- update to 1.5.0
- backport fixes for invalid memory access and null pointer dereference
- fix unowned %{_libdir}/cmake/ebml directory
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

@ -1 +1 @@
SHA512 (libmatroska-1.4.9.tar.xz) = 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33
SHA512 (libmatroska-1.5.0.tar.xz) = eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754

Loading…
Cancel
Save