Hello community, here is the log from the commit of package valencia for openSUSE:Factory checked in at Fri Sep 9 11:56:53 CEST 2011.
-------- --- GNOME/valencia/valencia.changes 2011-02-12 20:27:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/valencia/valencia.changes 2011-09-05 13:27:27.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Sep 5 11:08:01 UTC 2011 - [email protected] + +- Fix build against GNOME 3: + + Use favor_gtk2 to switch between gtk2 and gtk3 builds. + + Add valencia-gedit3.patch: build against GNOME 3, taken from + git. + + Replace GNOME 2 pkgconfig() BuildRequires with GNOME 3 + pkgconfig() BuildRequires: + - Old: gedit-2.20, gtk+-2.0, vala-1.0/vala-0.10, vte + - New: gedit, gtk+-3.0, gtksourceview-3.0, + libvala-0.12/libvala-0.14, vte-2.90 + + Add sed hack to use libvala-0.14 instead of libvala-0.12 on + 12.1 and later. + + Install files in the right directory for gedit plugins. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- valencia-gedit3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valencia.spec ++++++ --- /var/tmp/diff_new_pack.hDYKTL/_old 2011-09-09 11:56:45.000000000 +0200 +++ /var/tmp/diff_new_pack.hDYKTL/_new 2011-09-09 11:56:45.000000000 +0200 @@ -16,19 +16,33 @@ # +%if 0%{?favor_gtk2} +%define gedit_plugindir %{_libdir}/gedit-2/plugins +%else +%define gedit_plugindir %{_libdir}/gedit/plugins +%endif Name: valencia +%if 0%{?favor_gtk2} Version: 0.3.0 -Release: 5 +Release: 11 +%else +Version: 0.3.0_git20110905 + +%endif +%define _version 0.3.0 License: LGPLv2.1+ Summary: GEdit plugin to use GEdit as a lightweight IDE for Vala Url: http://yorba.org/valencia/ Group: Development/Tools/IDE -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{_version}.tar.bz2 # PATCH-FIX-UPSTREAM valencia-fix-build.patch [email protected] -- Fix build, taken from svn Patch0: valencia-fix-build.patch -BuildRequires: pkgconfig(gedit-2.20) +# PATCH-FIX-UPSTREAM valencia-gedit3.patch [email protected] -- Build against GNOME 3, taken from git (gedit-3 branch, up to 80815271) +Patch1: valencia-gedit3.patch BuildRequires: pkgconfig(gee-1.0) +%if 0%{?favor_gtk2} +BuildRequires: pkgconfig(gedit-2.20) BuildRequires: pkgconfig(gtk+-2.0) %if 0%{?suse_version} <= 1130 BuildRequires: pkgconfig(vala-1.0) @@ -36,6 +50,17 @@ BuildRequires: pkgconfig(vala-0.10) %endif BuildRequires: pkgconfig(vte) +%else +BuildRequires: pkgconfig(gedit) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtksourceview-3.0) +%if 0%{?suse_version} <= 1140 +BuildRequires: pkgconfig(libvala-0.12) +%else +BuildRequires: pkgconfig(libvala-0.14) +%endif +BuildRequires: pkgconfig(vte-2.90) +%endif BuildRequires: vala BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,21 +87,29 @@ suggestions by invoking autocomplete in the appropriate context. %prep -%setup -q -%if ! 0%{?suse_version} <= 1130 +%setup -q -n %{name}-%{_version} +%if 0%{?favor_gtk2} +%if 0%{?suse_version} > 1130 # vala-1.0 is now vala-0.10 => remove hack when fixed in new upstream version (build will fail) grep -q vala-1.0 Makefile sed -i "s/vala-1.0/vala-0.10/g" Makefile %endif %patch0 -p3 +%else +%patch1 -p1 +%if ! 0%{?suse_version} <= 1140 +grep -q libvala-0.12 Makefile +sed -i "s/libvala-0.12/libvala-0.14/g" Makefile +%endif +%endif %build export CFLAGS="%{optflags}" %__make %{?jobs:-j%{jobs}} %install -install -D libvalencia.so %{buildroot}%{_libdir}/gedit-2/plugins/libvalencia.so -install -D valencia.gedit-plugin %{buildroot}%{_libdir}/gedit-2/plugins/valencia.gedit-plugin +install -D libvalencia.so %{buildroot}%{gedit_plugindir}/libvalencia.so +install -D valencia.gedit-plugin %{buildroot}%{gedit_plugindir}/valencia.gedit-plugin install -D valencia.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/valencia.png %clean @@ -97,8 +130,8 @@ %files -n gedit-plugin-valencia %defattr(-,root,root) %doc AUTHORS COPYING NEWS README THANKS -%{_libdir}/gedit-2/plugins/libvalencia.so -%{_libdir}/gedit-2/plugins/valencia.gedit-plugin +%{gedit_plugindir}/libvalencia.so +%{gedit_plugindir}/valencia.gedit-plugin %{_datadir}/icons/hicolor/128x128/apps/valencia.png %changelog ++++++ valencia-gedit3.patch ++++++ ++++ 3279 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
