Merge branch 'upstream' into tizentizen_4.0.m1_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_unified/20170308.100412submit/tizen_ivi/20160217.000005submit/tizen_ivi/20160217.000000submit/tizen_3.0_ivi/20161010.000002submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093752submit/tizen_3.0.2014.q4_common/20150226.000000submit/tizen/20150213.150700accepted/tizen/wearable/20150216.093746accepted/tizen/unified/20170309.035250accepted/tizen/tv/20150216.093207accepted/tizen/mobile/20150216.094051accepted/tizen/ivi/20160218.024728accepted/tizen/common/20150216.085155accepted/tizen/3.0/ivi/20161011.044020accepted/tizen/3.0/common/20161114.110626accepted/tizen/3.0.2014.q4/common/20150226.105903tizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0tizenaccepted/tizen_wearableaccepted/tizen_unifiedaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.2014.q4_common

Change-Id: Id789ff575f917fbc0d63777970fa76628ceb6e18
Signed-off-by: Imran Zaman <imran.zaman@linux.intel.com>

8 files changed, 57 insertions, 29 deletions

diff --git a/dists/debian/changelog b/dists/debian/changelog
index b0c0e7f..1ff87e2 100644
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,8 +1,20 @@
+gsignond (1.0.4-1) unstable; urgency=low
+
+  * Update to 1.0.4
+
+ -- Imran Zamam <imran.zaman@intel.com>  Thu, 12 Feb 2015 16:22:00 +0200
+
 gsignond (1.0.3-1) unstable; urgency=low
 
   * Update to 1.0.3
 
- -- Imran Zamam <imran.zaman@.intel.com>  Mon, 30 Jun 2014 16:22:00 +0200
+ -- Imran Zamam <imran.zaman@intel.com>  Mon, 30 Jun 2014 16:22:00 +0200
+
+gsignond (1.0.2-5) unstable; urgency=low
+
+  * Update to 1.0.2
+
+ -- Jussi Laako <jussi.laako@linux.intel.com>  Wed, 25 Jun 2014 14:15:00 +0300
 
 gsignond (1.0.1-4) unstable; urgency=low
 
