Hello community, here is the log from the commit of package agg for openSUSE:Factory checked in at 2012-06-05 15:29:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/agg (Old) and /work/SRC/openSUSE:Factory/.agg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "agg", Maintainer is "adr...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/agg/agg.changes 2012-01-04 07:23:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.agg.new/agg.changes 2012-06-05 15:29:14.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 29 15:37:29 UTC 2012 - jeng...@inai.de + +- Update agg-automake-fix.diff and remove archaic constructs + from Makefile.am/configure.ac that inhibit working with + automake 1.12. +- Remove pointless (self-)Obsoletes/Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ agg.spec ++++++ --- /var/tmp/diff_new_pack.89KplK/_old 2012-06-05 15:29:15.000000000 +0200 +++ /var/tmp/diff_new_pack.89KplK/_new 2012-06-05 15:29:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package agg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: agg Version: 2.5 Release: 0 @@ -28,8 +29,6 @@ BuildRequires: libbz2-devel BuildRequires: libtool BuildRequires: xorg-x11-devel -Provides: agg = %{version} -Obsoletes: agg <= 2.5 %if 0 Source: agg-%{version}.tar.bz2 %else @@ -68,7 +67,7 @@ C++ interface. %prep -%setup -q -n agg-%{version} +%setup -q %patch0 %patch1 %patch2 -p0 ++++++ agg-2.5.dif ++++++ --- /var/tmp/diff_new_pack.89KplK/_old 2012-06-05 15:29:15.000000000 +0200 +++ /var/tmp/diff_new_pack.89KplK/_new 2012-06-05 15:29:16.000000000 +0200 @@ -1,11 +1,27 @@ +--- + Makefile.am | 1 + + configure.in | 10 +++++++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +Index: Makefile.am +=================================================================== +--- Makefile.am.orig ++++ Makefile.am +@@ -1,3 +1,4 @@ ++ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = src font_freetype font_win32_tt include examples + + pkgconfigdir = $(libdir)/pkgconfig +Index: configure.in +=================================================================== --- configure.in.orig +++ configure.in -@@ -1,11 +1,13 @@ - AC_INIT(src/agg_arc.cpp) # give me a source file, any source file... +@@ -2,11 +2,13 @@ AC_INIT([agg], [2.5.0]) + AC_CONFIG_SRCDIR([src/agg_arc.cpp]) # give me a source file, any source file... AC_CANONICAL_TARGET -+AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(include/config.h) - AM_INIT_AUTOMAKE(agg, 2.5.0) ++AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign]) dnl Checks for programs. @@ -14,14 +30,14 @@ +AC_USE_SYSTEM_EXTENSIONS AC_PROG_CXX AC_ISC_POSIX - AM_C_PROTOTYPES + if test "x$U" != "x"; then @@ -121,7 +123,13 @@ if test "$no_x" = "yes"; then AC_MSG_WARN([*** X11 not found! Omitting X11 layer.]) fi AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) +if test x"$x_includes" = x; then + x_includes="/usr/include" -+fi ++fi AC_SUBST(x_includes) +if test x"$x_libraries" = x; then + x_libraries="/usr/lib" @@ -29,10 +45,3 @@ AC_SUBST(x_libraries) dnl ############################################### ---- Makefile.am.orig -+++ Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = src font_freetype font_win32_tt include examples - - pkgconfigdir = $(libdir)/pkgconfig ++++++ agg-automake-fix.diff ++++++ --- /var/tmp/diff_new_pack.89KplK/_old 2012-06-05 15:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.89KplK/_new 2012-06-05 15:29:16.000000000 +0200 @@ -1,24 +1,50 @@ ---- configure.in -+++ configure.in 2007/09/04 15:25:47 -@@ -144,7 +144,6 @@ - AC_OUTPUT( - Makefile - libagg.pc -- gpc/Makefile - font_freetype/Makefile - font_win32_tt/Makefile - src/Makefile ---- Makefile.am -+++ Makefile.am 2007/09/04 15:25:31 +--- + Makefile.am | 3 ++- + configure.in | 7 +++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: Makefile.am +=================================================================== +--- Makefile.am.orig ++++ Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = gpc src font_freetype font_win32_tt include examples +SUBDIRS = src font_freetype font_win32_tt include examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libagg.pc -@@ -19,3 +19,5 @@ +@@ -19,3 +19,4 @@ EXTRA_DIST = Makefile.AmigaOS \ # M4 macro file for inclusion with autoconf m4datadir = $(datadir)/aclocal m4data_DATA = libagg.m4 + -+AUTOMAKE_OPTIONS = foreign +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -1,14 +1,14 @@ +-AC_INIT(src/agg_arc.cpp) # give me a source file, any source file... ++AC_INIT([agg], [2.5.0]) ++AC_CONFIG_SRCDIR([src/agg_arc.cpp]) # give me a source file, any source file... + AC_CANONICAL_TARGET + AC_CONFIG_HEADERS(include/config.h) +-AM_INIT_AUTOMAKE(agg, 2.5.0) ++AM_INIT_AUTOMAKE([foreign]) + + + dnl Checks for programs. + AC_PROG_CC + AC_PROG_CXX + AC_ISC_POSIX +-AM_C_PROTOTYPES + if test "x$U" != "x"; then + AC_MSG_ERROR(Compiler not ANSI compliant) + fi +@@ -144,7 +144,6 @@ AC_SUBST(PREFERED_PLATFORM) + AC_OUTPUT( + Makefile + libagg.pc +- gpc/Makefile + font_freetype/Makefile + font_win32_tt/Makefile + src/Makefile -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
