[gwibber] gwibber 3.3.2
Tom Callaway
spot at fedoraproject.org
Wed Jan 18 19:12:33 UTC 2012
commit 1c1f02c09e59b1335e49b63b65e6161dc1a404ea
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Jan 18 14:12:31 2012 -0500
gwibber 3.3.2
.gitignore | 1 +
gwibber-3.3.2-gee-0.8.patch | 80 +++++++++++++++++++++++++++++++++++++++
gwibber-3.3.2-no-gtkspell.patch | 14 +++++++
gwibber-3.3.2-valac-0.16.patch | 62 ++++++++++++++++++++++++++++++
gwibber.spec | 31 ++++++++++++---
sources | 2 +-
6 files changed, 183 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be54aec..5b66169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gwibber-pre3-738bzr.tar.gz
/gwibber-3.0.0.1.tar.gz
/gwibber-3.1.0.tar.gz
/gwibber-3.3.1.1.tar.gz
+/gwibber-3.3.2.tar.gz
diff --git a/gwibber-3.3.2-gee-0.8.patch b/gwibber-3.3.2-gee-0.8.patch
new file mode 100644
index 0000000..39d22a3
--- /dev/null
+++ b/gwibber-3.3.2-gee-0.8.patch
@@ -0,0 +1,80 @@
+diff -up gwibber-3.3.2/client/Makefile.am.gee08 gwibber-3.3.2/client/Makefile.am
+--- gwibber-3.3.2/client/Makefile.am.gee08 2012-01-18 13:24:43.816605280 -0500
++++ gwibber-3.3.2/client/Makefile.am 2012-01-18 13:30:14.925336935 -0500
+@@ -36,7 +36,7 @@ gwibber_VALAFLAGS = \
+ --vapidir $(top_srcdir)/vapi \
+ --pkg config \
+ --pkg json-glib-1.0 \
+- --pkg gee-1.0 \
++ --pkg gee-0.8 \
+ --pkg gtk+-3.0 \
+ --pkg gdk-3.0 \
+ --pkg atk \
+@@ -102,7 +102,7 @@ gwibber_poster_VALAFLAGS = \
+ --pkg gdk-3.0 \
+ --pkg atk \
+ --pkg glib-2.0 \
+- --pkg gee-1.0 \
++ --pkg gee-0.8 \
+ --pkg dee-1.0 \
+ --pkg pango \
+ --basedir ./ \
+diff -up gwibber-3.3.2/configure.ac.gee08 gwibber-3.3.2/configure.ac
+--- gwibber-3.3.2/configure.ac.gee08 2012-01-18 13:24:08.297955881 -0500
++++ gwibber-3.3.2/configure.ac 2012-01-18 13:24:08.366955200 -0500
+@@ -138,7 +138,7 @@ PKG_CHECK_MODULES(BASE,
+ gdk-3.0 >= $GDK_REQUIRED
+ gio-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+- gee-1.0
++ gee-0.8
+ libnotify >= $LIBNOTIFY_REQUIRED
+ libsoup-2.4
+ pangocairo
+diff -up gwibber-3.3.2/libgwibber-gtk/Makefile.am.gee08 gwibber-3.3.2/libgwibber-gtk/Makefile.am
+--- gwibber-3.3.2/libgwibber-gtk/Makefile.am.gee08 2012-01-18 13:29:15.322925265 -0500
++++ gwibber-3.3.2/libgwibber-gtk/Makefile.am 2012-01-18 13:29:23.360845923 -0500
+@@ -47,7 +47,7 @@ libgwibber_gtk_la_VALAFLAGS = \
+ --pkg atk \
+ --pkg pangocairo \
+ --pkg dee-1.0 \
+- --pkg gee-1.0 \
++ --pkg gee-0.8 \
+ --pkg libsoup-2.4 \
+ --pkg libnotify \
+ --pkg json-glib-1.0 \
+diff -up gwibber-3.3.2/libgwibber/gwibber-0.2.deps.gee08 gwibber-3.3.2/libgwibber/gwibber-0.2.deps
+--- gwibber-3.3.2/libgwibber/gwibber-0.2.deps.gee08 2012-01-18 13:26:40.345455040 -0500
++++ gwibber-3.3.2/libgwibber/gwibber-0.2.deps 2012-01-18 13:28:53.948136253 -0500
+@@ -1,6 +1,6 @@
+ gobject-2.0
+ glib-2.0
+ dee-1.0
+-gee-1.0
++gee-0.8
+ json-glib-1.0
+ gio-2.0
+diff -up gwibber-3.3.2/libgwibber/Makefile.am.gee08 gwibber-3.3.2/libgwibber/Makefile.am
+--- gwibber-3.3.2/libgwibber/Makefile.am.gee08 2012-01-18 13:29:30.260777830 -0500
++++ gwibber-3.3.2/libgwibber/Makefile.am 2012-01-18 13:29:38.105700378 -0500
+@@ -37,7 +37,7 @@ libgwibber_la_VALAFLAGS = \
+ --pkg config \
+ --pkg gobject-2.0 \
+ --pkg dee-1.0 \
+- --pkg gee-1.0 \
++ --pkg gee-0.8 \
+ --pkg json-glib-1.0 \
+ --pkg gio-2.0 \
+ $(MAINTAINER_VALAFLAGS) \
+diff -up gwibber-3.3.2/tests/vala/Makefile.am.gee08 gwibber-3.3.2/tests/vala/Makefile.am
+--- gwibber-3.3.2/tests/vala/Makefile.am.gee08 2012-01-18 13:26:19.814657692 -0500
++++ gwibber-3.3.2/tests/vala/Makefile.am 2012-01-18 13:26:26.574590966 -0500
+@@ -25,7 +25,7 @@ test_vala_VALAFLAGS = \
+ --pkg gwibber-0.2 \
+ --pkg gobject-2.0 \
+ --pkg dee-1.0 \
+- --pkg gee-1.0 \
++ --pkg gee-0.8 \
+ --pkg json-glib-1.0 \
+ --pkg gio-2.0 \
+ --pkg gtk+-3.0 \
diff --git a/gwibber-3.3.2-no-gtkspell.patch b/gwibber-3.3.2-no-gtkspell.patch
new file mode 100644
index 0000000..4aa6825
--- /dev/null
+++ b/gwibber-3.3.2-no-gtkspell.patch
@@ -0,0 +1,14 @@
+diff -up gwibber-3.3.2/vapi/Makefile.am.no-gtkspell gwibber-3.3.2/vapi/Makefile.am
+--- gwibber-3.3.2/vapi/Makefile.am.no-gtkspell 2012-01-13 06:26:58.000000000 -0500
++++ gwibber-3.3.2/vapi/Makefile.am 2012-01-18 13:06:29.612406072 -0500
+@@ -1,5 +1,8 @@
+ EXTRA_DIST = \
+ config.vapi \
+ libnotify.deps \
+- libnotify.vapi \
+- gtkspell-3.0.vapi
++ libnotify.vapi
++
++if HAVE_GTKSPELL
++EXTRA_DIST += gtkspell-3.0.vapi
++endif
diff --git a/gwibber-3.3.2-valac-0.16.patch b/gwibber-3.3.2-valac-0.16.patch
new file mode 100644
index 0000000..f876edd
--- /dev/null
+++ b/gwibber-3.3.2-valac-0.16.patch
@@ -0,0 +1,62 @@
+=== modified file 'NEWS'
+--- NEWS 2012-01-13 10:48:15 +0000
++++ NEWS 2012-01-18 16:28:28 +0000
+@@ -1,3 +1,9 @@
++NEW in 3.3.3 (UNRELEASED)
++============
++
++Now requires valac-0.16
++
++
+ NEW in 3.3.2 (01/13/2012)
+ ============
+
+
+=== modified file 'acinclude.m4'
+--- acinclude.m4 2011-10-25 16:20:32 +0000
++++ acinclude.m4 2012-01-18 16:28:28 +0000
+@@ -254,7 +254,7 @@
+ # GWIBBER_PROG_VALAC([MINIMUM-VERSION])
+ # --------------------------------
+ AC_DEFUN([GWIBBER_PROG_VALAC],
+-[AC_PATH_PROG([VALAC], [valac-0.14], [])
++[AC_PATH_PROG([VALAC], [valac-0.16], [])
+ AS_IF([test -z "$VALAC"],
+ [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])],
+ [AS_IF([test -n "$1"],
+
+=== modified file 'configure.ac'
+--- configure.ac 2012-01-13 10:40:33 +0000
++++ configure.ac 2012-01-18 16:28:28 +0000
+@@ -30,7 +30,7 @@
+
+ dnl Init the other things we depend on
+ AM_MAINTAINER_MODE
+-GWIBBER_PROG_VALAC([0.14.0])
++GWIBBER_PROG_VALAC([0.15.0])
+
+ AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
+ AC_PROG_CC
+
+=== modified file 'libgwibber-gtk/entry.vala'
+--- libgwibber-gtk/entry.vala 2011-08-18 15:44:58 +0000
++++ libgwibber-gtk/entry.vala 2012-01-18 16:28:28 +0000
+@@ -206,7 +206,7 @@
+ chars > MAX_MESSAGE_LENGTH ? error_color : fg_color);
+ }
+
+- private void on_text_inserted (Gtk.TextIter iter, string text, int len)
++ private void on_text_inserted (ref Gtk.TextIter iter, string text, int len)
+ {
+ if (last_was_shortened == false
+ && len > 30
+@@ -217,7 +217,7 @@
+ Signal.stop_emission_by_name (buf, "insert-text") ;
+ var shrt = urlshorten.shorten (text);
+ last_was_shortened = true;
+- buf.insert (iter, shrt, -1);
++ buf.insert (ref iter, shrt, -1);
+ }
+ else
+ {
+
diff --git a/gwibber.spec b/gwibber.spec
index a6c18cb..ffb400f 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -1,8 +1,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: gwibber
-Version: 3.3.1.1
-Release: 2%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
Epoch: 1
Summary: An open source microblogging client for GNOME developed with Python and GTK
Group: Applications/Internet
@@ -66,7 +66,13 @@ Patch49: gwibber-3.3.1.1-fix-twitter-oauth.patch
Patch51: gwibber-3.3.1.1-no-unity.patch
# No gtkspell right now, still only gtk2 in Fedora
-Patch52: gwibber-3.3.1.1-no-gtkspell.patch
+Patch52: gwibber-3.3.2-no-gtkspell.patch
+
+# Gee now reports API of 0.8 in the 0.7 releases.
+Patch53: gwibber-3.3.2-gee-0.8.patch
+
+# Fixes for valac-0.16
+Patch54: gwibber-3.3.2-valac-0.16.patch
Requires: libsoup, python-pycurl
Requires: python
@@ -87,9 +93,9 @@ Requires: python-oauth
Requires: gnome-python2-libwnck
Requires: gnome-python2-gtkspell
Requires: python-kitchen
-BuildRequires: python-devel, desktop-file-utils, python-distutils-extra, intltool, gettext
-BuildRequires: gsettings-desktop-schemas-devel, json-glib-devel, libnotify-devel, dee-devel >= 0.5.19
-BuildRequires: libgee-devel, pango-devel, glib2-devel, gtk3-devel, libsoup-devel
+BuildRequires: python-devel, desktop-file-utils, python-distutils-extra, intltool, gettext, vala
+BuildRequires: gsettings-desktop-schemas-devel, json-glib-devel, libnotify-devel, dee-devel >= 1.0.0
+BuildRequires: libgee-devel, pango-devel, glib2-devel, gtk3-devel, libsoup-devel, gobject-introspection-devel
BuildRequires: libtool, autoconf, automake
# For gnome-autogen.sh
BuildRequires: gnome-common
@@ -150,12 +156,19 @@ Development files for gwibber's libraries.
# No gtkspell at the moment
%patch52 -p1 -b .no-gtkspell
+# Match with 0.7 API (of 0.8)
+%patch53 -p1 -b .gee08
+
+# Don't hardcode a version of valac
+%patch54 -p0 -b .valac-0.16
+
%build
NOCONFIGURE=true ./autogen.sh
%configure --disable-unity --disable-static --disable-spell
pushd libgwibber-gtk
make clean
popd
+make clean
make
%install
@@ -224,6 +237,12 @@ fi
%{_datadir}/vala/vapi/gwibber*
%changelog
+* Wed Jan 18 2012 Tom Callaway <spot at fedoraproject.org> - 1:3.3.2-1
+- update to 3.3.2
+
+* Wed Jan 18 2012 Tom Callaway <spot at fedoraproject.org> - 1:3.3.1.1-3
+- various build fixes
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index f4db20b..5f12e4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-484bf327257698a267ffc6684bed253b gwibber-3.3.1.1.tar.gz
+47a15990fb3b27bc1ef6b953b9b26022 gwibber-3.3.2.tar.gz
More information about the scm-commits
mailing list