diff --git a/.cvsignore b/.cvsignore index 10c4ae0..ab1d2d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdvdnav-svn.tar.bz2 +libdvdnav-20080713.tar.bz2 diff --git a/libdvdnav.spec b/libdvdnav.spec index 01fbe72..1687278 100644 --- a/libdvdnav.spec +++ b/libdvdnav.spec @@ -1,16 +1,17 @@ Name: libdvdnav Version: 4.1.3 -Release: 0.1%{?dist} +Release: 0.2%{?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 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav -Source: libdvdnav-svn.tar.bz2 +Source: %{name}-20080713.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen +BuildRequires: libdvdread-devel >= 4.1.3-0.2 %description libdvdnav provides a simple library for reading DVD video discs. @@ -20,31 +21,13 @@ 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 = %{version}-%{release} +Requires: libdvdread-devel >= 4.1.3-0.2 +Requires: pkgconfig %description devel libdvdnav-devel contains the files necessary to build packages that use the libdvdnav library. -%package -n libdvdread -Summary: Simple foundation for reading DVD video disks -Group: System Environment/Libraries - -%description -n libdvdread -libdvdread provides a simple foundation for reading DVD video disks. -It provides the functionality that is required to access many DVDs. - -%package -n libdvdread-devel -Summary: Development files for libdvdread -Group: Development/Libraries -Requires: libdvdread = %{version}-%{release} - -%description -n libdvdread-devel -libdvdread provides a simple foundation for reading DVD video disks. -It provides the functionality that is required to access many DVDs. - -This package contains development files for libdvdread. - %prep %setup -q @@ -57,6 +40,7 @@ This package contains development files for libdvdread. --libdir=%{_libdir} \ --prefix=%{_prefix} \ --shlibdir=%{_libdir} \ + --with-dvdread-config="pkg-config dvdread" \ %{__make} %{?_smp_mflags} pushd doc @@ -76,10 +60,6 @@ popd %postun -p /sbin/ldconfig -%post -n libdvdread -p /sbin/ldconfig - -%postun -n libdvdread -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO @@ -94,18 +74,13 @@ popd %{_libdir}/libdvdnavmini.so %{_includedir}/dvdnav %{_datadir}/aclocal/dvdnav.m4 - -%files -n libdvdread -%defattr(-,root,root,-) -%{_libdir}/libdvdread.so.* - -%files -n libdvdread-devel -%defattr(-,root,root,-) -%{_bindir}/dvdread-config -%{_includedir}/libdvdread -%{_libdir}/libdvdread.so +%{_libdir}/pkgconfig/dvdnav.pc %changelog +* Thu Jul 17 2008 Dominik Mierzejewski 4.1.3-0.2 +- update to current SVN +- use new external libdvdread + * Fri Jun 06 2008 Dominik Mierzejewski 4.1.3-0.1 - update to current SVN (pre-4.1.3) - macroize diff --git a/sources b/sources index e3cfecb..3c2e7f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04f89199e87809927b3ab186a11f4e09 libdvdnav-svn.tar.bz2 +933efc321e7c247f66baac85e0f9cd9b libdvdnav-20080713.tar.bz2