update to 5.0.1
- drop obsolete patches
This commit is contained in:
parent
34692f8f0a
commit
d712937fd4
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ libdvdnav-svn1184.tar.bz2
|
||||
/libdvdnav-svn1226.tar.bz2
|
||||
/libdvdnav-4.2.0.tar.bz2
|
||||
/libdvdnav-4.2.1.tar.xz
|
||||
/libdvdnav-5.0.1.tar.bz2
|
||||
|
||||
@ -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
|
||||
@ -1,11 +1,10 @@
|
||||
Name: libdvdnav
|
||||
Version: 4.2.1
|
||||
Release: 4%{?dist}
|
||||
Version: 5.0.1
|
||||
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/libdvdnav-%{version}.tar.xz
|
||||
Patch0: %{name}-multilib.patch
|
||||
Source0: ftp://ftp.videolan.org/pub/videolan/libdvdnav/%{version}/libdvdnav-%{version}.tar.bz2
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libdvdread-devel >= 4.1.3-0.3
|
||||
|
||||
@ -25,17 +24,9 @@ libdvdnav library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -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}
|
||||
pushd doc
|
||||
@ -44,8 +35,7 @@ popd
|
||||
|
||||
%install
|
||||
%{__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
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
@ -53,22 +43,21 @@ popd
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README
|
||||
%doc AUTHORS ChangeLog COPYING 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
|
||||
* Sat Sep 20 2014 Dominik Mierzejewski <rpm[AT]greysector.net> 5.0.1-1
|
||||
- update to 5.0.1
|
||||
- drop obsolete patches
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user