Accepting request 1279090 from utilities

- remove Provides: secret-tool (forwarded request 1279088 from rrahl0)

OBS-URL: https://build.opensuse.org/request/show/1279090
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/oo7?expand=0&rev=6

_service

@@ -3,9 +3,6 @@
   <service name="download_files" mode="manual" />
   <service name="cargo_vendor" mode="manual">
     <param name="src">*.tar.gz</param>
-    <param name="cargotoml">Cargo.toml</param>
-    <param name="cargotoml">cli/Cargo.toml</param>
-    <param name="cargotoml">client/Cargo.toml</param>
-    <param name="cargotoml">portal/Cargo.toml</param>
+    <param name="update">true</param>
   </service>
 </services>

oo7-0.3.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:329bd10ac305e3e9766958bd4c1827368c9a62e479be15db7642f39428404973
-size 111723

oo7-0.4.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b98e7f001e3e35073f34704d1425df2ce7f36ce1d5edaaca457f5beae25a17a7
+size 140463

oo7.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Wed May 21 16:42:44 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- remove Provides: secret-tool
+
+-------------------------------------------------------------------
+Mon May 12 21:11:50 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- remove Obsoletes: secret-tool
+
+-------------------------------------------------------------------
+Tue May  6 14:40:08 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- update vendor tarball, fixing bsc#1242633
+
+-------------------------------------------------------------------
+Thu Apr 17 21:23:26 UTC 2025 - Enrico Belleri <kilgore.trout@idesmi.eu>
+
+- Enable build of portal, daemon, cargo-credential
+- Enable tests
+- Update cargo vendor
+
+-------------------------------------------------------------------
+Sun Mar 23 21:08:38 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- update to 0.4.3:
+  * cli: Add custom keyring file support
+  * dbus/secret: Workaround gnome-keyring being non-spec compliant
+  * client: Deprecate Keyring::with_broken_item_cleanup
+  * cli: Add a new argument for listing all items
+- disable updating venored dependencies, as the crate `time` has a
+  breaking change
+
+-------------------------------------------------------------------
+Fri Mar 21 18:40:00 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- update to 0.4.2:
+  * Relax the condition when validating the file backend keyring secret and
+    provide various APIs to allow the developer to recover the non-broken items
+    in a keyring or delete the broken ones.
+
+-------------------------------------------------------------------
+Sun Feb 16 01:50:12 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- update to 0.4.0:
+  * portal: Support migration from legacy keyring format
+  * service: Add signals for collection create/delete/change
+  * client: Add a generic Secret type
+  * client: Don't panic if a cryptography operation fails
+- disable some tests, as they need dbus
+
+-------------------------------------------------------------------
+Sat Jun 22 16:17:31 UTC 2024 - Richard Rahl <rrahl0@disroot.org>
+
+- update to 0.3.3:
+  * client/item: Force tuple usage when serializing
+  * client: Use async UnixStream
+
 -------------------------------------------------------------------
 Fri May 17 02:17:48 UTC 2024 - Richard Rahl <rrahl0@disroot.org>
 

oo7.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package oo7
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,35 +17,118 @@
 
 
 Name:           oo7
-Version:        0.3.2
+Version:        0.4.3
 Release:        0
-Summary:        James Bond went on a new mission as a Secret Service provider
+Summary:        A Secret Service provider
 License:        MIT
 URL:            https://github.com/bilelmoussaoui/oo7
 Source0:        %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
 BuildRequires:  cargo-packaging
+BuildRequires:  meson >= 0.59.0
+BuildRequires:  pkgconfig
+BuildRequires:  rust >= 1.80
+BuildRequires:  pkgconfig(systemd) >= 242
+Requires:       oo7-daemon
+Requires:       oo7-portal
 
 %description
+James Bond went on a new mission and this time as a Secret Service provider.
+
+%package cli
+Summary:        A CLI application to interact with the system keyring. Replacement of secret-tool
+
+%description cli
 A CLI application to interact with the system keyring. Replacement of the secret-tool utility.
 
+%package -n cargo-credential-oo7
+Summary:        A cargo credential provider
+
+%description -n cargo-credential-oo7
+A cargo credential provider built using oo7 instead of libsecret.
+
+%package portal
+Summary:        A org.freedesktop.impl.portal.Secret implementation
+Provides:       dbus(org.freedesktop.impl.portal.Secret)
+Provides:       dbus(org.freedesktop.impl.portal.desktop.oo7)
+
+%description portal
+An implementation of org.freedesktop.impl.portal.Secret.
+
+%package daemon
+Summary:        A org.freedesktop.secrets server implementation
+Provides:       dbus(org.freedesktop.secrets)
+Provides:       dbus(org.gnome.keyring)
+
+%description daemon
+A D-Bus Secret Service provider. Replacement of the gnome-keyring-daemon.
+
 %prep
 %autosetup -a1
 
 %build
-%{cargo_build}
+%{cargo_build} --workspace --exclude 'oo7-portal' --exclude 'oo7-daemon'
+
+for d in portal server; do
+  pushd $d
+  %meson
+  %meson_build
+  popd
+done
 
 %install
 install -d %{buildroot}%{_bindir}
-install -Dpm0755 %{_builddir}/%{name}-%{version}/target/release/%{name}-{cli,portal} %{buildroot}%{_bindir}/
+install -Dm755 %{_builddir}/%{name}-%{version}/target/release/oo7-cli %{buildroot}%{_bindir}/
+install -Dm755 %{_builddir}/%{name}-%{version}/target/release/cargo-credential-oo7 %{buildroot}%{_bindir}/
 
+for d in portal server; do
+  pushd $d
+  %meson_install
+  popd
+done
+
+%if %{with test}
 %check
-%{cargo_test}
+%{cargo_test} -- --skip dbus::collection::tests::create_plain_item \
+  --skip dbus::service::tests::create_collection \
+  --skip dbus::collection::tests::create_encrypted_item
+
+for d in portal server; do
+  pushd $d
+  %meson_test
+  popd
+done
+%endif
 
 %files
 %license LICENSE
 %doc README.md
+
+%files cli
+%doc cli/README.md
+%license LICENSE
 %{_bindir}/oo7-cli
-%{_bindir}/oo7-portal
+
+%files -n cargo-credential-oo7
+%doc cargo-credential/README.md
+%license LICENSE
+%{_bindir}/cargo-credential-oo7
+
+%files portal
+%doc portal/README.md
+%license LICENSE
+%{_libexecdir}/oo7-portal
+%{_datadir}/applications/oo7-portal.desktop
+%dir %{_datadir}/xdg-desktop-portal/
+%dir %{_datadir}/xdg-desktop-portal/portals/
+%{_datadir}/xdg-desktop-portal/portals/oo7-portal.portal
+%{_userunitdir}/oo7-portal.service
+%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.oo7.service
+
+%files daemon
+%doc server/README.md
+%license LICENSE
+%{_libexecdir}/oo7-daemon
+%{_userunitdir}/oo7-daemon.service
 
 %changelog

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d30e4a91343d44c8814a4207fa06d16ecaf6d3cb8e7b5a3e993866fcc78caf32
-size 23703953
+oid sha256:eb98faf882a49dc3eb8b03ad85f6a0b66b55f0a08f31982e5c4d6171bf0c9e54
+size 20329017