From 2b74698e5f9963f85b5deccec443fe488d8215b1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Sun, 24 Apr 2005 17:31:21 +0000
Subject: [PATCH] Updated to 0.73

---
 .cvsignore         |  2 +-
 libcdio-gcc4.patch | 57 ----------------------------------------------
 libcdio.spec       | 18 +++++++++------
 sources            |  2 +-
 4 files changed, 13 insertions(+), 66 deletions(-)
 delete mode 100644 libcdio-gcc4.patch

diff --git a/.cvsignore b/.cvsignore
index f96fa37..11e0336 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcdio-0.70.tar.gz
+libcdio-0.73.tar.gz
diff --git a/libcdio-gcc4.patch b/libcdio-gcc4.patch
deleted file mode 100644
index ec0a2f3..0000000
--- a/libcdio-gcc4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naru libcdio-0.70.orig/lib/cdio.c libcdio-0.70.new/lib/cdio.c
---- libcdio-0.70.orig/lib/cdio.c	2004-08-29 06:55:24.000000000 +0300
-+++ libcdio-0.70.new/lib/cdio.c	2005-03-18 15:48:40.000000000 +0200
-@@ -848,7 +848,7 @@
-   if (cdio == NULL) return -1;
-   
-   if (cdio->op.read)
--    return cdio->op.read (cdio->env, buf, size);
-+    return (cdio->op.read) (cdio->env, buf, size);
-   return -1;
- }
- 
-diff -Naru libcdio-0.70.orig/lib/_cdio_stream.c libcdio-0.70.new/lib/_cdio_stream.c
---- libcdio-0.70.orig/lib/_cdio_stream.c	2004-02-07 20:53:02.000000000 +0200
-+++ libcdio-0.70.new/lib/_cdio_stream.c	2005-03-18 15:46:44.000000000 +0200
-@@ -145,7 +145,7 @@
- 
-   if (!_cdio_stream_open_if_necessary(obj)) return 0;
- 
--  read_bytes = obj->op.read(obj->user_data, ptr, size*nmemb);
-+  read_bytes = (obj->op.read)(obj->user_data, ptr, size*nmemb);
-   obj->position += read_bytes;
- 
-   return read_bytes;
-diff -Naru libcdio-0.70.orig/src/cd-drive.c libcdio-0.70.new/src/cd-drive.c
---- libcdio-0.70.orig/src/cd-drive.c	2004-08-27 14:53:38.000000000 +0300
-+++ libcdio-0.70.new/src/cd-drive.c	2005-03-18 15:51:43.000000000 +0200
-@@ -140,7 +140,6 @@
- 
- /* CDIO logging routines */
- 
--static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
- 
- static void 
- _log_handler (cdio_log_level_t level, const char message[])
-diff -Naru libcdio-0.70.orig/src/cd-info.c libcdio-0.70.new/src/cd-info.c
---- libcdio-0.70.orig/src/cd-info.c	2004-09-02 04:33:57.000000000 +0300
-+++ libcdio-0.70.new/src/cd-info.c	2005-03-18 15:53:49.000000000 +0200
-@@ -371,7 +371,6 @@
- 
- /* CDIO logging routines */
- 
--static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
- #ifdef HAVE_CDDB
- static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
- #endif
-diff -Naru libcdio-0.70.orig/src/iso-info.c libcdio-0.70.new/src/iso-info.c
---- libcdio-0.70.orig/src/iso-info.c	2004-06-19 22:15:15.000000000 +0300
-+++ libcdio-0.70.new/src/iso-info.c	2005-03-18 15:55:57.000000000 +0200
-@@ -133,7 +133,6 @@
- 
- /* CDIO logging routines */
- 
--static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
- 
- static void 
- _log_handler (cdio_log_level_t level, const char message[])
diff --git a/libcdio.spec b/libcdio.spec
index 9cf85a0..c1ccf2f 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,13 +1,12 @@
 Name:           libcdio
-Version:        0.70
-Release:        2
+Version:        0.73
+Release:        1
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/libcdio/
-Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.70.tar.gz
-Patch0:         %{name}-gcc4.patch
+Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.73.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libcddb-devel >= 0.9.4
@@ -34,13 +33,11 @@ This package contains header files and static libraries for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
 %configure --disable-vcd-info --disable-dependency-tracking
-# Parallel build fails
-make
+make %{_smp_mflags}
 
 
 %install
@@ -50,6 +47,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+# I don't know what to do with jp manpages
+rm -rf $RPM_BUILD_ROOT%{_mandir}/jp
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +75,7 @@ fi
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_infodir}/*
+%{_mandir}/man1/*
 
 
 %files devel
@@ -86,6 +87,9 @@ fi
 
 
 %changelog
+* Sun Apr 24 2005 Adrian Reber <adrian@lisas.de> - 0.73-1
+- Updated to 0.73.
+
 * Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-2
 - Fix FC4 build (#151468).
 - Build with dependency tracking disabled.
diff --git a/sources b/sources
index 2db68b5..dee76a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df529a987127692031bd02633a6655eb  libcdio-0.70.tar.gz
+50eae24f732232c28d391a4dd563321f  libcdio-0.73.tar.gz