[pidgin-gfire/f17] fix ftbfs
Tom Callaway
spot at fedoraproject.org
Fri Mar 9 21:07:22 UTC 2012
commit 32c766b15a6f563ff5084ac9e2343bf38b0ebb82
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Mar 9 16:07:19 2012 -0500
fix ftbfs
pidgin-gfire-0.9.4-glibfix.patch | 14 ++++++++++++++
pidgin-gfire.spec | 18 ++++++++----------
2 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/pidgin-gfire-0.9.4-glibfix.patch b/pidgin-gfire-0.9.4-glibfix.patch
new file mode 100644
index 0000000..d06899c
--- /dev/null
+++ b/pidgin-gfire-0.9.4-glibfix.patch
@@ -0,0 +1,14 @@
+diff -up pidgin-gfire-0.9.4/src/gf_base.h.glibfix pidgin-gfire-0.9.4/src/gf_base.h
+--- pidgin-gfire-0.9.4/src/gf_base.h.glibfix 2012-03-09 15:52:21.522658232 -0500
++++ pidgin-gfire-0.9.4/src/gf_base.h 2012-03-09 15:52:35.812521513 -0500
+@@ -56,10 +56,7 @@
+ #include <errno.h>
+
+ // Glib
+-#include <glib-object.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
+-#include <glib/gthread.h>
+
+ #ifdef HAVE_GTK
+ #include <gtk/gtk.h>
diff --git a/pidgin-gfire.spec b/pidgin-gfire.spec
index 29923c9..7679713 100644
--- a/pidgin-gfire.spec
+++ b/pidgin-gfire.spec
@@ -2,16 +2,14 @@
Name: pidgin-gfire
Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Xfire plugin for Pidgin
-
Group: Applications/Communications
License: GPLv3+
URL: http://www.gfireproject.org/
Source0: http://downloads.sourceforge.net/%{srcname}/%{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-libnotify.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch1: %{name}-%{version}-glibfix.patch
BuildRequires: pidgin-devel
BuildRequires: gettext-devel
BuildRequires: libnotify-devel
@@ -40,6 +38,9 @@ Features:
%if 0%{?fedora} >= 15
%patch0 -p1
%endif
+%if 0%{?fedora} >= 17
+%patch1 -p1 -b .glibfix
+%endif
chmod 0644 AUTHORS ChangeLog COPYING NEWS README
chmod 0644 src/*.c src/*.h
chmod 0644 pixmaps/*/%{srcname}.png
@@ -51,24 +52,21 @@ autoreconf -f
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}
%find_lang %{srcname}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
-%clean
-rm -rf %{buildroot}
-
%files -f %{srcname}.lang
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/%{srcname}.png
%{_datadir}/pixmaps/pidgin/emblems/16/*.png
%{_datadir}/purple/%{srcname}/
-
%changelog
+* Fri Mar 9 2012 Tom Callaway <spot at fedoraproject.org> - 0.9.4-5
+- fix build against modern glib
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list