[packages/gsignond] - updated to 1.0.6 - added update patch (extensions fix from git) - added vala- and -extension-ostro

qboosh qboosh at pld-linux.org
Tue Apr 18 22:12:59 CEST 2017 

commit 0f59f37d3b63c371f9be0c1cb06ab5e7ad512d4b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Apr 18 22:13:12 2017 +0200

    - updated to 1.0.6
    - added update patch (extensions fix from git)
    - added vala- and -extension-ostro packages

 gsignond-update.patch | 39 +++++++++++++++++++++++++++++++
 gsignond.spec         | 63 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 96 insertions(+), 6 deletions(-)
---
diff --git a/gsignond.spec b/gsignond.spec
index 55d4d53..216d331 100644
--- a/gsignond.spec
+++ b/gsignond.spec
@@ -2,29 +2,37 @@
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
 %bcond_without	static_libs	# don't build static libraries
+%bcond_without	ostro		# Ostro extension (trousers+ecryptfs)
 %bcond_without	tizen		# Tizen extension (smack+ecryptfs)
 
 Summary:	Single-sign-on daemon
 Summary(pl.UTF-8):	Demon wspólnego logowania (single-sign-on)
 Name:		gsignond
-Version:	1.0.1
-Release:	2
+Version:	1.0.6
+Release:	1
 License:	LGPL v2.1+
 Group:		Daemons
 #Source0Download: https://gitlab.com/accounts-sso/gsignond/tags
-Source0:	https://gitlab.com/accounts-sso/gsignond/repository/archive.tar.bz2?ref=1.0.1&fake_out=/%{name}-%{version}.tar.bz2
-# Source0-md5:	c5a85fb3e98ebf6668b6ed448ab5da5d
+Source0:	https://gitlab.com/accounts-sso/gsignond/repository/archive.tar.bz2?ref=%{version}&fake_out=/%{name}-%{version}.tar.bz2
+# Source0-md5:	6cc5286f83ca8e398347c735557e2f4a
+Patch0:		%{name}-update.patch
 URL:		https://gitlab.com/accounts-sso/gsignond
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	check-devel >= 0.9.4
-%{?with_tizen:BuildRequires:	ecryptfs-utils-devel >= 96}
+BuildRequires:	dbus-devel
+%if %{with ostro} || %{with tizen}
+BuildRequires:	ecryptfs-utils-devel >= 96
+%endif
 BuildRequires:	glib2-devel >= 1:2.30
+BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gtk-doc >= 1.18
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig
 %{?with_tizen:BuildRequires:	smack-devel >= 1.0}
 BuildRequires:	sqlite3-devel >= 3
+%{?with_ostro:BuildRequires:	trousers-devel}
+BuildRequires:	vala
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,6 +42,19 @@ Single-sign-on daemon.
 %description -l pl.UTF-8
 Demon wspólnego logowania (single-sign-on).
 
+%package extension-ostro
+Summary:	Ostro extension for gsignond
+Summary(pl.UTF-8):	Rozszerzenie Ostro dla gsignond
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	ecryptfs-utils >= 96
+
+%description extension-ostro
+Ostro extension for gsignond.
+
+%description extension-ostro -l pl.UTF-8
+Rozszerzenie Ostro dla gsignond.
+
 %package extension-tizen
 Summary:	Tizen extension for gsignond
 Summary(pl.UTF-8):	Rozszerzenie Tizen dla gsignond
@@ -85,6 +106,19 @@ Static gsignond library.
 %description static -l pl.UTF-8
 Statyczna biblioteka gsignond.
 
+%package -n vala-gsignond
+Summary:	Vala API for gsignond library
+Summary(pl.UTF-8):	API języka Vala do biblioteki gsignond
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala
+
+%description -n vala-gsignond
+Vala API for gsignond library.
+
+%description -n vala-gsignond -l pl.UTF-8
+API języka Vala do biblioteki gsignond.
+
 %package apidocs
 Summary:	API documentation for gsignond
 Summary(pl.UTF-8):	Dokumentacja API gsidnond
@@ -100,7 +134,8 @@ API documentation for gsignond.
 Dokumentacja API gsidnond.
 
 %prep
