[paco] Fix glib compilation error
Veeti Paananen
vpaan at fedoraproject.org
Tue Dec 6 16:18:47 UTC 2011
commit 7576e8a960981349fb0078e1b9a3ff81b0cf0bc9
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date: Tue Dec 6 18:16:54 2011 +0200
Fix glib compilation error
paco-2.0.9-fix-glib.patch | 13 +++++++++++++
paco.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/paco-2.0.9-fix-glib.patch b/paco-2.0.9-fix-glib.patch
new file mode 100644
index 0000000..e4ccc59
--- /dev/null
+++ b/paco-2.0.9-fix-glib.patch
@@ -0,0 +1,13 @@
+Index: gpaco/gconfig.h
+===================================================================
+--- gpaco/gconfig.h (revision 1877)
++++ gpaco/gconfig.h (working copy)
+@@ -11,7 +11,7 @@
+
+ #include "paco/baseconfig.h"
+ #include <glibmm/ustring.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <vector>
+
+
diff --git a/paco.spec b/paco.spec
index 3528b0a..b8f91d4 100644
--- a/paco.spec
+++ b/paco.spec
@@ -1,6 +1,6 @@
Name: paco
Version: 2.0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A source code package organizer for Unix/Linux
Group: Applications/System
@@ -14,6 +14,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch0: paco-2.0.9-fix-fsf-address.patch
# Updates the gpaco.desktop file to fix errors in categorization and icon path
Patch1: paco-2.0.9-fix-desktop-file.patch
+# Fixes glib header error on F17
+Patch2: paco-2.0.9-fix-glib.patch
BuildRequires: gtkmm24-devel
BuildRequires: desktop-file-utils
@@ -47,6 +49,7 @@ The gpaco package contains the GTK+ based GUI for paco.
%setup -q
%patch0 -p0
%patch1 -p0
+%patch2 -p0
iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && touch -r ChangeLog ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
@@ -101,6 +104,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Dec 06 2011 Veeti Paananen <veeti.paananen at ojekti.fi> - 2.0.9-9
+- Fixed glib compilation error
+
* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.0.9-8
- Rebuild for new libpng
More information about the scm-commits
mailing list