From f807e47e31dda1450cc9c5e07cf35a8490c295ba994daf2309c4c6f07754989f Mon Sep 17 00:00:00 2001
From: c unix <cunix@mail.de>
Date: Fri, 18 Feb 2022 18:04:59 +0000
Subject: [PATCH] Accepting request 955731 from
 home:firstyear:branches:security

- Add specific lock file path to _service for cargo audit to prevent
  confusion with the lock files in the fuzz folders.

OBS-URL: https://build.opensuse.org/request/show/955731
OBS-URL: https://build.opensuse.org/package/show/security/rage-encryption?expand=0&rev=5
---
 _service                |  7 ++++---
 rage-0.7.1+0.tar.gz     |  3 +++
 rage-0.7.1.tar.gz       |  3 ---
 rage-encryption.changes |  6 ++++++
 rage-encryption.spec    | 14 ++++++++------
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 rage-0.7.1+0.tar.gz
 delete mode 100644 rage-0.7.1.tar.gz

diff --git a/_service b/_service
index 71f7a9a..ae7f470 100644
--- a/_service
+++ b/_service
@@ -1,9 +1,9 @@
 <services>
   <service mode="disabled" name="obs_scm">
     <param name="url">https://github.com/str4d/rage.git</param>
-    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="scm">git</param>
-    <param name="revision">v0.7.0</param>
+    <param name="revision">v0.7.1</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>
@@ -13,7 +13,7 @@
   <service mode="disabled" name="tar" />
   <service mode="disabled" name="recompress">
     <param name="file">*.tar</param>
-    <param name="compression">xz</param>
+    <param name="compression">gz</param>
   </service>
   <service mode="disabled" name="set_version"/>
   <service name="cargo_vendor" mode="disabled">
@@ -23,5 +23,6 @@
   </service>
   <service name="cargo_audit" mode="disabled">
      <param name="srcdir">rage</param>
+     <param name="lockfile">Cargo.lock</param>
   </service>
 </services>
diff --git a/rage-0.7.1+0.tar.gz b/rage-0.7.1+0.tar.gz
new file mode 100644
index 0000000..ea2a17f
--- /dev/null
+++ b/rage-0.7.1+0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1df7c1a5292fccdc2e73635999a611d1d5e0a64a5edbabc4d15fb37e93c5f6c
+size 134858
diff --git a/rage-0.7.1.tar.gz b/rage-0.7.1.tar.gz
deleted file mode 100644
index c1faa2e..0000000
--- a/rage-0.7.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f4271cb546e8af46f26c806b186bd91282f4c20e76afbb6b8dae9b21cc12b9f
-size 163772
diff --git a/rage-encryption.changes b/rage-encryption.changes
index dfcd551..851bc59 100644
--- a/rage-encryption.changes
+++ b/rage-encryption.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 15 03:58:13 UTC 2022 - William Brown <william.brown@suse.com>
+
+- Add specific lock file path to _service for cargo audit to prevent
+  confusion with the lock files in the fuzz folders.
+
 -------------------------------------------------------------------
 Mon Jan 31 12:00:00 UTC 2022 - cunix@mail.de
 
diff --git a/rage-encryption.spec b/rage-encryption.spec
index 1f1d0a2..edc99a6 100644
--- a/rage-encryption.spec
+++ b/rage-encryption.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package rage
+# spec file for package rage-encryption
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,21 +14,23 @@
 
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
+
+
 %define _buildshell /bin/bash
 %define vlic_dir  vendored
 
 Name:           rage-encryption
 #               This will be set by osc services, that will run after this.
-Version:        0.7.1
+Version:        0.7.1+0
 Release:        0
 Summary:        Simple, modern, and secure file encryption tool
 #               If you know the license, put it's SPDX string here.
 #               Alternately, you can use cargo lock2rpmprovides to help generate this.
-License:        ( 0BSD OR MIT OR Apache-2.0 ) AND ( Apache-2.0 OR BSL-1.0 ) AND ( Apache-2.0 OR MIT ) AND ( MIT OR Zlib OR Apache-2.0 ) AND ( Unlicense OR MIT ) AND ( Zlib OR Apache-2.0 OR MIT ) AND Apache-2.0 AND BSD-3-Clause AND CDDL-1.0 AND MIT
+License:        (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-3-Clause AND CDDL-1.0 AND MIT
 #               Select a group from this link:
 #               https://en.opensuse.org/openSUSE:Package_group_guidelines
 Group:          Productivity/Security
-Url:            https://github.com/str4d/rage
+URL:            https://github.com/str4d/rage
 Source0:        rage-%{version}.tar.gz
 Source1:        vendor.tar.xz
 Source2:        cargo_config
@@ -43,8 +45,8 @@ BuildRequires:  rust+cargo >= 1.51
 BuildRequires:  bash
 # for feature mount
 BuildRequires:  fuse-devel
-Recommends:     pinentry
 Recommends:     %{name}-bash-completion
+Recommends:     pinentry
 Conflicts:      rage
 ExclusiveArch:  %{rust_tier1_arches}