[clipit] fixing wrong gtk header inclusion bug

Nikos Roussos comzeradd at fedoraproject.org
Wed Feb 29 13:24:45 UTC 2012


commit db51503a3430d5b09aadccffa289f33dc9303120
Author: comzeradd <nikos at autoverse.net>
Date:   Wed Feb 29 15:23:49 2012 +0200

    fixing wrong gtk header inclusion bug

 clipit-1.4.1-glib.patch |   11 +++++++++++
 clipit.spec             |   10 +++++++++-
 sources                 |    2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/clipit-1.4.1-glib.patch b/clipit-1.4.1-glib.patch
new file mode 100644
index 0000000..cc8f550
--- /dev/null
+++ b/clipit-1.4.1-glib.patch
@@ -0,0 +1,11 @@
+--- clipit-1.4.1/src/keybinder.h.orig	2012-02-28 22:21:53.247549291 +0200
++++ clipit-1.4.1/src/keybinder.h	2012-02-28 22:26:45.180092101 +0200
+@@ -20,7 +20,7 @@
+ #ifndef __KEY_BINDER_H__
+ #define __KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/clipit.spec b/clipit.spec
index 99bb2e8..68f29b9 100644
--- a/clipit.spec
+++ b/clipit.spec
@@ -1,6 +1,6 @@
 Name:           clipit
 Version:        1.4.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A lightweight, fully featured GTK+ clipboard manager
 
 Group:          User Interface/Desktops
@@ -10,6 +10,10 @@ Source0:        http://downloads.sourceforge.net/gtk%{name}/%{name}-%{version}.t
 # patch fixing German translation inconsistency
 # http://sf.net/tracker/?func=detail&aid=3367028&group_id=369179&atid=1538558
 Patch0:         clipit-1.4.1-de.po.patch
+# pacth fixing wrong gtk header inclusion
+# http://sf.net/tracker/?func=detail&aid=3495659&group_id=369179&atid=1538558
+# https://live.gnome.org/GnomeGoals/CleanupGTKIncludes
+Patch1:         clipit-1.4.1-glib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel
@@ -32,6 +36,7 @@ ClipIts main features are:
 %prep
 %setup -q
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 
 %build
@@ -80,6 +85,9 @@ fi
 
 
 %changelog
+* Wed Feb 29 2012 Nikos Roussos <nikos at autoverse.net> 1.4.1-5
+- Fix gtk+ inclusion bug, see patch1
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 9be368f..107070a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f255859469dbdf8ad5408556cb610b8  clipit-1.4.1.tar.gz
+05ca90cd2fff4f1636677a30baf8a634  clipit-1.4.1-glib.patch


More information about the scm-commits mailing list