[contextkit] 0.5.41
Tom Callaway
spot at fedoraproject.org
Tue Mar 27 14:13:00 UTC 2012
commit d6bd379c9be2ffff5a3d168944aae17110f6cecf
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Mar 27 10:12:57 2012 -0400
0.5.41
.gitignore | 1 +
contextkit-0.5.41-gcc47.patch | 99 +++++++++++++++++++++++++++++++++++++++++
contextkit.spec | 25 +++++++---
sources | 2 +-
4 files changed, 119 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4329153..6c63102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/contextkit-0.5.15.tar.bz2
+/contextkit-0.5.41.tar.bz2
diff --git a/contextkit-0.5.41-gcc47.patch b/contextkit-0.5.41-gcc47.patch
new file mode 100644
index 0000000..c25f4f0
--- /dev/null
+++ b/contextkit-0.5.41-gcc47.patch
@@ -0,0 +1,99 @@
+diff -up contextkit-0.5.41/common/logging.cpp.gcc47 contextkit-0.5.41/common/logging.cpp
+--- contextkit-0.5.41/common/logging.cpp.gcc47 2012-03-27 09:37:12.128290593 -0400
++++ contextkit-0.5.41/common/logging.cpp 2012-03-27 09:37:25.623159641 -0400
+@@ -22,6 +22,7 @@
+ #include "logging.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <fcntl.h>
+ #include <QDateTime>
+ #include <QFile>
+diff -up contextkit-0.5.41/libcontextprovider/context-provide/context-provide.cpp.gcc47 contextkit-0.5.41/libcontextprovider/context-provide/context-provide.cpp
+--- contextkit-0.5.41/libcontextprovider/context-provide/context-provide.cpp.gcc47 2012-03-27 09:44:07.225251497 -0400
++++ contextkit-0.5.41/libcontextprovider/context-provide/context-provide.cpp 2012-03-27 09:44:22.907181654 -0400
+@@ -28,6 +28,7 @@
+ #include <QDebug>
+ #include <stdlib.h>
+ #include <service.h>
++#include <unistd.h>
+
+ using namespace ContextProvider;
+
+diff -up contextkit-0.5.41/libcontextprovider/customer-tests/client/client.cpp.gcc47 contextkit-0.5.41/libcontextprovider/customer-tests/client/client.cpp
+--- contextkit-0.5.41/libcontextprovider/customer-tests/client/client.cpp.gcc47 2012-03-27 09:38:03.938792356 -0400
++++ contextkit-0.5.41/libcontextprovider/customer-tests/client/client.cpp 2012-03-27 09:38:11.807718269 -0400
+@@ -2,6 +2,7 @@
+
+ #include <QCoreApplication>
+ #include <QDebug>
++#include <unistd.h>
+
+ int main(int argc, char **argv)
+ {
+diff -up contextkit-0.5.41/libcontextsubscriber/cli/context-listen.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/cli/context-listen.cpp
+--- contextkit-0.5.41/libcontextsubscriber/cli/context-listen.cpp.gcc47 2012-03-27 09:53:31.063369267 -0400
++++ contextkit-0.5.41/libcontextsubscriber/cli/context-listen.cpp 2012-03-27 09:53:39.872298606 -0400
+@@ -28,6 +28,7 @@
+ #include <QMap>
+ #include <QDebug>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ int main(int argc, char **argv)
+ {
+diff -up contextkit-0.5.41/libcontextsubscriber/customer-tests/forward-compatible/check-version.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/customer-tests/forward-compatible/check-version.cpp
+--- contextkit-0.5.41/libcontextsubscriber/customer-tests/forward-compatible/check-version.cpp.gcc47 2012-03-27 09:51:37.359252918 -0400
++++ contextkit-0.5.41/libcontextsubscriber/customer-tests/forward-compatible/check-version.cpp 2012-03-27 09:51:48.886168572 -0400
+@@ -23,6 +23,7 @@
+ #include <QDir>
+ #include <QDebug>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "contextregistryinfo.h"
+ #include "contextpropertyinfo.h"
+
+diff -up contextkit-0.5.41/libcontextsubscriber/src/cdbreader.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/src/cdbreader.cpp
+--- contextkit-0.5.41/libcontextsubscriber/src/cdbreader.cpp.gcc47 2012-03-27 09:46:58.478048151 -0400
++++ contextkit-0.5.41/libcontextsubscriber/src/cdbreader.cpp 2012-03-27 09:47:06.936975142 -0400
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <cdb.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <QDebug>
+ #include <QByteArray>
+ #include <QFile>
+diff -up contextkit-0.5.41/libcontextsubscriber/src/cdbwriter.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/src/cdbwriter.cpp
+--- contextkit-0.5.41/libcontextsubscriber/src/cdbwriter.cpp.gcc47 2012-03-27 09:46:34.414255844 -0400
++++ contextkit-0.5.41/libcontextsubscriber/src/cdbwriter.cpp 2012-03-27 09:46:44.005173066 -0400
+@@ -22,6 +22,7 @@
+ #include <cdb.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "cdbwriter.h"
+ #include "logging.h"
+ #include "loggingfeatures.h"
+diff -up contextkit-0.5.41/libcontextsubscriber/src/contextproperty.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/src/contextproperty.cpp
+--- contextkit-0.5.41/libcontextsubscriber/src/contextproperty.cpp.gcc47 2012-03-27 09:45:04.982935532 -0400
++++ contextkit-0.5.41/libcontextsubscriber/src/contextproperty.cpp 2012-03-27 09:45:14.659870449 -0400
+@@ -104,6 +104,7 @@
+
+ #include <QCoreApplication>
+ #include <QThread>
++#include <unistd.h>
+
+ using namespace ContextSubscriber;
+
+diff -up contextkit-0.5.41/libcontextsubscriber/update-contextkit-providers/update-contextkit-providers.cpp.gcc47 contextkit-0.5.41/libcontextsubscriber/update-contextkit-providers/update-contextkit-providers.cpp
+--- contextkit-0.5.41/libcontextsubscriber/update-contextkit-providers/update-contextkit-providers.cpp.gcc47 2012-03-27 09:54:13.562028087 -0400
++++ contextkit-0.5.41/libcontextsubscriber/update-contextkit-providers/update-contextkit-providers.cpp 2012-03-27 09:54:21.800961869 -0400
+@@ -22,6 +22,7 @@
+ #include <QCoreApplication>
+ #include <QDir>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "contextregistryinfo.h"
+ #include "contextpropertyinfo.h"
diff --git a/contextkit.spec b/contextkit.spec
index 86eee6d..9f9c52f 100644
--- a/contextkit.spec
+++ b/contextkit.spec
@@ -1,14 +1,22 @@
Name: contextkit
Summary: Contextual information collection framework
-Version: 0.5.15
-Release: 3%{?dist}
+Version: 0.5.41
+Release: 1%{?dist}
Group: Applications/System
License: LGPLv2
URL: http://gitorious.org/maemo-af/contextkit
-# extracted from http://repo.meego.com/MeeGo/builds/trunk/1.0.90.0.20100831.1/core/repos/source/contextkit-0.5.15-1.28.src.rpm
+# OLD: extracted from http://repo.meego.com/MeeGo/builds/trunk/1.0.90.0.20100831.1/core/repos/source/contextkit-0.5.15-1.28.src.rpm
+# Current: Pulled from git (on 20120326)
+# git clone git://gitorious.org/maemo-af/contextkit.git
+# git checkout 0.5.41
+# rm -rf .git
+# cd ..
+# mv contextkit contextkit-0.5.41
+# tar cvfj contextkit-0.5.41.tar.bz2 contextkit-0.5.41
Source0: %{name}-%{version}.tar.bz2
Patch0: remove-docs-build.patch
Patch1: contextkit-gcc45.patch
+Patch2: contextkit-0.5.41-gcc47.patch
BuildRequires: dbus-devel
BuildRequires: glib2-devel
BuildRequires: qjson-devel
@@ -41,7 +49,7 @@ The ContextKit consists of:
%package devel
Summary: Development files for ContextKit
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Development libraries and headers for building context aware applications.
@@ -53,6 +61,8 @@ Development libraries and headers for building context aware applications.
%patch0 -p1
# contextkit-gcc45.patch
%patch1 -p1
+# fix gcc 47 issues
+%patch2 -p1 -b .gcc47
# Remove shebang
for file in python/ContextKit/*.py; do
@@ -60,9 +70,9 @@ for file in python/ContextKit/*.py; do
touch -r $file $file.new && \
mv $file.new $file
done
+./autogen.sh --no-configure
%build
-./autogen.sh
%configure --disable-static
make %{?_smp_mflags}
@@ -81,7 +91,6 @@ rm -rf %{buildroot}%{_datadir}/libcontext*-tests
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc contextkit-doc/html COPYING AUTHORS MAINTAINERS README
%{_sysconfdir}/dbus-1/system.d/libcontextprovider0.conf
%{_bindir}/*
@@ -91,12 +100,14 @@ rm -rf %{buildroot}%{_datadir}/libcontext*-tests
%{_mandir}/man1/*.1.*
%files devel
-%defattr(-,root,root,-)
%{_libdir}/libcontext*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/context*
%changelog
+* Tue Mar 27 2012 Tom Callaway <spot at fedoraproject.org> - 0.5.41-1
+- update to 0.5.41
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index e49066f..d652797 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d9e7cf4c91b550107c67489932aa4f8 contextkit-0.5.15.tar.bz2
+4db89d458f0b1eb02e5cb389f9627f73 contextkit-0.5.41.tar.bz2
More information about the scm-commits
mailing list