Hello community, here is the log from the commit of package id3lib for openSUSE:Factory checked in at 2013-03-03 21:06:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/id3lib (Old) and /work/SRC/openSUSE:Factory/.id3lib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "id3lib", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/id3lib/id3lib.changes 2012-09-25 10:20:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.id3lib.new/id3lib.changes 2013-03-03 21:06:40.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 28 17:58:39 UTC 2013 - [email protected] + +- extend id3lib-3.8.3-autoconf.patch : + * AM_CONFIG_HEADER is gone, fixes build with new automake + * Do not use bundled zlib, ensure we never pick it and always + use system version. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ id3lib.spec ++++++ --- /var/tmp/diff_new_pack.X2mQda/_old 2013-03-03 21:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.X2mQda/_new 2013-03-03 21:06:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package id3lib # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: id3lib -BuildRequires: dos2unix doxygen fdupes gcc-c++ libstdc++-devel zlib-devel +BuildRequires: dos2unix +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel BuildRequires: libtool -License: LGPL-2.1+ -Group: System/Libraries -Group: System/Libraries -AutoReqProv: on +BuildRequires: zlib-devel Version: 3.8.3 -Release: 247 +Release: 0 Source0: %{name}-%{version}.tar.bz2 Patch1: id3lib-%{version}-autoconf.patch Patch2: id3lib-%{version}-cleanup.patch @@ -44,6 +43,8 @@ Url: http://id3lib.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Library for Manipulating ID3v1 and ID3v2 tags +License: LGPL-2.1+ +Group: System/Libraries %description This package provides a software library for manipulating ID3v1 and @@ -63,10 +64,10 @@ Dirk Mahoney <[email protected]> %package devel -License: LGPL-2.1+ Summary: Documentation and Headers for id3lib Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} libstdc++-devel +Requires: %{name} = %{version} +Requires: libstdc++-devel %description devel This package contains the headers and documentation for the id3lib API @@ -82,7 +83,6 @@ Dirk Mahoney <[email protected]> %package examples -License: LGPL-2.1+ Summary: Example Applications for the id3lib Library Group: Development/Libraries/C and C++ Requires: %{name} = %{version} ++++++ id3lib-3.8.3-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.X2mQda/_old 2013-03-03 21:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.X2mQda/_new 2013-03-03 21:06:42.000000000 +0100 @@ -1,4 +1,4 @@ ---- Makefile.am +--- Makefile.am.orig +++ Makefile.am @@ -11,6 +11,7 @@ @@ -8,7 +8,19 @@ EXTRA_DIST = \ HISTORY \ ---- configure.in +@@ -21,11 +22,6 @@ EXTRA_DIST = \ + reconf \ + makefile.win32 \ + makewin32.bat +-if ID3_NEEDZLIB +-zlib_subdir = zlib +-else +-zlib_subdir = +-endif + + SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples + DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj +--- configure.in.orig +++ configure.in @@ -11,14 +11,82 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the @@ -95,17 +107,31 @@ dnl The following has been adapted from glib (http://www.gtk.org) dnl dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they -@@ -89,9 +157,6 @@ +@@ -83,14 +151,10 @@ ID3LIB_FULLNAME=$ID3LIB_NAME-$ID3LIB_VER - AC_ISC_POSIX + AC_SUBST(ID3LIB_FULLNAME) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AM_INIT_AUTOMAKE($PACKAGE,$VERSION) + +-AC_ISC_POSIX +- -dnl Initialize libtool -AM_PROG_LIBTOOL -- + dnl Initialize maintainer mode AM_MAINTAINER_MODE +@@ -114,19 +178,24 @@ dnl + AC_SUBST(ID3LIB_DEBUG_FLAGS) -@@ -119,11 +184,15 @@ + dnl Checks for programs +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_CXX AC_PROG_CXXCPP AC_PROG_INSTALL @@ -116,13 +142,17 @@ dnl for executable extensions AC_EXEEXT - dnl Checks for libraries. +-dnl Checks for libraries. -AC_CHECK_LIB(z,uncompress,AC_DEFINE_UNQUOTED(HAVE_ZLIB))#,, -+AC_CHECK_LIB(z,uncompress,AC_DEFINE_UNQUOTED(HAVE_ZLIB,1,[Define if you have zlib]))#,, ++AC_SEARCH_LIBS([uncompress],[z], [AC_DEFINE_UNQUOTED(HAVE_ZLIB,1,[Define if you have zlib])]) # AC_MSG_ERROR([id3lib requires zlib to process compressed frames])) - AM_CONDITIONAL(ID3_NEEDZLIB, test x$ac_cv_lib_z_uncompress = xno) -@@ -161,14 +230,23 @@ +-AM_CONDITIONAL(ID3_NEEDZLIB, test x$ac_cv_lib_z_uncompress = xno) ++AM_CONDITIONAL(ID3_NEEDZLIB, 0) + AM_CONDITIONAL(ID3_NEEDDEBUG, test x$enable_debug = xyes) + + dnl Checks for header files. +@@ -161,14 +230,23 @@ if test $has_iconv = 1; then fi #we have iconv at this moment, better check which call to use AC_MSG_CHECKING(whether iconv takes const char ** or char **) @@ -151,7 +181,7 @@ #we'll check out the need of #typecast in the call of iconv_open AC_MSG_CHECKING(whether to typecast in iconv) -@@ -184,7 +262,7 @@ +@@ -184,7 +262,7 @@ if test $has_iconv = 1; then iconv_cast=0, iconv_cast=1) if test $iconv_cast = 1; then AC_MSG_RESULT(yes) @@ -160,7 +190,7 @@ else AC_MSG_RESULT(no) fi -@@ -206,7 +284,7 @@ +@@ -206,7 +284,7 @@ if test $has_iconv = 1; then iconv_cast=0, iconv_cast=1) if test $iconv_cast = 1; then AC_MSG_RESULT(yes) @@ -169,7 +199,7 @@ else AC_MSG_RESULT(no) fi -@@ -286,15 +364,15 @@ +@@ -286,21 +364,16 @@ dnl #undef _ID3_COMPILED_WITH_DEBUGGING dnl /* */ dnl END ACCONFIG @@ -182,6 +212,12 @@ -AC_DEFINE_UNQUOTED(_ID3LIB_INTERFACE_AGE, $ID3LIB_INTERFACE_AGE) -AC_DEFINE_UNQUOTED(_ID3LIB_BINARY_AGE, $ID3LIB_BINARY_AGE) -AC_DEFINE_UNQUOTED(_ID3_COMPILED_WITH_DEBUGGING, "${enable_debug}") +- +-CONDITIONAL_SUBDIRS= +-if test "x$ac_cv_lib_z_uncompress" = "xno"; then +- CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" +-fi +-AC_CONFIG_SUBDIRS(zlib) +AC_DEFINE_UNQUOTED(_ID3LIB_NAME, "$ID3LIB_NAME", [id3lib name]) +AC_DEFINE_UNQUOTED(_ID3LIB_VERSION, "$ID3LIB_VERSION", [id3lib version]) +AC_DEFINE_UNQUOTED(_ID3LIB_FULLNAME, "$ID3LIB_FULLNAME", [full name of id3lib]) @@ -191,12 +227,13 @@ +AC_DEFINE_UNQUOTED(_ID3LIB_INTERFACE_AGE, $ID3LIB_INTERFACE_AGE, [id3lib interface age]) +AC_DEFINE_UNQUOTED(_ID3LIB_BINARY_AGE, $ID3LIB_BINARY_AGE, [id3lib binary age]) +AC_DEFINE_UNQUOTED(_ID3_COMPILED_WITH_DEBUGGING, "${enable_debug}", [Define if compiled with debugging]) ++ + + CFLAGS="$CFLAGS -Wall" - CONDITIONAL_SUBDIRS= - if test "x$ac_cv_lib_z_uncompress" = "xno"; then ---- m4/id3_cxx.m4 +--- m4/id3_cxx.m4.orig +++ m4/id3_cxx.m4 -@@ -84,18 +84,18 @@ +@@ -84,18 +84,18 @@ AC_DEFUN(ID3_CXX_PORTABILITY,[ AC_TRY_RUN([main() { bool b1=true; bool b2=false; }], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) @@ -218,9 +255,9 @@ dnl Done with the portability checks AC_LANG_RESTORE ---- m4/id3_debug.m4 +--- m4/id3_debug.m4.orig +++ m4/id3_debug.m4 -@@ -3,11 +3,11 @@ +@@ -3,11 +3,11 @@ AC_DEFUN([ID3_DEBUG],[ if test "x$enable_debug" = "xyes"; then test "$cflags_set" = set || CFLAGS="$CFLAGS -g" @@ -235,9 +272,9 @@ fi fi ]) ---- m4/id3_unicode.m4 +--- m4/id3_unicode.m4.orig +++ m4/id3_unicode.m4 -@@ -9,10 +9,10 @@ +@@ -9,10 +9,10 @@ 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> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
