[gwibber/f20] add appdata, enable gtkspell3
Tom Callaway
spot at fedoraproject.org
Mon Nov 11 18:51:03 UTC 2013
commit 7783e936c5e7d953605970ff8866ac48848d0148
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Nov 11 13:51:27 2013 -0500
add appdata, enable gtkspell3
gwibber-3.4.2-fix-mkdir-p.patch | 12 +++++++++++
gwibber-3.4.2-gtkspell3-fix.patch | 36 ++++++++++++++++++++++++++++++++++
gwibber.appdata.xml | 28 ++++++++++++++++++++++++++
gwibber.spec | 39 +++++++++++++++++++++++++++++-------
4 files changed, 107 insertions(+), 8 deletions(-)
---
diff --git a/gwibber-3.4.2-fix-mkdir-p.patch b/gwibber-3.4.2-fix-mkdir-p.patch
new file mode 100644
index 0000000..a018926
--- /dev/null
+++ b/gwibber-3.4.2-fix-mkdir-p.patch
@@ -0,0 +1,12 @@
+diff -up gwibber-3.4.2/m4/po.m4.fixmkdirp gwibber-3.4.2/m4/po.m4
+--- gwibber-3.4.2/m4/po.m4.fixmkdirp 2013-11-11 11:08:55.655016684 -0500
++++ gwibber-3.4.2/m4/po.m4 2013-11-11 11:08:59.464009398 -0500
+@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ [
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
diff --git a/gwibber-3.4.2-gtkspell3-fix.patch b/gwibber-3.4.2-gtkspell3-fix.patch
new file mode 100644
index 0000000..06553b8
--- /dev/null
+++ b/gwibber-3.4.2-gtkspell3-fix.patch
@@ -0,0 +1,36 @@
+diff -up gwibber-3.4.2/configure.ac.fixgtkspell3 gwibber-3.4.2/configure.ac
+--- gwibber-3.4.2/configure.ac.fixgtkspell3 2013-11-11 13:36:27.667140089 -0500
++++ gwibber-3.4.2/configure.ac 2013-11-11 13:36:27.672140080 -0500
+@@ -157,10 +157,10 @@ AC_ARG_ENABLE([spell],
+
+ if test "x$enable_spell" = "xyes"; then
+ PKG_CHECK_MODULES(GTKSPELL,
+- gtkspell-3.0)
++ gtkspell3-3.0)
+ AC_SUBST(GTKSPELL_CFLAGS)
+ AC_SUBST(GTKSPELL_CFLAGS)
+- GTKSPELL_PKG="--pkg gtkspell-3.0"
++ GTKSPELL_PKG="--pkg gtkspell3-3.0"
+ AC_SUBST(GTKSPELL_PKG)
+ fi
+
+diff -up gwibber-3.4.2/libgwibber-gtk/entry.vala.fixgtkspell3 gwibber-3.4.2/libgwibber-gtk/entry.vala
+--- gwibber-3.4.2/libgwibber-gtk/entry.vala.fixgtkspell3 2013-11-11 13:37:59.339976500 -0500
++++ gwibber-3.4.2/libgwibber-gtk/entry.vala 2013-11-11 13:40:05.372750819 -0500
+@@ -141,7 +141,7 @@ namespace GwibberGtk
+ #if HAVE_GTKSPELL
+ try
+ {
+- var spell = new Gtk.Spell.attach(this, null);
++ var spell = new GtkSpell.Checker();
+ }
+ catch (Error e)
+ {
+diff -up gwibber-3.4.2/libgwibber-gtk/gwibber-gtk-0.2.deps.fixgtkspell3 gwibber-3.4.2/libgwibber-gtk/gwibber-gtk-0.2.deps
+--- gwibber-3.4.2/libgwibber-gtk/gwibber-gtk-0.2.deps.fixgtkspell3 2012-03-06 16:12:59.000000000 -0500
++++ gwibber-3.4.2/libgwibber-gtk/gwibber-gtk-0.2.deps 2013-11-11 13:36:27.672140080 -0500
+@@ -2,3 +2,4 @@ gtk+-3.0
+ gdk-3.0
+ pango
+ glib-2.0
++gtkspell3-3.0
diff --git a/gwibber.appdata.xml b/gwibber.appdata.xml
new file mode 100644
index 0000000..406ef8d
--- /dev/null
+++ b/gwibber.appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">gwibber.desktop</id>
+ <licence>CC0</licence>
+ <description>
+ <p>
+ Gwibber is an open source microblogging client for GNOME developed with Python and GTK.
+ It supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed, and Qaiku.
+ </p>
+ <ul>
+ <li>Supports many different social networks</li>
+ <li>Provides a combined stream of all your messages</li>
+ <li>Automatically shortens URLs when they are pasted</li>
+ <li>Built-in search tool and support for saved searches</li>
+ <li>Optional support for spell-checking as you type</li>
+ <li>HTML themes let you customize Gwibber's look and feel</li>
+ <li>Multicolumn user interface for viewing multiple streams</li>
+ </ul>
+
+ </description>
+ <url type="homepage">http://gwibber.com//</url>
+ <screenshots>
+ <screenshot type="default">http://farm5.static.flickr.com/4004/4344700256_4e2efb8fa0_o.jpg</screenshot>
+ </screenshots>
+<!-- FIXME: change this to an upstream email address for spec updates
+<updatecontact>someone_who_cares at upstream_project.org</updatecontact>
+ -->
+</application>
diff --git a/gwibber.spec b/gwibber.spec
index 7ad30fa..5f7161b 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -2,7 +2,7 @@
Name: gwibber
Version: 3.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 1
Summary: An open source microblogging client for GNOME developed with Python and GTK
Group: Applications/Internet
@@ -14,6 +14,8 @@ URL: https://launchpad.net/gwibber
# bzr export -r %{bzr_rev} gwibber-%{bzr_rev}bzr.tar.gz lp:gwibber
# Source0: %{name}-%{bzr_rev}bzr.tar.gz
Source0: https://launchpad.net/gwibber/3.4/3.4.2/+download/%{name}-%{version}.tar.gz
+# Appdata file
+Source1: gwibber.appdata.xml
# Fix situation where pango_overlay can be undefined
# https://bugs.launchpad.net/gwibber/+bug/577050
@@ -55,6 +57,12 @@ Patch55: gwibber-pillow.patch
# Fix gwibber to use twitter 1.1 API
Patch56: gwibber-3.4.2-twitter-1.1-api-fix.patch
+# Replace AM_PROG_MKDIR_P with AC_PROG_MKDIR_P
+Patch57: gwibber-3.4.2-fix-mkdir-p.patch
+
+# Fix gtkspell3
+Patch58: gwibber-3.4.2-gtkspell3-fix.patch
+
Requires: libsoup, python-pycurl
Requires: python
Requires: dbus-python >= 0.80.2
@@ -84,7 +92,7 @@ BuildRequires: libtool, autoconf, automake
# For gnome-autogen.sh
BuildRequires: gnome-common
# This needs to be a gtk3 version.
-# BuildRequires: gtkspell-devel
+BuildRequires: gtkspell3-devel
%description
Gwibber is an open source microblogging client for GNOME developed with Python
@@ -119,9 +127,6 @@ Development files for gwibber's libraries.
# No unity here, sorry.
%patch51 -p1 -b .no-unity
-# No gtkspell at the moment
-%patch52 -p1 -b .no-gtkspell
-
# Match with 0.7 API (of 0.8)
%patch53 -p1 -b .gee08
@@ -134,9 +139,18 @@ Development files for gwibber's libraries.
# Fix gwibber to use twitter 1.1 API
%patch56 -p1 -b .twitter-1.1-fix
+# Use AC_PROG_MKDIR_P
+%patch57 -p1 -b .fixmkdirp
+
+# Fix gtkspell3
+%patch58 -p1 -b .fixgtkspell3
+
%build
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-unity --disable-static --disable-spell
+# NOCONFIGURE=true ./autogen.sh
+autoreconf -ifv
+intltoolize -f
+%configure --disable-unity --disable-static
+# rm -rf vala/gtkspell*
pushd libgwibber-gtk
make clean
popd
@@ -152,6 +166,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications data/%{name}.des
rm -rf %{buildroot}%{_libdir}/*.la
+%{__mkdir_p} %{buildroot}%{_datadir}/appdata
+cp -a %{SOURCE1} %{buildroot}%{_datadir}/appdata
+
+
## Install i18n data (THIS MUST COME LAST)
# cp -a build/mo %{buildroot}%{_datadir}/locale
%find_lang %{name}
@@ -179,6 +197,7 @@ fi
%{_bindir}/%{name}-poster
%{_bindir}/%{name}-preferences
%{_bindir}/%{name}-service
+%{_datadir}/appdata/*.xml
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -209,6 +228,10 @@ fi
%{_datadir}/vala/vapi/gwibber*
%changelog
+* Mon Nov 11 2013 Tom Callaway <spot at fedoraproject.org> - 3.4.2-9
+- add appdata file
+- enable gtkspell3 support
+
* Tue Sep 3 2013 Tom Callaway <spot at fedoraproject.org> - 3.4.2-8
- add explicit Requires: libwnck3 to avoid Gtk2/3 mix issue (bz1003254)
@@ -412,7 +435,7 @@ fi
* Fri Jun 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-10
- notifications
-* Fri May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-9
+* Thu May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-9
- more facebook fixes
* Thu May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-8
More information about the scm-commits
mailing list