Merge branch 'upstream' into tizen

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

diff --cc packaging/gsignond.changes
index 24a45b6,0000000..9d068f3
mode 100644,000000..100644
--- 1/packaging/gsignond.changes
--- /dev/null
+++ b/packaging/gsignond.changes
@@@ -1,37 -1,0 +1,40 @@@
++* 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
 +
 +* Thu Mar 06 2014 Imran Zaman <imran.zaman@intel.com>
 +- Release 1.0.0
 +- Assorted fixes and cleanups, updated version
 +- docs: add documentation for multple plugin loaders
 +- Update .gitignore
 +- plugins: simplify process killing
 +- plugind: export the plugin object on d-bus after connecting all the signals and setting properties
 +- Other memory leak and bug fixes
 +
 +* Fri Feb 28 2014 Jussi Laako <jussi.laako@linux.intel.com>
 +- Release 0.0.4
 +
 +* Thu Aug 22 2013 Amarnath Valluri <amarnath.valluri@linux.intel.com>
 +- Release 0.0.3 
 +- Bug fixes in UI interaction
 +- Documentation support
 +
 +* Mon Jun 24 2013 Imran Zaman <imran.zaman@intel.com>
 +- Release 0.0.2 that comprises of bug fixes
 +
 +* Wed Jun 12 2013 Jussi Laako <jussi.laako@linux.intel.com>
 +- Prepare for first release
 +
 +* Thu Feb 08 2013 Jussi Laako <jussi.laako@linux.intel.com>
 +- Initial RPM packaging

diff --cc packaging/gsignond.spec
index 495556f,0000000..b1f6d97
mode 100644,000000..100644
--- 1/packaging/gsignond.spec
--- /dev/null
+++ b/packaging/gsignond.spec
@@@ -1,112 -1,0 +1,110 @@@
- Version: 1.0.3
 +# define used dbus type [p2p, session, system]
 +%define dbus_type p2p
 +# enable debug features such as control environment variables
 +# WARNING! do not use for production builds as it will break security
 +%define debug_build 0
 +
 +Name: gsignond
 +Summary: GLib based Single Sign-On daemon
- %if %{dbus_type} != "p2p"
++Version: 1.0.4
 +Release: 0
 +Group: Security/Accounts
 +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"
 +BuildRequires: dbus-1
 +%endif
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +BuildRequires: pkgconfig(dbus-1)
 +BuildRequires: pkgconfig(glib-2.0) >= 2.30
 +BuildRequires: pkgconfig(gobject-2.0)
 +BuildRequires: pkgconfig(gio-2.0)
 +BuildRequires: pkgconfig(gio-unix-2.0)
 +BuildRequires: pkgconfig(gmodule-2.0)
 +BuildRequires: pkgconfig(sqlite3)
 +BuildRequires: pkgconfig(libecryptfs)
 +BuildRequires: pkgconfig(libsmack)
 +
 +%description
 +%{summary} package
 +
 +%package devel
 +Summary:    Development files for %{name}
 +Group:      SDK/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +%{summary} package
 +
 +%package doc
 +Summary:    Documentation files for %{name}
 +Group:      SDK/Documentation
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description doc
 +%{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}
 +
 +%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
 +%{_bindir}/%{name}
 +%{_libdir}/lib%{name}-*.so.*
 +%{_libdir}/%{name}/extensions/*.so*
 +%{_libdir}/%{name}/gplugins/*.so*
 +%{_libdir}/%{name}/pluginloaders/%{name}-plugind
 +%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
- %endif
 +%{_datadir}/dbus-1/interfaces/*SSO*.xml
 +
 +%files doc
 +%defattr(-,root,root,-)
 +%{_datadir}/gtk-doc/html/gsignond/*