Skip to content

Commit

Permalink
Merge branch 'jb46233' into 'master'
Browse files Browse the repository at this point in the history
Clean up unneeded oneshot for database directory.

See merge request mer-core/libsignon!4
  • Loading branch information
Matti Kosola committed Jun 27, 2019
2 parents d66cc0c + b77a4d6 commit 63b8ea2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
13 changes: 0 additions & 13 deletions libsignon/oneshot/signon-storage-perm

This file was deleted.

8 changes: 0 additions & 8 deletions rpm/signon-qt5.spec
Expand Up @@ -20,10 +20,7 @@ BuildRequires: pkgconfig(accounts-qt5)
BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(qt5-boostable)
BuildRequires: fdupes
BuildRequires: oneshot
Requires: mapplauncherd-qt5
Requires: oneshot
%{_oneshot_requires_post}
Obsoletes: signon

%description
Expand All @@ -41,7 +38,6 @@ Obsoletes: signon
# Own to signon library directory
%dir %{_libdir}/signon
%{_libdir}/signon/libpasswordplugin.so
%{_oneshotdir}/signon-storage-perm
%attr(4710, root, privileged) %{_libexecdir}/signon-storage-perm

%package -n libsignon-qt5
Expand Down Expand Up @@ -187,14 +183,10 @@ rm -f %{buildroot}/%{_docdir}/signon-plugins/html/installdox
rm -f %{buildroot}/%{_docdir}/saslplugin/html/installdox
%fdupes %{buildroot}/%{_docdir}

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

%postun -p /sbin/ldconfig

0 comments on commit 63b8ea2

Please sign in to comment.