[libqxt] Fix wrong includes RHBZ#733222
Orcan Ogetbil
oget at fedoraproject.org
Fri Aug 26 00:29:06 UTC 2011
commit 284faee355b8c11ef7fa9810c6eb9346f1a815f0
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Thu Aug 25 20:28:52 2011 -0400
Fix wrong includes RHBZ#733222
libqxt-header-fix.patch | 19 +++++++++++++++++++
libqxt.spec | 11 +++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/libqxt-header-fix.patch b/libqxt-header-fix.patch
new file mode 100644
index 0000000..78809f2
--- /dev/null
+++ b/libqxt-header-fix.patch
@@ -0,0 +1,19 @@
+diff -rupN libqxt.old/src/network/qxtnetwork.h libqxt/src/network/qxtnetwork.h
+--- libqxt.old/src/network/qxtnetwork.h 2010-11-07 09:18:41.000000000 -0500
++++ libqxt/src/network/qxtnetwork.h 2011-08-25 19:18:47.000000000 -0400
+@@ -26,13 +26,13 @@
+ #define QXTNETWORK_H_INCLUDED
+
+ #include "qxtjsonrpcclient.h"
+-#include "qxtjsonrpcresponse.h"
++#include "qxtjsonrpccall.h"
+ #include "qxtmailmessage.h"
+ #include "qxtmailattachment.h"
+ #include "qxtsmtp.h"
+ #include "qxtrpcpeer.h"
+ #include "qxttcpconnectionmanager.h"
+ #include "qxtxmlrpcclient.h"
+-#include "qxtxmlrpcresponse.h"
++#include "qxtxmlrpccall.h"
+
+ #endif // QXTNETWORK_H_INCLUDED
diff --git a/libqxt.spec b/libqxt.spec
index 83189c2..a60575c 100644
--- a/libqxt.spec
+++ b/libqxt.spec
@@ -1,18 +1,21 @@
Name: libqxt
Version: 0.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Qt extension library
Group: System Environment/Libraries
License: CPL or LGPLv2
URL: http://www.libqxt.org/
Source0: http://bitbucket.org/libqxt/libqxt/get/v%{version}.tar.bz2
# Fix DSO linking
-Patch0: libqxt-linking.patch
+Patch0: libqxt-linking.patch
# To support multimedia keys when using clementine
# Patch sent to upstream. They want to reimplement it more cleanly.
# We will use this patch until upstream reimplements it.
# http://dev.libqxt.org/libqxt/issue/75
Patch1: libqxt-media-keys.patch
+# Fix wrong header includes RHBZ#733222
+# http://dev.libqxt.org/libqxt/issue/112/wrong-include-in-qxtnetworkh
+Patch2: libqxt-header-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: avahi-compat-libdns_sd-devel
@@ -46,6 +49,7 @@ that use LibQxt.
%setup -q -n %{name}
%patch0 -p1 -b .linking
%patch1 -p1 -b .mediakeys
+%patch2 -p1 -b .includes
# We don't want rpath
sed -i '/-rpath/d' src/qxtlibs.pri
@@ -91,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%{_qt4_datadir}/mkspecs/features/qxt*.prf
%changelog
+* Thu Aug 25 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.6.1-3
+- Fix wrong includes RHBZ#733222
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list