rpms/lsdvd/devel lsdvd-0.16-build.patch, 1.1, 1.2 lsdvd.spec, 1.4, 1.5 lsdvd-0.16-libdvdread-include.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/lsdvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8804

Modified Files:
	lsdvd-0.16-build.patch lsdvd.spec 
Removed Files:
	lsdvd-0.16-libdvdread-include.patch 
Log Message:
Update existing patch instead of including new one.


lsdvd-0.16-build.patch:

Index: lsdvd-0.16-build.patch
===================================================================
RCS file: /cvs/extras/rpms/lsdvd/devel/lsdvd-0.16-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lsdvd-0.16-build.patch	22 Aug 2007 17:52:05 -0000	1.1
+++ lsdvd-0.16-build.patch	2 Sep 2008 09:35:02 -0000	1.2
@@ -1,30 +1,34 @@
 diff -Naupr lsdvd-0.16.orig/configure.in lsdvd-0.16/configure.in
 --- lsdvd-0.16.orig/configure.in	2005-12-12 21:11:01.000000000 +0100
-+++ lsdvd-0.16/configure.in	2006-04-19 16:32:33.000000000 +0200
-@@ -10,7 +10,8 @@ fi
++++ lsdvd-0.16/configure.in	2008-09-02 11:27:58.000000000 +0200
+@@ -9,8 +9,9 @@ if eval "test x$GCC = xyes"; then # Enab
+ fi
  
  AC_CHECK_LIB(dvdread, DVDOpen, , AC_MSG_ERROR([libdvdread not found!]))
- AC_MSG_CHECKING([for dvdread/ifo_read.h])
+-AC_MSG_CHECKING([for dvdread/ifo_read.h])
 -AC_TRY_COMPILE([#include <dvdread/ifo_read.h>
++AC_MSG_CHECKING([for libdvdread/ifo_read.h])
 +AC_TRY_COMPILE([#include <inttypes.h>,
-+		#include <dvdread/ifo_read.h>
++		#include <libdvdread/ifo_read.h>
  		#include <stdint.h>], ,
  	AC_MSG_RESULT([yes]), 
  	AC_MSG_RESULT([no]) 
 diff -Naupr lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
 --- lsdvd-0.16.orig/lsdvd.c	2006-03-02 14:48:11.000000000 +0100
-+++ lsdvd-0.16/lsdvd.c	2006-04-19 16:32:48.000000000 +0200
-@@ -13,6 +13,7 @@
++++ lsdvd-0.16/lsdvd.c	2008-09-02 11:28:18.000000000 +0200
+@@ -13,7 +13,8 @@
   *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
   *			  output info structures in form of a Perl module, by Henk Vergonet.
   */
+-#include <dvdread/ifo_read.h>
 +#include <inttypes.h>
- #include <dvdread/ifo_read.h>
++#include <libdvdread/ifo_read.h>
  #include <string.h>
  #include <sys/stat.h>
+ #include <stdio.h>
 diff -Naupr lsdvd-0.16.orig/Makefile.am lsdvd-0.16/Makefile.am
 --- lsdvd-0.16.orig/Makefile.am	2006-03-03 08:26:23.000000000 +0100
-+++ lsdvd-0.16/Makefile.am	2006-04-19 16:33:04.000000000 +0200
++++ lsdvd-0.16/Makefile.am	2008-09-02 11:25:22.000000000 +0200
 @@ -1,4 +1,3 @@
  bin_PROGRAMS = lsdvd
  lsdvd_SOURCES = lsdvd.c ocode.c ohuman.c oxml.c lsdvd.h oxml.h ocode.h lsdvd.1


Index: lsdvd.spec
===================================================================
RCS file: /cvs/extras/rpms/lsdvd/devel/lsdvd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lsdvd.spec	29 Aug 2008 16:41:54 -0000	1.4
+++ lsdvd.spec	2 Sep 2008 09:35:02 -0000	1.5
@@ -1,13 +1,12 @@
 Summary: Small application for listing the contents of DVDs
 Name: lsdvd
 Version: 0.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://untrepid.com/lsdvd/
 Source: http://downloads.sf.net/lsdvd/lsdvd-%{version}.tar.gz
 Patch0: lsdvd-0.16-build.patch
-Patch1: lsdvd-0.16-libdvdread-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake
 BuildRequires: libdvdread-devel
@@ -19,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .build
-%patch1 -p1 -b .libdvdread-include
 %{__aclocal}
 %{__automake} --add-missing --copy --force --gnu --include-deps Makefile
 %{__autoconf}
@@ -47,8 +45,8 @@
 
 
 %changelog
-* Fri Aug 29 2008 Matthias Saou <http://freshrpms.net/> 0.16-8
-- Include patch for new s/dvdread/libdvdread/ include path.
+* Tue Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.16-9
+- Update build patch for new s/dvdread/libdvdread/ include path.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3


--- lsdvd-0.16-libdvdread-include.patch DELETED ---