From d33682c8be6fdf531d9b773697bb15ab67bb8423 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 20 May 2016 19:41:50 +0300 Subject: [PATCH 1/3] revert libaccounts-glib --- programming/library/libaccounts-glib/actions.py | 2 +- programming/library/libaccounts-glib/pspec.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programming/library/libaccounts-glib/actions.py b/programming/library/libaccounts-glib/actions.py index fb90665df5..49f0c145ac 100644 --- a/programming/library/libaccounts-glib/actions.py +++ b/programming/library/libaccounts-glib/actions.py @@ -22,4 +22,4 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README", "NEWS") + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING") diff --git a/programming/library/libaccounts-glib/pspec.xml b/programming/library/libaccounts-glib/pspec.xml index 13f29fd130..3bcc138a3c 100644 --- a/programming/library/libaccounts-glib/pspec.xml +++ b/programming/library/libaccounts-glib/pspec.xml @@ -12,7 +12,7 @@ LGPLv2 Accounts and SSO (Single Sign-On) framework Accounts and SSO (Single Sign-On) framework for Linux and POSIX based platforms. - https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=1.18 + https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2 glib2-devel libxml2-devel @@ -39,8 +39,6 @@ /usr/share/libaccounts-glib/testdata /usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml /usr/share/man/man1 - /usr/share/gir-1.0/Accounts-1.0.gir - /usr/share/vala @@ -56,6 +54,8 @@ /usr/include /usr/lib/pkgconfig + /usr/share/gir-1.0/Accounts-1.0.gir + /usr/share/vala @@ -73,6 +73,7 @@ +<<<<<<< HEAD 2016-05-20 1.18 @@ -80,6 +81,8 @@ Alihan Öztürk alihan@pisilinux.org +======= +>>>>>>> parent of 647daa4... libaccounts-glib:update 2016-03-30 1.21 From d3ea5dee7a8336c82bbcb9f4d5f07680253966da Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 20 May 2016 19:43:22 +0300 Subject: [PATCH 2/3] libaccounts-glib:revert --- programming/library/libaccounts-glib/pspec.xml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/programming/library/libaccounts-glib/pspec.xml b/programming/library/libaccounts-glib/pspec.xml index 3bcc138a3c..98ed850306 100644 --- a/programming/library/libaccounts-glib/pspec.xml +++ b/programming/library/libaccounts-glib/pspec.xml @@ -12,7 +12,7 @@ LGPLv2 Accounts and SSO (Single Sign-On) framework Accounts and SSO (Single Sign-On) framework for Linux and POSIX based platforms. - https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2 + https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2 glib2-devel libxml2-devel @@ -39,6 +39,8 @@ /usr/share/libaccounts-glib/testdata /usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml /usr/share/man/man1 + /usr/share/gir-1.0/Accounts-1.0.gir + /usr/share/vala @@ -54,8 +56,6 @@ /usr/include /usr/lib/pkgconfig - /usr/share/gir-1.0/Accounts-1.0.gir - /usr/share/vala @@ -73,16 +73,6 @@ -<<<<<<< HEAD - - 2016-05-20 - 1.18 - Rebuild for qt5 - Alihan Öztürk - alihan@pisilinux.org - -======= ->>>>>>> parent of 647daa4... libaccounts-glib:update 2016-03-30 1.21 From 85d4e22b41ddddabc2cccc215c324e5778e1b85b Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 20 May 2016 19:49:16 +0300 Subject: [PATCH 3/3] kaccounts-integration:add dep --- desktop/kde/application/kaccounts-integration/pspec.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/kde/application/kaccounts-integration/pspec.xml b/desktop/kde/application/kaccounts-integration/pspec.xml index 8604053f69..767e25d22f 100644 --- a/desktop/kde/application/kaccounts-integration/pspec.xml +++ b/desktop/kde/application/kaccounts-integration/pspec.xml @@ -22,6 +22,7 @@ kcoreaddons-devel kdbusaddons-devel libaccounts-qt5-devel + libaccounts-glib-devel signon-devel gettext-devel kdeclarative-devel