Attachment 871402 Details for Bug 925576 – drop libtool-autofoo gunk, use autoreconf

[patch] drop libtool-autofoo gunk, use autoreconf

0001-Use-autoreconf-patch-from-mingw-id3lib.patch (text/plain), 7.72 KB, created by David King on 2014-03-06 12:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-03-06 12:39:13 UTC

Size: 7.72 KB

patch

obsolete

>From 6ec73b56316c05c030608131063f32c7cb45a7d7 Mon Sep 17 00:00:00 2001
>From: David King <amigadave@amigadave.com>
>Date: Thu, 6 Mar 2014 12:05:08 +0000
>Subject: [PATCH] Use autoreconf patch from mingw-id3lib
>
>---
> id3lib-3.8.3-autoreconf.patch | 155 ++++++++++++++++++++++++++++++++++++++++++
> id3lib.spec                   |  11 ++-
> sources                       |   1 -
> 3 files changed, 163 insertions(+), 4 deletions(-)
> create mode 100644 id3lib-3.8.3-autoreconf.patch
>
>diff --git a/id3lib-3.8.3-autoreconf.patch b/id3lib-3.8.3-autoreconf.patch
>new file mode 100644
>index 0000000..0f0e042
>--- /dev/null
>+++ b/id3lib-3.8.3-autoreconf.patch
>@@ -0,0 +1,155 @@
>+Patch by FrantiÅ¡ek DvoÅÃ¡k
>+
>+https://bugzilla.redhat.com/show_bug.cgi?id=1066559
>+
>+diff -urN id3lib-3.8.3.old/configure.in id3lib-3.8.3/configure.in
>+--- id3lib-3.8.3.old/configure.in	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/configure.in	2014-02-24 21:46:57.974108875 +0000
>+@@ -15,7 +15,9 @@
>+ AC_PREREQ(2.13)
>+ 
>+ # init autoconf (and check for presence fo reconf)
>+-AC_INIT(reconf)
>++AC_INIT([id3lib], [3.8.3])
>++AC_CONFIG_SRCDIR([reconf])
>++AC_CONFIG_MACRO_DIR([m4])
>+ 
>+ ID3LIB_NAME=id3lib
>+ 
>+@@ -83,14 +85,14 @@
>+ 
>+ AC_SUBST(ID3LIB_FULLNAME)
>+ 
>+-AM_CONFIG_HEADER(config.h)
>++AC_CONFIG_HEADERS(config.h)
>+ 
>+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
>++AM_INIT_AUTOMAKE
>+ 
>+ AC_ISC_POSIX
>+ 
>+ dnl Initialize libtool
>+-AM_PROG_LIBTOOL
>++LT_INIT
>+ 
>+ dnl Initialize maintainer mode
>+ AM_MAINTAINER_MODE
>+@@ -168,7 +170,7 @@
>+ 		iconv_oldstyle=1, iconv_oldstyle=0)
>+   if test $iconv_oldstyle = 1; then
>+     AC_MSG_RESULT(const char **)
>+-    AC_DEFINE(ID3LIB_ICONV_OLDSTYLE)
>++    AC_DEFINE(ID3LIB_ICONV_OLDSTYLE, [], [Old-style iconv interface])
>+     #we'll check out the need of
>+     #typecast in the call of iconv_open
>+     AC_MSG_CHECKING(whether to typecast in iconv)
>+@@ -184,7 +186,7 @@
>+                    iconv_cast=0, iconv_cast=1)
>+     if test $iconv_cast = 1; then
>+       AC_MSG_RESULT(yes)
>+-      AC_DEFINE(ID3LIB_ICONV_CAST_OK)
>++      AC_DEFINE(ID3LIB_ICONV_CAST_OK, [], [iconv type cast])
>+     else
>+       AC_MSG_RESULT(no)
>+     fi
>+@@ -206,7 +208,7 @@
>+                    iconv_cast=0, iconv_cast=1)
>+     if test $iconv_cast = 1; then
>+       AC_MSG_RESULT(yes)
>+-      AC_DEFINE(ID3LIB_ICONV_CAST_OK)
>++      AC_DEFINE(ID3LIB_ICONV_CAST_OK, [], [iconv type cast])
>+     else
>+       AC_MSG_RESULT(no)
>+     fi
>+diff -urN id3lib-3.8.3.old/examples/Makefile.am id3lib-3.8.3/examples/Makefile.am
>+--- id3lib-3.8.3.old/examples/Makefile.am	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/examples/Makefile.am	2014-02-24 21:21:51.645554552 +0000
>+@@ -30,7 +30,7 @@
>+ 
>+ LDADD =  $(top_builddir)/src/libid3.la $(zlib_lib) $(ID3_DEBUG_LIBS) $(getopt_lib)
>+ 
>+-INCLUDES = @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include
>++AM_CPPFLAGS = @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include
>+ 
>+ bin_PROGRAMS            = id3info id3convert id3tag id3cp
>+ check_PROGRAMS          = \
>+diff -urN id3lib-3.8.3.old/m4/id3_cxx.m4 id3lib-3.8.3/m4/id3_cxx.m4
>+--- id3lib-3.8.3.old/m4/id3_cxx.m4	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/m4/id3_cxx.m4	2014-02-24 21:21:51.650554401 +0000
>+@@ -68,7 +68,7 @@
>+ dnl #undef CXX_HAS_NO_BOOL
>+ dnl END ACCONFIG
>+ 
>+-AC_DEFUN(ID3_CXX_PORTABILITY,[
>++AC_DEFUN([ID3_CXX_PORTABILITY],[
>+ 
>+   AC_PROVIDE([$0])
>+ 
>+diff -urN id3lib-3.8.3.old/m4/id3_unicode.m4 id3lib-3.8.3/m4/id3_unicode.m4
>+--- id3lib-3.8.3.old/m4/id3_unicode.m4	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/m4/id3_unicode.m4	2014-02-24 21:21:51.654554280 +0000
>+@@ -5,7 +5,7 @@
>+ dnl #undef ID3_ICONV_FORMAT_ASCII
>+ dnl END ACCONFIG
>+ 
>+-AC_DEFUN(ID3_CHECK_ICONV_FORMAT,[
>++AC_DEFUN([ID3_CHECK_ICONV_FORMAT],[
>+   if eval "test \"x\$$1\" = \"xno\""; then
>+     AC_MSG_CHECKING(whether iconv supports $2)
>+     AC_TRY_RUN([#include <iconv.h>
>+diff -urN id3lib-3.8.3.old/Makefile.am id3lib-3.8.3/Makefile.am
>+--- id3lib-3.8.3.old/Makefile.am	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/Makefile.am	2014-02-24 21:21:51.659554129 +0000
>+@@ -11,6 +11,7 @@
>+ 
>+ # require automake 1.5
>+ AUTOMAKE_OPTIONS = 1.5
>++ACLOCAL_AMFLAGS = -I m4
>+ 
>+ EXTRA_DIST =                    \
>+         HISTORY                 \
>+@@ -30,7 +31,7 @@
>+ SUBDIRS =  . m4 $(zlib_subdir) doc include id3com src examples
>+ DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
>+ 
>+-INCLUDES = @ID3LIB_DEBUG_FLAGS@
>++AM_CPPFLAGS = @ID3LIB_DEBUG_FLAGS@
>+ 
>+ config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in 
>+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
>+diff -urN id3lib-3.8.3.old/src/Makefile.am id3lib-3.8.3/src/Makefile.am
>+--- id3lib-3.8.3.old/src/Makefile.am	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/src/Makefile.am	2014-02-24 21:21:51.664553979 +0000
>+@@ -17,7 +17,7 @@
>+ zlib_include = 
>+ endif
>+ 
>+-INCLUDES = \
>++AM_CPPFLAGS = \
>+   @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include/id3 -I$(top_srcdir)/include $(zlib_include)
>+ 
>+ noinst_HEADERS =                \
>+diff -urN id3lib-3.8.3.old/zlib/configure.in id3lib-3.8.3/zlib/configure.in
>+--- id3lib-3.8.3.old/zlib/configure.in	2003-03-02 00:23:00.000000000 +0000
>++++ id3lib-3.8.3/zlib/configure.in	2014-02-24 21:49:18.990854419 +0000
>+@@ -14,16 +14,13 @@
>+ AC_PREREQ(2.13)
>+ 
>+ # init autoconf (and check for presence of reconf)
>+-AC_INIT(reconf)
>++AC_INIT([zlib], [1.1.3])
>+ 
>+-VERSION=1.1.3
>+-PACKAGE=zlib
>+-
>+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
>+-AM_CONFIG_HEADER(config.h)
>++AM_INIT_AUTOMAKE
>++AC_CONFIG_HEADERS(config.h)
>+ 
>+ dnl Initialize libtool
>+-AC_PROG_LIBTOOL
>++LT_INIT
>+ 
>+ dnl Initialize maintainer mode
>+ AM_MAINTAINER_MODE
>diff --git a/id3lib.spec b/id3lib.spec
>index f91b68e..6233327 100644
>--- a/id3lib.spec
>+++ b/id3lib.spec
>@@ -1,19 +1,20 @@
> Summary:        Library for manipulating ID3v1 and ID3v2 tags
> Name:           id3lib
> Version:        3.8.3
>-Release:        31%{?dist}
>+Release:        32%{?dist}
> License:        LGPLv2+
> Group:          System Environment/Libraries
> URL:            http://id3lib.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/id3lib/%{name}-%{version}.tar.gz
> Source1:        id3lib-no_date_footer.hml
> Patch0:         id3lib-dox.patch
>-Patch1:         id3lib-3.8.3-libtool-autofoo.patch.bz2
>+Patch1:         id3lib-3.8.3-autoreconf.patch
> Patch2:         id3lib-3.8.3-io_helpers-163101.patch
> Patch3:         id3lib-3.8.3-mkstemp.patch
> Patch4:         id3lib-3.8.3-includes.patch
> Patch5:         http://launchpadlibrarian.net/33114077/id3lib-vbr_buffer_overflow.diff
> Patch6:         http://anonscm.debian.org/viewvc/collab-maint/deb-maint/id3lib/trunk/debian/patches/20-create-manpages.patch
>+BuildRequires:  autoconf automake libtool
> BuildRequires:  zlib-devel doxygen
> 
> %description
>@@ -39,7 +40,7 @@ This package provides files needed to develop with the id3lib library.
> %prep
> %setup -q
> %patch0 -p0
>-%patch1 -p1 -b .libtool-autofoo
>+%patch1 -p1 -b .autoreconf
> %patch2 -p1 -b .io_helpers-163101
> %patch3 -p1 -b .mkstemp
> %patch4 -p1 -b .gcc43
>@@ -55,6 +56,7 @@ cp %{SOURCE1} doc
> 
> 
> %build
>+autoreconf --force --install
> %configure --disable-dependency-tracking --disable-static
> make %{?_smp_mflags} libid3_la_LIBADD=-lz
> 
>@@ -93,6 +95,9 @@ install -m 644 doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
> 
> 
> %changelog
>+* Thu Mar 06 2014 David King <amigadave@amigadave.com> - 3.8.3-32
>+- Use autoreconf patch from mingw-id3lib package
>+
> * Wed Aug 07 2013 Adrian Reber <adrian@lisas.de> - 3.8.3-31
> - Fixed "id3lib possibly affected by F-20 unversioned docdir change" (#993851)
> - Remove unneeded parts (clean, defattr, buildroot) 
>diff --git a/sources b/sources
>index 44f3d8e..3841a6b 100644
>--- a/sources
>+++ b/sources
>@@ -1,2 +1 @@
> 19f27ddd2dda4b2d26a559a4f0f402a7  id3lib-3.8.3.tar.gz
>-ce106e4386e4fbc0d49aea9fbd14eb4b  id3lib-3.8.3-libtool-autofoo.patch.bz2
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 925576: 871402