[libaccounts-qt] Update to 1.6

[Jaroslav Reznik]

commit b5af7478c1a1e27814007254dceaad9bb2c22ead
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Mar 4 10:15:16 2013 +0100

    Update to 1.6
    
    - Fix rebuild issues with GCC 4.8
    - Remove accounts-tool
    - Cleanup

 .gitignore                                         |    1 +
 accounts-qt-0.28-fix-64bit-compilation.patch       |   28 -----------------
 ...-qt-1.6-do-not-initialize-qstring-to-null.patch |   21 +++++++++++++
 libaccounts-qt.spec                                |   32 ++++++++-----------
 sources                                            |    2 +-
 5 files changed, 37 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 227f2cd..d85a74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 accounts-qt-0.31.tar.gz
+/accounts-qt-1.6.tar.bz2
diff --git a/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch b/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch
new file mode 100644
index 0000000..b973266
--- /dev/null
+++ b/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();
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index 3dac8af..9d3319d 100644
--- a/libaccounts-qt.spec
+++ b/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 at 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 at lists.fedoraproject.org> - 0.31-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b60c28..62f1e08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6429682ff3623fcf0ddd2023603b491  accounts-qt-0.31.tar.gz
+d4eb501fffdfdb37748f368008580374  accounts-qt-1.6.tar.bz2