fix FTBFS (rhbz#1106007)

- drop obsolete patch
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2014-06-09 22:50:01 +02:00
parent f5b31a5141
commit f9aa01bc04
2 changed files with 5 additions and 17 deletions

View File

@ -1,12 +0,0 @@
diff --git a/src/searching.c b/src/searching.c
index 66f7adb..31bf0d3 100644
--- a/src/searching.c
+++ b/src/searching.c
@@ -628,6 +628,7 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
else
endcellnr = 0;
+ if (!pgc->cell_playback) continue;
do {
cell = &pgc->cell_playback[cellnr-1];
if(!(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK &&

View File

@ -1,13 +1,11 @@
Name: libdvdnav
Version: 4.2.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A library for reading DVD video discs based on Ogle code
License: GPLv2+
URL: http://dvdnav.mplayerhq.hu/
Source0: http://dvdnav.mplayerhq.hu/releases/libdvdnav-%{version}.tar.xz
Patch0: %{name}-multilib.patch
# fix segfault when cell is empty, patch by Simo Sorce, bug #902037
Patch1: %{name}-pgc-cell_playback.patch
BuildRequires: doxygen
BuildRequires: libdvdread-devel >= 4.1.3-0.3
@ -28,7 +26,6 @@ libdvdnav library.
%prep
%setup -q
%patch0 -p1 -b .multilib
%patch1 -p1 -b .pgc-cell_playback
%build
./configure2 \
@ -39,7 +36,6 @@ libdvdnav library.
--libdir=%{_libdir} \
--prefix=%{_prefix} \
--shlibdir=%{_libdir} \
--with-dvdread-config="pkg-config dvdread" \
%{__make} %{?_smp_mflags}
pushd doc
@ -73,6 +69,10 @@ popd
%{_libdir}/pkgconfig/dvdnavmini.pc
%changelog
* Mon Jun 09 2014 Dominik Mierzejewski <rpm[AT]greysector.net> 4.2.1-3
- drop obsolete patch
- fix FTBFS (rhbz#1106007)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild