Hello community, here is the log from the commit of package seed for openSUSE:Factory checked in at 2012-01-09 15:21:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seed (Old) and /work/SRC/openSUSE:Factory/.seed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seed", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/seed/seed.changes 2011-10-05 17:47:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.seed.new/seed.changes 2012-01-09 15:21:29.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 28 19:31:59 UTC 2011 - [email protected] + +- Add seed-webkit-1.0-detection.patch: Fix libwebkit detection. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + +------------------------------------------------------------------- seed2.changes: same change New: ---- seed-webkit-1.0-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seed.spec ++++++ --- /var/tmp/diff_new_pack.aZAdEu/_old 2012-01-09 15:21:30.000000000 +0100 +++ /var/tmp/diff_new_pack.aZAdEu/_new 2012-01-09 15:21:30.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define build_for_gtk3 1 %if %{build_for_gtk3} @@ -31,15 +30,19 @@ Name: seed %define _name seed -License: LGPLv2+ -Group: Development/Libraries/GNOME Version: 3.2.0 -Release: 1 +Release: 0 Summary: JavaScript bindings based on gobject-introspection and WebKit +License: LGPL-2.1+ +Group: Development/Libraries/GNOME Url: http://live.gnome.org/Seed Source: http://download.gnome.org/sources/seed/3.2/%{_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM seed-webkit-1.0-detection.patch bgo#653077 [email protected] -- Fix libwebkit detection. +Patch0: seed-webkit-1.0-detection.patch BuildRequires: cairo-devel BuildRequires: dbus-1-glib-devel +# Needed by patch0 +BuildRequires: gnome-common BuildRequires: gnome-js-common BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -67,9 +70,7 @@ %if %{build_for_gtk3} %package doc -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Requires: %{name} = %{version} %description doc @@ -81,9 +82,7 @@ %endif %package -n libseed%{?_pkgsoname_suffix}0 -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Recommends: gnome-js-common %if ! %{build_for_gtk3} Provides: libseed-0 = %{version} @@ -98,9 +97,7 @@ embed JavaScript as a scripting language in your GObject library. %package -n libseed%{?_gtk_suffix}-devel -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Requires: libseed%{?_pkgsoname_suffix}0 = %{version} # Just a helper provides Provides: seed-devel @@ -117,8 +114,11 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build +# Needed by patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --with-webkit=%{_webkitver} \ ++++++ seed2.spec ++++++ --- /var/tmp/diff_new_pack.aZAdEu/_old 2012-01-09 15:21:30.000000000 +0100 +++ /var/tmp/diff_new_pack.aZAdEu/_new 2012-01-09 15:21:30.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define build_for_gtk3 0 %if %{build_for_gtk3} @@ -31,15 +30,19 @@ Name: seed2 %define _name seed -License: LGPLv2+ -Group: Development/Libraries/GNOME Version: 3.2.0 -Release: 1 +Release: 0 Summary: JavaScript bindings based on gobject-introspection and WebKit +License: LGPL-2.1+ +Group: Development/Libraries/GNOME Url: http://live.gnome.org/Seed Source: http://download.gnome.org/sources/seed/3.2/%{_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM seed-webkit-1.0-detection.patch bgo#653077 [email protected] -- Fix libwebkit detection. +Patch0: seed-webkit-1.0-detection.patch BuildRequires: cairo-devel BuildRequires: dbus-1-glib-devel +# Needed by patch0 +BuildRequires: gnome-common BuildRequires: gnome-js-common BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -67,9 +70,7 @@ %if %{build_for_gtk3} %package doc -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Requires: %{name} = %{version} %description doc @@ -81,9 +82,7 @@ %endif %package -n libseed%{?_pkgsoname_suffix}0 -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Recommends: gnome-js-common %if ! %{build_for_gtk3} Provides: libseed-0 = %{version} @@ -98,9 +97,7 @@ embed JavaScript as a scripting language in your GObject library. %package -n libseed%{?_gtk_suffix}-devel -License: LGPLv2+ Summary: JavaScript bindings based on gobject-introspection and WebKit -Group: Development/Libraries/GNOME Requires: libseed%{?_pkgsoname_suffix}0 = %{version} # Just a helper provides Provides: seed-devel @@ -117,8 +114,11 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build +# Needed by patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --with-webkit=%{_webkitver} \ ++++++ seed-webkit-1.0-detection.patch ++++++ diff -ur seed-3.2.0/configure.ac seed-3.2.0.patched/configure.ac --- seed-3.2.0/configure.ac 2011-09-22 06:31:13.000000000 +0200 +++ seed-3.2.0.patched/configure.ac 2011-11-28 20:30:26.855936640 +0100 @@ -90,14 +90,10 @@ AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) ], [1.0], [ - save_LIBS=$LIBSma - LIBS=`pkg-config --libs webkit-1.0` - WEBKIT_PC=webkitgtk-1.0 - AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,, + AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0, AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,WEBKIT_PC=webkit-1.0, AC_MSG_ERROR([The installed version of WebKit is too old. Seed requires WebKit SVN revision 35442 or greater.])))) - LIBS=$save_LIBS ], [AC_MSG_ERROR([Invalid argument for --with-webkit])] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
