Hello community, here is the log from the commit of package splashy for openSUSE:Factory checked in at 2013-03-05 11:12:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/splashy (Old) and /work/SRC/openSUSE:Factory/.splashy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "splashy", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/splashy/splashy.changes 2013-01-03 14:22:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.splashy.new/splashy.changes 2013-03-05 11:12:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 5 08:15:45 UTC 2013 - [email protected] + +- fix build with new automake 1.13, simplify automake-1.12.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ --- /var/tmp/diff_new_pack.s4UYPD/_old 2013-03-05 11:12:14.000000000 +0100 +++ /var/tmp/diff_new_pack.s4UYPD/_new 2013-03-05 11:12:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package splashy # -# Copyright (c) 2012 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 @@ -211,6 +211,8 @@ find . -type f | xargs perl -pi -e "s|/lib/|/%{_lib}/|g" # build gets confused on x86_64 because of this .la file rm -f src/libglib-2.0.la +# automake-1.13 deprecated this macro +sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac %build NOCONFIGURE=1 ./autogen.sh ++++++ automake-1.12.patch ++++++ --- /var/tmp/diff_new_pack.s4UYPD/_old 2013-03-05 11:12:14.000000000 +0100 +++ /var/tmp/diff_new_pack.s4UYPD/_new 2013-03-05 11:12:14.000000000 +0100 @@ -1,26 +1,24 @@ +Changed by Stefan Seyfried <[email protected]> 2013-03-05 + +Just effectively skip the automake version check. We have new enough +automake in all dstributions. The default of REQUIRED_AUTOMAKE_VERSION +is 1.9 further up in the script. + Index: splashy-0.3.13/autogen.sh =================================================================== --- splashy-0.3.13.orig/autogen.sh +++ splashy-0.3.13/autogen.sh -@@ -261,13 +261,14 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoc - - case $REQUIRED_AUTOMAKE_VERSION in +@@ -263,11 +263,12 @@ case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; -- 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; -- 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; -- 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; -- 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; - 1.9*) automake_progs="automake-1.9 automake-1.10 automake-1.11" ;; -- 1.10*) automake_progs="automake-1.10 automake-1.11" ;; -- 1.11*) automake_progs="automake-1.11" ;; -+ 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.9*) automake_progs="automake-1.9 automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.10*) automake_progs="automake-1.10 automake-1.11 automake-1.12" ;; -+ 1.11*) automake_progs="automake-1.11 automake-1.12" ;; -+ 1.12*) automake_progs="automake-1.12" ;; ++ # the default set above is 1.9, so just add generic automake since we dont have older stuff anyway ++ 1.9*) automake_progs="automake-1.9 automake-1.10 automake-1.11 automake" ;; + 1.10*) automake_progs="automake-1.10 automake-1.11" ;; + 1.11*) automake_progs="automake-1.11" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"; || DIE=1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
