diff --git a/.gitignore b/.gitignore index a782250..813f4a5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libdvdread-svn1188.tar.bz2 /libdvdread-svn1226.tar.bz2 /libdvdread-4.2.0.tar.bz2 /libdvdread-4.2.1.tar.xz +/libdvdread-4.9.9.tar.xz diff --git a/libdvdread-multilib.patch b/libdvdread-multilib.patch deleted file mode 100644 index b5bef38..0000000 --- a/libdvdread-multilib.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up libdvdread-4.1.4/Makefile.multilib libdvdread-4.1.4/Makefile ---- libdvdread-4.1.4/Makefile.multilib 2008-12-31 09:43:03.000000000 +0100 -+++ libdvdread-4.1.4/Makefile 2009-09-27 00:41:34.000000000 +0200 -@@ -131,9 +131,6 @@ distclean: clean - dvdread-config: $(.OBJDIR)/dvdread-config - $(.OBJDIR)/dvdread-config: $(BUILDDEPS) - @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config -- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config -- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config -- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config - @echo >> $(.OBJDIR)/dvdread-config - cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config - chmod 0755 $(.OBJDIR)/dvdread-config -diff -up libdvdread-4.1.4/misc/dvdread-config.sh.multilib libdvdread-4.1.4/misc/dvdread-config.sh ---- libdvdread-4.1.4/misc/dvdread-config.sh.multilib 2008-09-23 11:14:45.000000000 +0200 -+++ libdvdread-4.1.4/misc/dvdread-config.sh 2009-09-27 00:39:39.000000000 +0200 -@@ -1,4 +1,3 @@ --dvdreadlib="-ldvdread" - - usage() - { -@@ -28,7 +27,7 @@ while test $# -gt 0; do - echo_prefix=yes - ;; - --version) -- echo $version -+ echo `pkg-config --modversion dvdread` - ;; - --cflags) - echo_cflags=yes -@@ -44,13 +43,13 @@ while test $# -gt 0; do - done - - if test "$echo_prefix" = "yes"; then -- echo $prefix -+ echo `pkg-config --variable=prefix dvdread` - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $extracflags -+ echo `pkg-config --cflags dvdread` - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir $dvdreadlib -+ echo `pkg-config --libs dvdread` - fi diff --git a/libdvdread.spec b/libdvdread.spec index 5c08786..ebf21b1 100644 --- a/libdvdread.spec +++ b/libdvdread.spec @@ -1,13 +1,10 @@ Name: libdvdread -Version: 4.2.1 +Version: 4.9.9 Release: 1%{?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/libdvdread-%{version}.tar.xz -# dvdread-config: use pkg-config instead of hard-coded -# multilib-conflicting values -Patch1: %{name}-multilib.patch Provides: bundled(md5-gcc) %description @@ -27,22 +24,15 @@ This package contains development files for libdvdread. %prep %setup -q -%patch1 -p1 -b .multilib %build -./configure2 \ - --disable-opts \ - --disable-static \ - --disable-strip \ - --extra-cflags="%{optflags}" \ - --libdir=%{_libdir} \ - --prefix=%{_prefix} \ - --shlibdir=%{_libdir} \ +%configure --disable-static %{__make} %{?_smp_mflags} %install %{__make} install DESTDIR=%{buildroot} +rm %{buildroot}%{_libdir}/libdvdread.la %post -p /sbin/ldconfig @@ -50,18 +40,23 @@ This package contains development files for libdvdread. %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS COPYING NEWS README %{_libdir}/libdvdread.so.* %files devel %defattr(-,root,root,-) -%doc DEVELOPMENT-POLICY.txt TODO -%{_bindir}/dvdread-config +%doc ChangeLog TODO %{_includedir}/dvdread %{_libdir}/libdvdread.so %{_libdir}/pkgconfig/dvdread.pc %changelog +* Thu Apr 10 2014 Dominik Mierzejewski 4.9.9-1 +- update to 4.9.9 release +- drop obsolete patch +- switch to autotools configure +- fix bogus date in changelog + * Thu Dec 19 2013 Dominik Mierzejewski 4.2.1-1 - updated to 4.2.1 release - drop obsolete/redundant specfile elements @@ -125,7 +120,7 @@ This package contains development files for libdvdread. - rebuild for BuildID - update license tag -* Wed Nov 26 2006 Dominik Mierzejewski 0.9.7-2 +* Sun Nov 26 2006 Dominik Mierzejewski 0.9.7-2 - Rebuild. * Fri Oct 6 2006 Dams - 0.9.7-1 diff --git a/sources b/sources index 1539e38..99a017e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68cf65b46478ff894be6e91d97dae41a libdvdread-4.2.1.tar.xz +1aa8ad88e462791a8e77d628a63ee788 libdvdread-4.9.9.tar.xz