From a0dc386b263589a6bb7f243cf852fe7041852786 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rathann@fedoraproject.org>
Date: Fri, 6 Jun 2008 21:01:06 +0000
Subject: [PATCH] - update to current SVN (pre-4.1.3) - macroize - re-enable
 parallel make

---
 .cvsignore     |  2 +-
 libdvdnav.spec | 32 +++++++++++++++++++-------------
 sources        |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 67e3234..10c4ae0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdvdnav-4.1.2.tar.gz
+libdvdnav-svn.tar.bz2
diff --git a/libdvdnav.spec b/libdvdnav.spec
index ba81f28..01fbe72 100644
--- a/libdvdnav.spec
+++ b/libdvdnav.spec
@@ -1,11 +1,13 @@
 Name:           libdvdnav
-Version:        4.1.2
-Release:        1%{?dist}
+Version:        4.1.3
+Release:        0.1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz
+#Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz
+# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+Source:         libdvdnav-svn.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -51,26 +53,24 @@ This package contains development files for libdvdread.
  --disable-opts \
  --disable-static \
  --disable-strip \
- --extra-cflags="$RPM_OPT_FLAGS" \
+ --extra-cflags="%{optflags}" \
  --libdir=%{_libdir} \
  --prefix=%{_prefix} \
  --shlibdir=%{_libdir} \
 
-#parallel make fails
-#make %{?_smp_mflags}
-make
+%{__make} %{?_smp_mflags}
 pushd doc
 doxygen doxy.conf
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/aclocal
-install -p -m 644 m4/dvdnav.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__install} -d -m 755 %{buildroot}/%{_datadir}/aclocal
+%{__install} -p -m 644 m4/dvdnav.m4 %{buildroot}/%{_datadir}/aclocal
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -101,10 +101,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libdvdread-devel
 %defattr(-,root,root,-)
-%{_includedir}/dvdread
+%{_bindir}/dvdread-config
+%{_includedir}/libdvdread
 %{_libdir}/libdvdread.so
 
 %changelog
+* Fri Jun 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.1
+- update to current SVN (pre-4.1.3)
+- macroize
+- re-enable parallel make
+
 * Sun Apr 13 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.2-1
 - update to 4.1.2
 - drop obsolete patches (merged upstream)
diff --git a/sources b/sources
index aff4441..e3cfecb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e9a494403f9f5a2e781252c77599561  libdvdnav-4.1.2.tar.gz
+04f89199e87809927b3ab186a11f4e09  libdvdnav-svn.tar.bz2