Hello community, here is the log from the commit of package libmpd for openSUSE:Factory checked in at 2014-11-11 01:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmpd (Old) and /work/SRC/openSUSE:Factory/.libmpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmpd" Changes: -------- --- /work/SRC/openSUSE:Factory/libmpd/libmpd.changes 2012-02-16 12:23:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmpd.new/libmpd.changes 2014-11-11 01:11:19.000000000 +0100 @@ -1,0 +2,20 @@ +Sat Nov 8 02:29:19 UTC 2014 - [email protected] + +- add baselibs.conf as source + +------------------------------------------------------------------- +Tue Oct 21 03:31:14 UTC 2014 - [email protected] + +- Correct previous SR that I accepted too fast..one should not + include config.h in public headers. fix the problem the right + way. + +------------------------------------------------------------------- +Mon Oct 20 22:57:59 UTC 2014 - [email protected] + +- Fix build error on openSUSE > 13.1: + * add libmpd-0.20.0_glibc-2.20.patch +- Fix unresolvable dependencies on SLES11: + * add BuildRequires: glib2-devel + +------------------------------------------------------------------- New: ---- libmpd-0.20.0_glibc-2.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmpd.spec ++++++ --- /var/tmp/diff_new_pack.pBGBIJ/_old 2014-11-11 01:11:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pBGBIJ/_new 2014-11-11 01:11:21.000000000 +0100 @@ -24,10 +24,18 @@ Group: System/Libraries Url: http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client Source: libmpd-0.20.0.tar.bz2 +Source1: baselibs.conf Patch0: libmpd-overflow.patch +#PATCH-FIX-UPSTREAM libmpd-0.20.0_glibc-2.20.patch [email protected] -- Fix build with glibc-2.20 +Patch1: libmpd-0.20.0_glibc-2.20.patch BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: libtool +%if 0%{?suse_version} == 1110 +BuildRequires: glib2-devel +%else BuildRequires: pkgconfig(glib-2.0) +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define libname libmpd1 @@ -58,8 +66,10 @@ %prep %setup -q %patch0 +%patch1 -p1 %build +autoreconf -fiv %configure --disable-static make %{?_smp_mflags} make doc ++++++ libmpd-0.20.0_glibc-2.20.patch ++++++ --- libmpd-0.20.0.orig/src/Makefile.am +++ libmpd-0.20.0/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +INCLUDES = -include $(top_builddir)/config.h \ -I. \ -I$(top_srcdir) \ @EXTRA_CFLAGS@ -Wall -Wmissing-declarations @@ -36,5 +36,5 @@ EXTRA_DIST = \ libmpd-version.h.in libmpd_la_LIBADD = -libmpd_la_LDFLAGS = @EXTRA_LDFLAGS@ -version-info @LIBMPD_LIBTOOL_VERSION@ +libmpd_la_LDFLAGS = @EXTRA_LDFLAGS@ -no-undefined -version-info @LIBMPD_LIBTOOL_VERSION@ libmpdincludedir= $(includedir)/libmpd-1.0/libmpd/ --- libmpd-0.20.0.orig/configure.ac +++ libmpd-0.20.0/configure.ac @@ -23,7 +23,9 @@ AC_SUBST([LIBMPD_MICRO_VERSION]) LIBMPD_LIBTOOL_VERSION=3:0:2 AC_SUBST(LIBMPD_LIBTOOL_VERSION) -AC_PROG_CC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +AC_PROG_CC_STDC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL --- libmpd-0.20.0.orig/src/libmpd-player.c +++ libmpd-0.20.0/src/libmpd-player.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#define __USE_GNU #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/src/libmpd-database.c +++ libmpd-0.20.0/src/libmpd-database.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#define __USE_GNU #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/src/libmpd-playlist.c +++ libmpd-0.20.0/src/libmpd-playlist.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#define __USE_GNU #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/src/libmpd-status.c +++ libmpd-0.20.0/src/libmpd-status.c @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> -#define __USE_GNU #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/src/libmpd-sticker.c +++ libmpd-0.20.0/src/libmpd-sticker.c @@ -1,6 +1,5 @@ #include <stdio.h> #include <stdlib.h> -#define __USE_GNU #include <glib.h> #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/src/libmpd.c +++ libmpd-0.20.0/src/libmpd.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#define __USE_GNU #include <string.h> #include <stdarg.h> --- libmpd-0.20.0.orig/example/testcase/testcase.c +++ libmpd-0.20.0/example/testcase/testcase.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
