[stardict] Add patch for glib2 single includes
Peter Robinson
pbrobinson at fedoraproject.org
Thu Apr 19 12:50:04 UTC 2012
commit 1c63af2a2bf4298eb8db8df9e990112e1ac84518
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Apr 19 13:50:01 2012 +0100
Add patch for glib2 single includes
stardict-glib2.patch | 11 +++++++++++
stardict.spec | 15 ++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/stardict-glib2.patch b/stardict-glib2.patch
new file mode 100644
index 0000000..2063a1d
--- /dev/null
+++ b/stardict-glib2.patch
@@ -0,0 +1,11 @@
+--- stardict-3.0.2/src/tomboykeybinder.h.orig 2012-04-19 12:56:18.453214582 +0100
++++ stardict-3.0.2/src/tomboykeybinder.h 2012-04-19 12:56:28.337202517 +0100
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/stardict.spec b/stardict.spec
index 2ccf7e4..3250533 100644
--- a/stardict.spec
+++ b/stardict.spec
@@ -1,14 +1,15 @@
Name: stardict
Summary: A powerful dictionary platform written in GTK+2
Version: 3.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Applications/System
License: GPLv3
URL: http://stardict.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: defaultdict.cfg
-Patch5: stardict-default-netdict-off.patch
-Patch6: stardict-3.0.1-gcc46.patch
+Patch1: stardict-default-netdict-off.patch
+Patch2: stardict-3.0.1-gcc46.patch
+Patch3: stardict-glib2.patch
BuildRequires: GConf2
Requires(pre): GConf2
@@ -34,8 +35,9 @@ scan selection, and fuzzy matching.
%prep
%setup -q
-%patch5 -p1 -b .orig
-%patch6 -p1 -b .orig
+%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
+%patch3 -p1 -b .glib2
# Remove unneeded sigc++ header files to make it sure
# that we are using system-wide libsigc++
@@ -92,6 +94,9 @@ rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
%changelog
+* Thu Apr 19 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 3.0.2-5
+- Add patch for glib2 single includes
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list