[packages/libcdio-paranoia] - updated to [10.2+]0.90+1 - removed obsolete headers patch - added am patch to build with automake

[qboosh]

commit 9a6b20874c7b26aa86b34a6c7e8ffa6f664ee422
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 20 21:54:31 2013 +0200

    - updated to [10.2+]0.90+1
    - removed obsolete headers patch
    - added am patch to build with automake 1.13+

 libcdio-paranoia-am.patch      | 11 +++++++++++
 libcdio-paranoia-headers.patch | 13 -------------
 libcdio-paranoia.spec          | 14 ++++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/libcdio-paranoia.spec b/libcdio-paranoia.spec
index 4f16450..b44440d 100644
--- a/libcdio-paranoia.spec
+++ b/libcdio-paranoia.spec
@@ -5,14 +5,16 @@
 Summary:	CD paranoia CD-DA libraries from libcdio
 Summary(pl.UTF-8):	Biblioteki paranoia CD-DA z libcdio
 Name:		libcdio-paranoia
-Version:	0.90
 %define	paranoia_ver	10.2
-Release:	2
+%define	libcdio_ver	0.90
+%define	subver		1
+Version:	%{libcdio_ver}_%{subver}
+Release:	1
 License:	LGPL v2.1 (library), GPL v2 (utility)
 Group:		Libraries
-Source0:	http://ftp.gnu.org/gnu/libcdio/%{name}-%{paranoia_ver}+%{version}.tar.gz
-# Source0-md5:	7175764764c7fa22e1b802b9526c9411
-Patch0:		%{name}-headers.patch
+Source0:	http://ftp.gnu.org/gnu/libcdio/%{name}-%{paranoia_ver}+%{libcdio_ver}+%{subver}.tar.bz2
+# Source0-md5:	e79e196864dd3b1ca87a01345abbda07
+Patch0:		%{name}-am.patch
 URL:		http://www.gnu.org/software/libcdio/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake >= 1:1.8.3
@@ -73,7 +75,7 @@ libcdio-paranoia utility: cd-paranoia.
 Narzędzie używające libcdio-paranoia: cd-paranoia.
 
 %prep
-%setup -q -n %{name}-%{paranoia_ver}+%{version}
+%setup -q -n %{name}-%{paranoia_ver}+%{libcdio_ver}+%{subver}
 %patch0 -p1
 
 %build
diff --git a/libcdio-paranoia-am.patch b/libcdio-paranoia-am.patch
new file mode 100644
index 0000000..10d3f85
--- /dev/null
+++ b/libcdio-paranoia-am.patch
@@ -0,0 +1,11 @@
+--- libcdio-paranoia-10.2+0.90+1/configure.ac.orig	2012-12-25 01:07:50.000000000 +0100
++++ libcdio-paranoia-10.2+0.90+1/configure.ac	2013-04-20 21:47:07.705641001 +0200
+@@ -29,7 +29,7 @@
+ AM_INIT_AUTOMAKE
+ 
+ AC_CANONICAL_HOST
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/libcdio-paranoia-headers.patch b/libcdio-paranoia-headers.patch
deleted file mode 100644
index 9bdde3b..0000000
--- a/libcdio-paranoia-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libcdio-paranoia-10.2+0.90/include/cdio/paranoia/Makefile.am.orig	2011-11-05 21:11:17.000000000 +0100
-+++ libcdio-paranoia-10.2+0.90/include/cdio/paranoia/Makefile.am	2012-12-06 18:56:26.095291751 +0100
-@@ -3,8 +3,8 @@
- ########################################################
- #
- 
--libcdioincludedir=$(includedir)/cdio
--dist_libcdioinclude_HEADERS = cdda.h paranoia.h 
-+cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
- 
- EXTRA_DIST = version.h.in
- BUILT_SOURCES = version.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcdio-paranoia.git/commitdiff/9a6b20874c7b26aa86b34a6c7e8ffa6f664ee422