diff --git a/dists/debian/install b/dists/debian/install
index b5017d5..b38bf86 100644
--- a/dists/debian/install
+++ b/dists/debian/install
@@ -4,4 +4,4 @@
 /usr/lib/gsignond/gplugins/*.so*
 /usr/lib/gsignond/pluginloaders/gsignond-plugind
 /usr/share/dbus-1/services/*SingleSignOn*.service
-/etc/gsignond.conf
+/etc/gsignond/gsignond.conf
diff --git a/dists/debian/postinst b/dists/debian/postinst
index c2cc662..2dce3b9 100644
--- a/dists/debian/postinst
+++ b/dists/debian/postinst
@@ -24,6 +24,8 @@ case "$1" in
 	groupadd -f -r gsignond
 	chmod 4755 /usr/bin/gsignond
 	install -d -m 755 -o root -g root /var/db
+	# update-alternatives
+	update-alternatives --install /etc/gsignond.conf gsignond.conf /etc/gsignond/gsignond.conf 0
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/dists/debian/prerm b/dists/debian/prerm
index d111903..da73181 100644
--- a/dists/debian/prerm
+++ b/dists/debian/prerm
@@ -19,6 +19,7 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
+	    update-alternatives --remove gsignond.conf /etc/gsignond.conf
     ;;
 
     failed-upgrade)
diff --git a/dists/debian/rules b/dists/debian/rules
index c59a978..20d6db0 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -18,5 +18,10 @@ export DH_OPTIONS
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-dbus-type=session --enable-gtk-doc
 
+override_dh_install:
+	mkdir -p debian/tmp/etc/gsignond
+	mv debian/tmp/etc/gsignond.conf debian/tmp/etc/gsignond/
+	dh_install
+
 override_dh_auto_test:
 	true
diff --git a/dists/rpm/gsignond-suse.spec b/dists/rpm/gsignond-suse.spec
index b83885c..1f2613e 100644
--- a/dists/rpm/gsignond-suse.spec
+++ b/dists/rpm/gsignond-suse.spec
@@ -6,8 +6,8 @@
 
 Name: gsignond
 Summary: GLib based Single Sign-On daemon
-Version: 1.0.3
-Release: 1
+Version: 1.0.4
+Release: 0
 Group: System/Daemons
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
@@ -104,9 +104,7 @@ groupadd -f -r gsignond
 %{_libdir}/lib%{name}-*.so
 %{_libdir}/lib%{name}-*.la
 %{_libdir}/pkgconfig/%{name}.pc
-%if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*SSO*.xml
-%endif
 
 
 %files doc
@@ -115,6 +113,9 @@ groupadd -f -r gsignond
 
 
 %changelog
+* Thu Feb 12 2015 Imran Zaman <imran.zaman@intel.com>
+- Release 1.0.4
+
 * Mon Jun 30 2014 Imran Zaman <imran.zaman@intel.com>
 - Release 1.0.3
 
diff --git a/dists/rpm/gsignond-tizen.changes b/dists/rpm/gsignond-tizen.changes
index 85ec61c..9d068f3 100644
--- a/dists/rpm/gsignond-tizen.changes
+++ b/dists/rpm/gsignond-tizen.changes
@@ -1,6 +1,15 @@
+* Thu Feb 12 2015 Imran Zaman <imran.zaman@intel.com>
+- Release 1.0.4
+
 * Mon Jun 30 2014 Imran Zaman <imran.zaman@intel.com>
 - Release 1.0.3
 
+* Wed Jun 25 2014 Jussi Laako <jussi.laako@linux.intel.com>
+- Release 1.0.2
+
+* Wed Jun 11 2014 Jussi Laako <jussi.laako@linux.intel.com>
+- Add service file so the daemon gets auto-started inside the user session
+
 * Fri Mar 07 2014 Jussi Laako <jussi.laako@linux.intel.com>
 - Release 1.0.1
 
diff --git a/dists/rpm/gsignond-tizen.spec b/dists/rpm/gsignond-tizen.spec
index ad32965..b1f6d97 100644
--- a/dists/rpm/gsignond-tizen.spec
+++ b/dists/rpm/gsignond-tizen.spec
@@ -6,16 +6,17 @@
 
 Name: gsignond
 Summary: GLib based Single Sign-On daemon
-Version: 1.0.3
-Release: 1
+Version: 1.0.4
+Release: 0
 Group: Security/Accounts
-License: LGPL-2.1+
+License: LGPL-2.1+ and GPL-2.0+
 Source: %{name}-%{version}.tar.gz
 URL: https://01.org/gsso
 Source1001: %{name}.manifest
+Source1002: gsignond-cleandb
 Provides: gsignon
 %if %{dbus_type} != "p2p"
-Requires: dbus-1
+BuildRequires: dbus-1
 %endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -29,10 +30,8 @@ BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(libecryptfs)
 BuildRequires: pkgconfig(libsmack)
 
-
 %description
-%{summary}.
-
+%{summary} package
 
 %package devel
 Summary:    Development files for %{name}
@@ -40,8 +39,7 @@ Group:      SDK/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
-
+%{summary} package
 
 %package doc
 Summary:    Documentation files for %{name}
@@ -49,42 +47,44 @@ Group:      SDK/Documentation
 Requires:   %{name} = %{version}-%{release}
 
 %description doc
-%{summary}.
-
+%{summary} package
 
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
-
+cp %{SOURCE1002} .
 
 %build
+autoreconf -ivf
 %if %{debug_build} == 1
 %configure --enable-dbus-type=%{dbus_type} --enable-debug
 %else
 %configure --enable-dbus-type=%{dbus_type}
 %endif
 
-make %{?_smp_mflags}
-
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
-
+install -m 755 -d %{buildroot}%{_unitdir_user}
+install -m 644 data/gsignond.service %{buildroot}%{_unitdir_user}/
+install -m 755 -d %{buildroot}%{_unitdir_user}/default.target.wants
+ln -sf ../gsignond.service %{buildroot}%{_unitdir_user}/default.target.wants/gsignond.service
+install -m 755 -d %{buildroot}%{_sysconfdir}/gumd/userdel.d/
+install -m 755 gsignond-cleandb %{buildroot}%{_sysconfdir}/gumd/userdel.d/
 
 %post
 /sbin/ldconfig
 chmod u+s %{_bindir}/%{name}
 getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
+%doc AUTHORS COPYING.LIB
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
 %{_libdir}/%{name}/extensions/*.so*
@@ -93,20 +93,18 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 %if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/services/*SingleSignOn*.service
 %endif
+%{_unitdir_user}/gsignond.service
+%{_unitdir_user}/default.target.wants/gsignond.service
 %config(noreplace) %{_sysconfdir}/gsignond.conf
-
+%{_sysconfdir}/gumd/userdel.d/
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/*.h
 %{_libdir}/lib%{name}-*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*SSO*.xml
-%endif
-
 
 %files doc
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/gsignond/*
-