Hello community, here is the log from the commit of package valencia for openSUSE:Factory checked in at 2012-01-20 20:25:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valencia (Old) and /work/SRC/openSUSE:Factory/.valencia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valencia", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/valencia/valencia.changes 2011-09-23 12:49:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2012-01-20 20:27:27.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Jan 19 14:07:10 UTC 2012 - vuntz@opensuse.org + +- Fix build with vala 0.16: + + Add valencia-vala-0.16.patch: fixes from git. + + On Factory/12.2 or later, use pkgconfig(libvala-0.16) + BuildRequires, instead of using an earlier version. + + Only apply this patch on Factory/12.2 or later, where we have + vala 0.15/0.16. + + Change the sed hack for vala 0.14 support in %prep to only be + used for 12.1. + +------------------------------------------------------------------- New: ---- valencia-vala-0.16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valencia.spec ++++++ --- /var/tmp/diff_new_pack.1hke4p/_old 2012-01-20 20:27:41.000000000 +0100 +++ /var/tmp/diff_new_pack.1hke4p/_new 2012-01-20 20:27:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package valencia # -# 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 @@ -25,21 +25,23 @@ Name: valencia %if 0%{?favor_gtk2} Version: 0.3.0 -Release: 11 +Release: 0 %else Version: 0.3.0_git20110905 -Release: 11 +Release: 0 %endif %define _version 0.3.0 -License: LGPL-2.1+ Summary: GEdit plugin to use GEdit as a lightweight IDE for Vala -Url: http://yorba.org/valencia/ +License: LGPL-2.1+ Group: Development/Tools/IDE +Url: http://yorba.org/valencia/ Source: %{name}-%{_version}.tar.bz2 # PATCH-FIX-UPSTREAM valencia-fix-build.patch vuntz@opensuse.org -- Fix build, taken from svn Patch0: valencia-fix-build.patch # PATCH-FIX-UPSTREAM valencia-gedit3.patch vuntz@opensuse.org -- Build against GNOME 3, taken from git (gedit-3 branch, up to 80815271) Patch1: valencia-gedit3.patch +# PATCH-FIX-UPSTREAM valencia-vala-0.16.patch vuntz@opensuse.org -- Build against vala 0.15/0.16, taken from git (master branch, from 80815271 up to d6504e0c) +Patch2: valencia-vala-0.16.patch BuildRequires: pkgconfig(gee-1.0) %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gedit-2.20) @@ -54,10 +56,14 @@ BuildRequires: pkgconfig(gedit) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) -%if 0%{?suse_version} <= 1140 -BuildRequires: pkgconfig(libvala-0.12) +%if 0%{?suse_version} > 1210 +BuildRequires: pkgconfig(libvala-0.16) %else +%if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(libvala-0.14) +%else +BuildRequires: pkgconfig(libvala-0.12) +%endif %endif BuildRequires: pkgconfig(vte-2.90) %endif @@ -73,7 +79,6 @@ suggestions by invoking autocomplete in the appropriate context. %package -n gedit-plugin-valencia -License: LGPL-2.1+ Summary: GEdit plugin to use GEdit as a lightweight IDE for Vala Group: Development/Tools/IDE Provides: %{name} = %{version} @@ -97,10 +102,13 @@ %patch0 -p3 %else %patch1 -p1 -%if ! 0%{?suse_version} <= 1140 +%if 0%{?suse_version} == 1210 grep -q libvala-0.12 Makefile sed -i "s/libvala-0.12/libvala-0.14/g" Makefile %endif +%if 0%{?suse_version} > 1210 +%patch2 -p1 +%endif %endif %build ++++++ valencia-vala-0.16.patch ++++++ ++++ 1467 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org