Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb38238-signon' into 'master'
Provide privileges files for mapplauncher

See merge request mer-core/libsignon!3
  • Loading branch information
rainemak committed Jan 31, 2019
2 parents 3ba347c + 5d6a7e1 commit d66cc0c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
1 change: 1 addition & 0 deletions rpm/signon-qt5.privileges
@@ -0,0 +1 @@
/usr/bin/signond,a
37 changes: 21 additions & 16 deletions rpm/libsignon-qt5.spec → rpm/signon-qt5.spec
Expand Up @@ -6,6 +6,7 @@ Group: System/Libraries
License: LGPLv2.1
URL: https://gitlab.com/accounts-sso/signond
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.privileges
BuildRequires: doxygen
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
Expand Down Expand Up @@ -35,7 +36,10 @@ Obsoletes: signon
%{_libdir}/libsignon-plugins-common.so.*
%{_libdir}/libsignon-plugins.so.*
%{_datadir}/dbus-1/services/*
%{_datadir}/mapplauncherd/privileges.d/*
%config %{_sysconfdir}/signond.conf
# Own to signon library directory
%dir %{_libdir}/signon
%{_libdir}/signon/libpasswordplugin.so
%{_oneshotdir}/signon-storage-perm
%attr(4710, root, privileged) %{_libexecdir}/signon-storage-perm
Expand All @@ -46,7 +50,7 @@ Group: System/Libraries
Requires: %{name} = %{version}-%{release}

%description -n libsignon-qt5
%{summary}
%{summary}.

%files -n libsignon-qt5
%defattr(-,root,root,-)
Expand All @@ -62,21 +66,20 @@ Requires: %{name} = %{version}-%{release}
Obsoletes: signon-testplugin

%description testplugin
%{summary}
%{summary}.

%files testplugin
%defattr(-,root,root,-)
%{_libdir}/signon/libssotest*.so


%package exampleplugin
Summary: Single Sign On example client
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: signon-exampleplugin

%description exampleplugin
%{summary}
%{summary}.

%files exampleplugin
%defattr(-,root,root,-)
Expand All @@ -90,22 +93,21 @@ Requires: %{name} = %{version}-%{release}
Obsoletes: signon-devel

%description devel
%{summary}
%{summary}.

%files devel
%defattr(-,root,root,-)
%{_includedir}/signond/*
%{_includedir}/signon-extension/*
%{_includedir}/signon-plugins/*
%{_includedir}/signond
%{_includedir}/signon-extension
%{_includedir}/signon-plugins
%{_libdir}/libsignon-extension.so
%{_libdir}/libsignon-plugins-common.so
%{_libdir}/libsignon-plugins.so
%{_libdir}/pkgconfig/signond.pc
%{_libdir}/pkgconfig/signon-plugins.pc
%{_libdir}/pkgconfig/signon-plugins-common.pc
%{_libdir}/pkgconfig/SignOnExtension.pc
%{_libdir}/cmake/SignOnQt5/SignOnQt5Config.cmake
%{_libdir}/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
%{_libdir}/cmake/SignOnQt5
%{_datadir}/dbus-1/interfaces/*


Expand All @@ -115,11 +117,11 @@ Group: Development/Libraries
Requires: libsignon-qt5 = %{version}-%{release}

%description -n libsignon-qt5-devel
%{summary}
%{summary}.

%files -n libsignon-qt5-devel
%defattr(-,root,root,-)
%{_includedir}/signon-qt5/*
%{_includedir}/signon-qt5
%{_libdir}/libsignon-qt5.so
%exclude %{_libdir}/libsignon-qt5.a
%{_libdir}/pkgconfig/libsignon-qt5.pc
Expand All @@ -135,9 +137,9 @@ Doxygen-generated HTML documentation for the signon.

%files doc
%defattr(-,root,root,-)
%{_docdir}/signon/*
%{_docdir}/signon-plugins-dev/*
%{_docdir}/signon-plugins/*
%{_docdir}/signon
%{_docdir}/signon-plugins-dev
%{_docdir}/signon-plugins


%package -n libsignon-qt5-doc
Expand All @@ -149,7 +151,7 @@ Doxygen-generated HTML documentation for the signon-qt

%files -n libsignon-qt5-doc
%defattr(-,root,root,-)
%{_docdir}/libsignon-qt5/*
%{_docdir}/libsignon-qt5


%package tests
Expand Down Expand Up @@ -188,6 +190,9 @@ rm -f %{buildroot}/%{_docdir}/saslplugin/html/installdox
mkdir -p %{buildroot}/%{_oneshotdir}
install -D -m 755 oneshot/signon-storage-perm %{buildroot}/%{_oneshotdir}

mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d/

%post
/sbin/ldconfig
%{_bindir}/add-oneshot signon-storage-perm
Expand Down

0 comments on commit d66cc0c

Please sign in to comment.