From b7a10f1baac66fc16384c10f5d56c23f5344bfe7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 05:48:17 +0000
Subject: import libdvdnav-5.0.3-1.el7


---

diff --git a/.gitignore b/.gitignore
index 2331c81..8485812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libdvdnav-4.2.0.tar.bz2
+SOURCES/libdvdnav-5.0.3.tar.bz2
diff --git a/.libdvdnav.metadata b/.libdvdnav.metadata
index d631c48..8e0572f 100644
--- a/.libdvdnav.metadata
+++ b/.libdvdnav.metadata
@@ -1 +1 @@
-ded45d985576169ae3630d8be7179a2323bc0f6f SOURCES/libdvdnav-4.2.0.tar.bz2
+e3ec3277e37dd1714e7dc7d205b8fd084125b51a SOURCES/libdvdnav-5.0.3.tar.bz2
diff --git a/SOURCES/libdvdnav-multilib.patch b/SOURCES/libdvdnav-multilib.patch
deleted file mode 100644
index 2b6d15c..0000000
--- a/SOURCES/libdvdnav-multilib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -up libdvdnav-4.1.3/Makefile.multilib libdvdnav-4.1.3/Makefile
---- libdvdnav-4.1.3/Makefile.multilib	2008-12-30 15:48:46.000000000 +0100
-+++ libdvdnav-4.1.3/Makefile	2009-09-27 00:36:48.000000000 +0200
-@@ -143,12 +143,6 @@ distclean: clean
- dvdnav-config: $(.OBJDIR)/dvdnav-config
- $(.OBJDIR)/dvdnav-config: $(BUILDDEPS)
- 	@echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config
--	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config
--	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config
--	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config
--	@echo 'dvdread_cflags="'$(DVDREAD_CFLAGS)'"' >> $(.OBJDIR)/dvdnav-config
--	@echo 'dvdread_libs="'$(DVDREAD_LIBS)'"' >> $(.OBJDIR)/dvdnav-config
--	@echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config
- 	@echo >> $(.OBJDIR)/dvdnav-config
- 	cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
- 	chmod 0755 $(.OBJDIR)/dvdnav-config
-diff -up libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib libdvdnav-4.1.3/misc/dvdnav-config2.sh
---- libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib	2008-10-10 00:20:01.000000000 +0200
-+++ libdvdnav-4.1.3/misc/dvdnav-config2.sh	2009-09-27 00:34:39.000000000 +0200
-@@ -30,7 +30,7 @@ while test $# -gt 0; do
-       echo_prefix=yes
-       ;;
-     --version)
--      echo $version
-+      echo `pkg-config --modversion dvdnav`
-       ;;
-     --cflags)
-       echo_cflags=yes
-@@ -52,21 +52,21 @@ while test $# -gt 0; do
- done
- 
- if test "$echo_prefix" = "yes"; then
--	echo $prefix
-+      echo `pkg-config --variable=prefix dvdnav`
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
-+      echo `pkg-config --cflags dvdnav`
- fi
- 
- if test "$echo_minicflags" = "yes"; then
--      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
-+      echo `pkg-config --cflags dvdnavmini`
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
-+      echo `pkg-config --libs dvdnav`
- fi
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L$libdir -ldvdnavmini $threadlib
-+      echo `pkg-config --libs dvdnavmini`
- fi
diff --git a/SPECS/libdvdnav.spec b/SPECS/libdvdnav.spec
index d5665be..f493ddd 100644
--- a/SPECS/libdvdnav.spec
+++ b/SPECS/libdvdnav.spec
@@ -1,16 +1,15 @@
 Name:           libdvdnav
-Version:        4.2.0
-Release:        8%{?dist}
+Version:        5.0.3
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source0:        http://dvdnav.mplayerhq.hu/releases/libdvdnav-%{version}.tar.bz2
-Patch0:         %{name}-multilib.patch
+Source0:        https://download.videolan.org/pub/videolan/libdvdnav/%{version}/libdvdnav-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
-BuildRequires:  libdvdread-devel >= 4.1.3-0.3
+BuildRequires:  libdvdread-devel >= 5.0.2
 
 %description
 libdvdnav provides a simple library for reading DVD video discs.
@@ -20,7 +19,7 @@ The code is based on Ogle and used in, among others, the Xine dvdnav plug-in.
 Summary:        Development files for libdvdnav
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libdvdread-devel >= 4.1.3-0.3
+Requires:       libdvdread-devel >= 5.0.2
 Requires:       pkgconfig
 
 %description    devel
@@ -29,18 +28,12 @@ libdvdnav library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
 
 %build
-./configure2 \
- --disable-opts \
+CFLAGS="%{optflags} -fno-strict-aliasing" ./configure \
  --disable-static \
- --disable-strip \
- --extra-cflags="%{optflags} -fno-strict-aliasing" \
  --libdir=%{_libdir} \
- --prefix=%{_prefix} \
- --shlibdir=%{_libdir} \
- --with-dvdread-config="pkg-config dvdread" \
+ --prefix=%{_prefix}
 
 %{__make} %{?_smp_mflags}
 pushd doc
@@ -50,8 +43,8 @@ popd
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-%{__install} -d -m 755 %{buildroot}/%{_datadir}/aclocal
-%{__install} -p -m 644 m4/dvdnav.m4 %{buildroot}/%{_datadir}/aclocal
+rm %{buildroot}%{_libdir}/libdvdnav.la
+rm -rf %{buildroot}%{_datadir}/doc/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -62,22 +55,22 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog README
 %{_libdir}/libdvdnav.so.*
-%{_libdir}/libdvdnavmini.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc TODO doc/html/*
-%{_bindir}/dvdnav-config
 %{_libdir}/libdvdnav.so
-%{_libdir}/libdvdnavmini.so
 %{_includedir}/dvdnav
-%{_datadir}/aclocal/dvdnav.m4
 %{_libdir}/pkgconfig/dvdnav.pc
-%{_libdir}/pkgconfig/dvdnavmini.pc
 
 %changelog
+* Wed May 18 2016 Bastien Nocera <bnocera@redhat.com> - 5.0.3-1
+- Upgrade to 5.0.3
+- Fixes a number of playback bugs
+Resolves: #1068814
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 4.2.0-8
 - Mass rebuild 2014-01-24