- updated to 1.0.0 (note: new libcdio soname)

- added cddb-fix patch (fix cdda-player build with cddb support)

diff --git a/libcdio-cddb-fix.patch b/libcdio-cddb-fix.patch
new file mode 100644 (file)
index 0000000..b3781d2
--- /dev/null
+++ b/libcdio-cddb-fix.patch
@@ -0,0 +1,37 @@
+From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
+From: "R. Bernstein" <rocky@gnu.org>
+Date: Sat, 25 Nov 2017 14:03:37 -0500
+Subject: Fix breakage caused by unshadowing i_first_track
+
+Reported and patch by KO Myung-Hun
+---
+ src/cdda-player.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cdda-player.c b/src/cdda-player.c
+index efeee19..333e1f5 100644
+--- a/src/cdda-player.c
++++ b/src/cdda-player.c
+@@ -531,8 +531,8 @@ static void
+ get_cddb_disc_info(CdIo_t *p_cdio)
+ {
+ #ifdef HAVE_CDDB
+-  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
+-                   i_tracks, &i_cddb_matches);
++  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
++                   i_tracks_global, &i_cddb_matches);
+   if (b_db) {
+     int i_year;
+     i_year = atoi(year);
+@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
+ {
+ #ifdef HAVE_CDDB
+   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
+-                                        i_track - i_first_track);
++                                        i_track - i_first_track_global);
+   if (t) {
+     cddb_track_set_title(t, title);
+     cddb_track_set_artist(t, artist);
+-- 
+cgit v1.0-41-gc330
+

diff --git a/libcdio.spec b/libcdio.spec
index 2286232ef12270407dfc8619ff688e350f6c9aad..414758082291bcc2ae351e75f83adf851ecdbc21 100644 (file)
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -13,13 +13,15 @@
 Summary:       GNU Compact Disc Input, Output and Control Library
 Summary(pl.UTF-8):     Biblioteka GNU do obsługi wejścia, wyjścia i sterowania czytnikiem CD
 Name:          libcdio
-Version:       0.94
+Version:       1.0.0
 Release:       1
 License:       GPL v3+
 Group:         Libraries
-Source0:       http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.gz
-# Source0-md5: d8734266a20fbc2605a97b701b838ab6
+Source0:       http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2
+# Source0-md5: 9f66508a03f58ddddba4104e378cd54c
 Patch0:                %{name}-info.patch
+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=4305bc1e093e4341aeddb857bd1e6203228000cb
+Patch1:                %{name}-cddb-fix.patch
 URL:           http://www.gnu.org/software/libcdio/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.8.3
@@ -144,15 +146,13 @@ Narzędzia używające libcdio: cd-info, cd-read.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i 's, example$,,' Makefile.am
 
-# bug: *.pc for C++ bindings, not programs
-%{__sed} -i 's,ENABLE_CPP,ENABLE_CXX_BINDINGS,' Makefile.am
-
+%build
 cp -f /usr/share/gettext/config.rpath .
 
-%build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -198,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_libdir}/libcdio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcdio.so.16
+%attr(755,root,root) %ghost %{_libdir}/libcdio.so.17
 %attr(755,root,root) %{_libdir}/libiso9660.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libiso9660.so.10
 %attr(755,root,root) %{_libdir}/libudf.so.*.*.*