-%setup -q -n %{name}-%{version}-61538c810dbe355e006e4e61a53271b3ce81a150
+%setup -q -n %{name}-%{version}-3214aef8e7c84a9918d8b18fb258247d81be12e2
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -149,19 +184,30 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gsignond/pluginloaders
 %attr(755,root,root) %{_libdir}/gsignond/pluginloaders/gsignond-plugind
 
+%if %{with ostro}
+%files extension-ostro
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gsignond/extensions/libextension-ostro.so
+%endif
+
+%if %{with tizen}
 %files extension-tizen
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gsignond/extensions/libextension-tizen.so
+%endif
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgsignond-common.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgsignond-common.so.0
+%{_libdir}/girepository-1.0/gSignond-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgsignond-common.so
 %{_includedir}/gsignond
+%{_datadir}/dbus-1/interfaces/com.google.code.AccountsSSO.gSingleSignOn.*.xml
+%{_datadir}/gir-1.0/gSignond-1.0.gir
 %{_pkgconfigdir}/gsignond.pc
 
 %if %{with static_libs}
@@ -170,6 +216,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgsignond-common.a
 %endif
 
+%files -n vala-gsignond
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gsignond.deps
+%{_datadir}/vala/vapi/gsignond.vapi
+
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
diff --git a/gsignond-update.patch b/gsignond-update.patch
new file mode 100644
index 0000000..e7c3b2d
--- /dev/null
+++ b/gsignond-update.patch
@@ -0,0 +1,39 @@
+diff --git a/src/extensions/ostro/ostro-access-control-manager.c b/src/extensions/ostro/ostro-access-control-manager.c
+index 2324c34..1e3c332 100644
+--- a/src/extensions/ostro/ostro-access-control-manager.c
++++ b/src/extensions/ostro/ostro-access-control-manager.c
+@@ -167,7 +167,7 @@ extension_ostro_access_control_manager_peer_is_allowed_to_use_identity (
+                             GSignondAccessControlManager *self,
+                             const GSignondSecurityContext *peer_ctx,
+                             const GSignondSecurityContext *identity_owner,
+-                            const GSignondSecurityContextList *identity_acl)
++                            const GList *identity_acl)
+ {
+     GSignondSecurityContext* acl_ctx = NULL;
+     const gchar *peer_system_ctx = gsignond_security_context_get_system_context(peer_ctx);
+diff --git a/src/extensions/ostro/ostro-access-control-manager.h b/src/extensions/ostro/ostro-access-control-manager.h
+index 30e4e72..4663d1a 100644
+--- a/src/extensions/ostro/ostro-access-control-manager.h
++++ b/src/extensions/ostro/ostro-access-control-manager.h
+@@ -85,7 +85,7 @@ extension_ostro_access_control_manager_peer_is_allowed_to_use_identity (
+                             GSignondAccessControlManager *self,
+                             const GSignondSecurityContext *peer_ctx,
+                             const GSignondSecurityContext *identity_owner,
+-                            const GSignondSecurityContextList *identity_acl);
++                            const GList *identity_acl);
+ 
+ gboolean
+ extension_ostro_access_control_manager_peer_is_owner_of_identity (
+diff --git a/src/extensions/tizen/tizen-access-control-manager.c b/src/extensions/tizen/tizen-access-control-manager.c
+index 355f09f..ed911ae 100644
+--- a/src/extensions/tizen/tizen-access-control-manager.c
++++ b/src/extensions/tizen/tizen-access-control-manager.c
+@@ -163,7 +163,7 @@ extension_tizen_access_control_manager_peer_is_allowed_to_use_identity (
+                             GSignondAccessControlManager *self,
+                             const GSignondSecurityContext *peer_ctx,
+                             const GSignondSecurityContext *identity_owner,
+-                            const GSignondSecurityContextList *identity_acl)
++                            const GList *identity_acl)
+ {
+     GSignondSecurityContext* acl_ctx = NULL;
+     const gchar *peer_system_ctx = gsignond_security_context_get_system_context(peer_ctx);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gsignond.git/commitdiff/0f59f37d3b63c371f9be0c1cb06ab5e7ad512d4b

More information about the pld-cvs-commit mailing list