From e3cd615f60ee2e57b54e267776eedf68b61e678b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sep 02 2008 09:35:02 +0000 Subject: Update existing patch instead of including new one. --- diff --git a/lsdvd-0.16-build.patch b/lsdvd-0.16-build.patch index 67a5a80..f2911c9 100644 --- a/lsdvd-0.16-build.patch +++ b/lsdvd-0.16-build.patch @@ -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 ++AC_MSG_CHECKING([for libdvdread/ifo_read.h]) +AC_TRY_COMPILE([#include , -+ #include ++ #include #include ], , 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 +#include - #include ++#include #include #include + #include 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 diff --git a/lsdvd-0.16-libdvdread-include.patch b/lsdvd-0.16-libdvdread-include.patch deleted file mode 100644 index 8ab525a..0000000 --- a/lsdvd-0.16-libdvdread-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naupr lsdvd-0.16.orig/configure lsdvd-0.16/configure ---- lsdvd-0.16.orig/configure 2005-12-12 21:22:45.000000000 +0100 -+++ lsdvd-0.16/configure 2008-08-29 13:06:31.000000000 +0200 -@@ -2887,7 +2887,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - #include - int - main () -diff -Naupr lsdvd-0.16.orig/configure.in lsdvd-0.16/configure.in ---- lsdvd-0.16.orig/configure.in 2008-08-29 13:06:02.000000000 +0200 -+++ lsdvd-0.16/configure.in 2008-08-29 13:06:37.000000000 +0200 -@@ -11,7 +11,7 @@ fi - AC_CHECK_LIB(dvdread, DVDOpen, , AC_MSG_ERROR([libdvdread not found!])) - AC_MSG_CHECKING([for dvdread/ifo_read.h]) - AC_TRY_COMPILE([#include , -- #include -+ #include - #include ], , - 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 2008-08-29 13:06:02.000000000 +0200 -+++ lsdvd-0.16/lsdvd.c 2008-08-29 13:06:50.000000000 +0200 -@@ -14,7 +14,7 @@ - * output info structures in form of a Perl module, by Henk Vergonet. - */ - #include --#include -+#include - #include - #include - #include diff --git a/lsdvd.spec b/lsdvd.spec index a48100e..594831b 100644 --- a/lsdvd.spec +++ b/lsdvd.spec @@ -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 @@ lsdvd is a small application which lists the contents of DVDs to your terminal. %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 @@ lsdvd is a small application which lists the contents of DVDs to your terminal. %changelog -* Fri Aug 29 2008 Matthias Saou 0.16-8 -- Include patch for new s/dvdread/libdvdread/ include path. +* Tue Sep 2 2008 Matthias Saou 0.16-9 +- Update build patch for new s/dvdread/libdvdread/ include path. * Tue Feb 19 2008 Fedora Release Engineering - Autorebuild for GCC 4.3