rpms/libdvdnav/F-9 .cvsignore, 1.3, 1.4 libdvdnav.spec, 1.11, 1.12 sources, 1.3, 1.4 libdvdnav-r1001-r1043.patch, 1.1, NONE libdvdnav-r1108.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/libdvdnav/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7358

Modified Files:
	.cvsignore libdvdnav.spec sources 
Removed Files:
	libdvdnav-r1001-r1043.patch libdvdnav-r1108.patch 
Log Message:
* Sun Sep 21 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
- update to 4.1.3 final
- use new external libdvdread
- macroize



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2008 15:32:17 -0000	1.3
+++ .cvsignore	21 Sep 2008 11:38:22 -0000	1.4
@@ -1 +1 @@
-libdvdnav-4.1.2.tar.gz
+libdvdnav-4.1.3.tar.bz2


Index: libdvdnav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/libdvdnav.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libdvdnav.spec	30 Jul 2008 20:44:56 -0000	1.11
+++ libdvdnav.spec	21 Sep 2008 11:38:23 -0000	1.12
@@ -1,16 +1,17 @@
 Name:           libdvdnav
-Version:        4.1.2
-Release:        3%{?dist}
+Version:        4.1.3
+Release:        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
-Patch0:         %{name}-r1001-r1043.patch
-Patch1:         %{name}-r1108.patch
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
+# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+#Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
+BuildRequires:  libdvdread-devel >= 4.1.3-1
 
 %description
 libdvdnav provides a simple library for reading DVD video discs.
@@ -20,68 +21,45 @@
 Summary:        Development files for libdvdnav
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libdvdread-devel = %{version}-%{release}
+Requires:       libdvdread-devel >= 4.1.3-1
+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
-%patch0 -p0
-%patch1 -p0
 
 %build
 ./configure2 \
  --disable-opts \
  --disable-static \
  --disable-strip \
- --extra-cflags="$RPM_OPT_FLAGS" \
+ --extra-cflags="%{optflags}" \
  --libdir=%{_libdir} \
  --prefix=%{_prefix} \
  --shlibdir=%{_libdir} \
+ --with-dvdread-config="pkg-config dvdread" \
 
-make %{?_smp_mflags}
+%{__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
 
 %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
@@ -96,18 +74,15 @@
 %{_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}/dvdread
-%{_libdir}/libdvdread.so
+%{_libdir}/pkgconfig/dvdnav.pc
+%{_libdir}/pkgconfig/dvdnavmini.pc
 
 %changelog
+* Sun Sep 21 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
+- update to 4.1.3 final
+- use new external libdvdread
+- macroize
+
 * Wed Jul 30 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.2-3
 - really fix #455961
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2008 15:32:17 -0000	1.3
+++ sources	21 Sep 2008 11:38:23 -0000	1.4
@@ -1 +1 @@
-0e9a494403f9f5a2e781252c77599561  libdvdnav-4.1.2.tar.gz
+d62383c45b28816771e283515f2c27fa  libdvdnav-4.1.3.tar.bz2


--- libdvdnav-r1001-r1043.patch DELETED ---


--- libdvdnav-r1108.patch DELETED ---