[packages/libcdio] - added version-fix patch (fix libcdio version detection in external packages) - release 2

[qboosh]

commit 3ff3190da3475a251478e77e08bd9208f99cd706
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 9 19:12:10 2017 +0100

    - added version-fix patch (fix libcdio version detection in external packages)
    - release 2

 libcdio-version-fix.patch | 31 +++++++++++++++++++++++++++++++
 libcdio.spec              |  5 ++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/libcdio.spec b/libcdio.spec
index 4147580..da9f6d5 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -14,7 +14,7 @@ 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:	1.0.0
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2
@@ -22,6 +22,8 @@ Source0:	http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-info.patch
 # http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=4305bc1e093e4341aeddb857bd1e6203228000cb
 Patch1:		%{name}-cddb-fix.patch
+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4 (adapted)
+Patch2:		%{name}-version-fix.patch
 URL:		http://www.gnu.org/software/libcdio/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.8.3
@@ -147,6 +149,7 @@ Narzędzia używające libcdio: cd-info, cd-read.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i 's, example$,,' Makefile.am
 
diff --git a/libcdio-version-fix.patch b/libcdio-version-fix.patch
new file mode 100644
index 0000000..11be98f
--- /dev/null
+++ b/libcdio-version-fix.patch
@@ -0,0 +1,31 @@
+From 2d22ae18571caf29460a456340ff0603f04af6b4 Mon Sep 17 00:00:00 2001
+From: "R. Bernstein" <rocky at gnu.org>
+Date: Thu, 23 Nov 2017 18:26:07 -0500
+Subject: Set LIBCDIO_VERSION in a more consistent way
+
+we'll use the convention
+x.y.zjunk => x*10000 + y*100 + z
+
+Savannah bug #52491
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 51beb59..5dd57c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,9 @@ AC_CONFIG_MACRO_DIR([m4])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+          [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+ 
+-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++# FIXME: write a m4 macro to conver x.y.zjunk to x*10000 + y*100 + z
++# LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++LIBCDIO_VERSION_NUM=10000
+ AC_SUBST(LIBCDIO_VERSION_NUM)
+ 
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+-- 
+cgit v1.0-41-gc330
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcdio.git/commitdiff/3ff3190da3475a251478e77e08bd9208f99cd706