diff --git a/.gitignore b/.gitignore index d85a74c..bd9cb5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ accounts-qt-0.31.tar.gz /accounts-qt-1.6.tar.bz2 +/accounts-qt-1.11.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 deleted file mode 100644 index b973266..0000000 --- a/accounts-qt-1.6-do-not-initialize-qstring-to-null.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 441ba51..1268bd2 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -1,12 +1,11 @@ Name: libaccounts-qt -Version: 1.6 -Release: 4%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Accounts framework Qt bindings Group: System Environment/Libraries License: LGPLv2 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 Patch1: libaccounts-qt-64bitarchs.patch BuildRequires: qt-devel libaccounts-glib-devel BuildRequires: doxygen graphviz @@ -25,7 +24,6 @@ Headers, development libraries and documentation for accounts-qt. %prep %setup -q -n accounts-qt-%{version} -%patch0 -p1 -b .do-not-initialize-qstring-to-null %patch1 -p1 -b .64bitarchs %build @@ -60,9 +58,13 @@ mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc %{_libdir}/lib*.so %{_includedir}/accounts-qt/ %{_libdir}/pkgconfig/accounts-qt.pc +%{_libdir}/cmake/AccountsQt %doc __tmp_doc/accounts-qt/* %changelog +* Wed Feb 26 2014 Daniel Vrátil - 1.11-1 +- Upodate to 1.11 + * Sat Dec 14 2013 Michael Schwendt - 1.6-4 - Fix duplicate documentation (#1001255) - Add %%?_isa to -devel base package dep diff --git a/sources b/sources index 62f1e08..2b79c0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4eb501fffdfdb37748f368008580374 accounts-qt-1.6.tar.bz2 +a76f26849603f229399dc46eb83ed5a8 accounts-qt-1.11.tar.bz2