Accepting request 868718 from home:dimstar:Factory

Let's use a real _service file.

NOTE: the version is a small downgrade, but that's because I use %cd (aka commit date) as version identifier.
in the _service file I used the same commit date, so in fact this is the same source.


- Convert to use a proper git source _service:
  + To update, one just needs to update the commit/revision in the
    _service file and run `osc service dr`.
  + The version of the package is defined by the commit date of the
    revision, followed by the abbreviated git hash (The same
    revision used before results thus in a downgrade to 20210118,
    but as this is a alltime new package, this is acceptable.

OBS-URL: https://build.opensuse.org/request/show/868718
OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=7
This commit is contained in:
Pedro Monreal Gonzalez 2021-02-02 17:53:21 +00:00 committed by Git OBS Bridge
parent 8761902799
commit 45bd4ac122
7 changed files with 41 additions and 11 deletions

15
_service Normal file
View File

@ -0,0 +1,15 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://gitlab.com/redhat-crypto/fedora-crypto-policies.git</param>
<param name="scm">git</param>
<param name="versionformat">%cd.%h</param>
<param name="changesgenerate">enable</param>
<param name="revision">b21c8114995e07965c2ccde5f5767d0618d854bf</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.com/redhat-crypto/fedora-crypto-policies.git</param>
<param name="changesrevision">b21c8114995e07965c2ccde5f5767d0618d854bf</param></service></servicedata>

View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Feb 2 17:38:27 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Convert to use a proper git source _service:
+ To update, one just needs to update the commit/revision in the
_service file and run `osc service dr`.
+ The version of the package is defined by the commit date of the
revision, followed by the abbreviated git hash (The same
revision used before results thus in a downgrade to 20210118,
but as this is a alltime new package, this is acceptable.
-------------------------------------------------------------------
Tue Feb 2 12:33:19 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

View File

@ -16,20 +16,15 @@
#
%global git_date 20210127
%global git_commit b21c8114995e07965c2ccde5f5767d0618d854bf
%{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:8})}
# source_validator doesn't allow command execution
%global git_commit_shash b21c8114
%global _python_bytecompile_extra 0
Name: crypto-policies
Version: %{git_date}
Version: 20210118.b21c811
Release: 0
Summary: System-wide crypto policies
License: LGPL-2.1-or-later
Group: Productivity/Networking/Security
URL: https://gitlab.com/redhat-crypto/fedora-%{name}
Source0: https://gitlab.com/redhat-crypto/fedora-%{name}/-/archive/%{git_commit_shash}/%{name}-git%{git_commit_shash}.tar.bz2
Source0: fedora-%{name}-%{version}.tar.xz
Source1: README.SUSE
Patch0: crypto-policies-asciidoc.patch
Patch1: crypto-policies-typos.patch
@ -73,7 +68,7 @@ The package also provides a tool fips-mode-setup, which can be used
to enable or disable the system FIPS mode.
%prep
%autosetup -p1 -n fedora-crypto-policies-%{git_commit_shash}-%{git_commit}
%autosetup -p1 -n fedora-%{name}-%{version}
%build
%make_build

View File

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

View File

@ -0,0 +1,5 @@
name: fedora-crypto-policies
version: 20210118.b21c811
mtime: 1610992246
commit: b21c8114995e07965c2ccde5f5767d0618d854bf