Update to 1.6

- Fix rebuild issues with GCC 4.8
- Remove accounts-tool
- Cleanup

.gitignore

@@ -1 +1,2 @@
 accounts-qt-0.31.tar.gz
+/accounts-qt-1.6.tar.bz2

accounts-qt-0.28-fix-64bit-compilation.patch

@@ -1,28 +0,0 @@
-diff -Naur accounts-qt-0.28.org/Accounts/account.cpp accounts-qt-0.28/Accounts/account.cpp
---- accounts-qt-0.28.org/Accounts/account.cpp	2010-06-14 22:45:41.000000000 +0800
-+++ accounts-qt-0.28/Accounts/account.cpp	2010-07-23 20:22:54.335786908 +0800
-@@ -496,10 +496,10 @@
-         value = g_value_get_uint(&val);
-         break;
-     case G_TYPE_INT64:
--        value = g_value_get_int64(&val);
-+        value = qint64(g_value_get_int64(&val));
-         break;
-     case G_TYPE_UINT64:
--        value = g_value_get_uint64(&val);
-+        value = quint64(g_value_get_uint64(&val));
-         break;
-     case G_TYPE_BOOLEAN:
-         value = g_value_get_boolean(&val);
-diff -Naur accounts-qt-0.28.org/Accounts/account.h accounts-qt-0.28/Accounts/account.h
---- accounts-qt-0.28.org/Accounts/account.h	2010-06-14 22:45:41.000000000 +0800
-+++ accounts-qt-0.28/Accounts/account.h	2010-07-23 20:23:19.636035755 +0800
-@@ -46,7 +46,7 @@
- 
- namespace Accounts
- {
--typedef quint32 AccountId;
-+typedef quint64 AccountId;
- typedef QList<AccountId> AccountIdList;
- class Manager;
- 

accounts-qt-1.6-do-not-initialize-qstring-to-null.patch

@@ -0,0 +1,21 @@
+diff -up accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null accounts-qt-1.6/Accounts/account.h
+--- accounts-qt-1.6/Accounts/account.h.do-not-initialize-qstring-to-null	2013-02-20 15:02:37.000000000 +0100
++++ accounts-qt-1.6/Accounts/account.h	2013-03-04 09:34:02.324000094 +0100
+@@ -105,7 +105,7 @@ public:
+ 
+     bool supportsService(const QString &serviceType) const;
+ 
+-    ServiceList services(const QString &serviceType = NULL) const;
++    ServiceList services(const QString &serviceType = QString()) const;
+     ServiceList enabledServices() const;
+ 
+     bool enabled() const;
+@@ -169,7 +169,7 @@ public:
+                      bool default_value = false,
+                      SettingSource *source = 0) const;
+ 
+-    Watch *watchKey(const QString &key = NULL);
++    Watch *watchKey(const QString &key = QString());
+ 
+     void sync();
+     bool syncAndBlock();

libaccounts-qt.spec

@@ -1,19 +1,17 @@
 Name:		libaccounts-qt
-Version:	0.31
-Release:	7%{?dist}
-Summary:	Accounts framework
+Version:	1.6
+Release:	1%{?dist}
+Summary:	Accounts framework Qt bindings
 Group:		System Environment/Libraries
 License:	LGPLv2
-URL:		http://gitorious.org/accounts-sso/accounts-qt
-Source0:	accounts-qt-%{version}.tar.gz
-# Fix compilation error in 64 bit arches
-Patch0:		accounts-qt-0.28-fix-64bit-compilation.patch
-# extracted from http://repo.meego.com/MeeGo/builds/trunk/daily/core/repos/source/libaccounts-qt-0.31-1.5.src.rpm
+URL:		http://code.google.com/p/accounts-sso/
+Source0:	http://accounts-sso.googlecode.com/files/accounts-qt-%{version}.tar.bz2
+Patch0:		accounts-qt-1.6-do-not-initialize-qstring-to-null.patch
 BuildRequires:	qt-devel libaccounts-glib-devel
 BuildRequires:	doxygen graphviz
 
 %description
-Framework to provide accounts.
+Framework to provide accounts for Qt.
 
 %package devel
 Summary:	Development files for accounts-qt
@@ -26,13 +24,7 @@ Headers, development libraries and documentation for accounts-qt.
 
 %prep
 %setup -q -n accounts-qt-%{version}
-%patch0 -p1
-
-sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' common-installs-config.pri
-sed -i 's\{INSTALL_PREFIX}/lib\{INSTALL_PREFIX}/%{_lib}\g' Accounts/Accounts.pro
-sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts.prf
-sed -i 's\usr/lib\usr/%{_lib}\g' Accounts/accounts-qt.pc
-sed -i 's\{prefix}/lib\{prefix}/%{_lib}\g' Accounts/accounts-qt.pc
+%patch0 -p1 -b .do-not-initialize-qstring-to-null
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
@@ -60,17 +52,21 @@ mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/lib*.so.*
-%{_bindir}/account-tool
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/accounts-qt/
 %{_libdir}/pkgconfig/accounts-qt.pc
-%{_libdir}/qt4/mkspecs/*
 %{_docdir}/libaccounts-qt
 
 %changelog
+* Mon Mar 04 2013 Jaroslav Reznik <jreznik@redhat.com> - 1.6-1
+- Update to 1.6
+- Fix rebuild issues with GCC 4.8
+- Remove accounts-tool
+- Cleanup
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-d6429682ff3623fcf0ddd2023603b491  accounts-qt-0.31.tar.gz
+d4eb501fffdfdb37748f368008580374  accounts-qt-1.6.tar.bz2