#4271 Drop cvs requirement.
Merged 4 months ago by tkopecek. Opened 5 months ago by romaingeissler1a.
romaingeissler1a/koji remove-cvs-requirement  into  master

file modified
+17 -10
@@ -98,10 +98,10 @@ 

      HOME                    = .

      RANDFILE                = .rand

  

-     [ca] 

+     [ca]

      default_ca              = ca_default

  

-     [ca_default] 

+     [ca_default]

      dir                     = .

      certs                   = $dir/certs

      crl_dir                 = $dir/crl
@@ -120,7 +120,7 @@ 

      preserve                = no

      policy                  = policy_match

  

-     [policy_match] 

+     [policy_match]

      countryName             = match

      stateOrProvinceName     = match

      organizationName        = match
@@ -128,7 +128,7 @@ 

      commonName              = supplied

      emailAddress            = optional

  

-     [req] 

+     [req]

      default_bits            = 2048

      default_keyfile         = privkey.pem

      default_md              = sha256
@@ -137,7 +137,7 @@ 

      x509_extensions         = v3_ca # The extensions to add to the self signed cert

      string_mask             = MASK:0x2002

  

-     [req_distinguished_name] 

+     [req_distinguished_name]

      countryName                     = Country Name (2 letter code)

      countryName_default             = AT

      countryName_min                 = 2
@@ -154,19 +154,19 @@ 

      emailAddress                    = Email Address

      emailAddress_max                = 64

  

-     [req_attributes] 

+     [req_attributes]

      challengePassword               = A challenge password

      challengePassword_min           = 4

      challengePassword_max           = 20

      unstructuredName                = An optional company name

  

-     [usr_cert] 

+     [usr_cert]

      basicConstraints                = CA:FALSE

      nsComment                       = "OpenSSL Generated Certificate"

      subjectKeyIdentifier            = hash

      authorityKeyIdentifier          = keyid,issuer:always

  

-     [v3_ca] 

+     [v3_ca]

      subjectKeyIdentifier            = hash

      authorityKeyIdentifier          = keyid:always,issuer:always

      basicConstraints                = CA:true
@@ -979,7 +979,7 @@ 

  

      [web]

      SiteName = koji

-     # KojiTheme = 

+     # KojiTheme =

  

      # Necessary urls

      KojiHubURL = https://koji-hub.example.com/kojihub
@@ -1220,6 +1220,13 @@ 

  ``source_cmd``). In such case spec file named same as a checkout directory will

  be selected.

  

+ Supported SCMs are `git <https://git-scm.com/>`_ (base and over

+ http/https/rsync), `Subversion <https://subversion.apache.org/>`_ (base and

+ over http/https) and `CVS <https://www.nongnu.org/cvs/>`_ (base and over ssh).

+ As CVS is the least used these days, it is now not installed by default on

+ builders. If you need it, you've to ensure that ``cvs`` binary is available at

+ the builders.

+ 

  .. note::

  

      We provide ``build_from_scm`` hub policy as an equivalent in version
@@ -1390,4 +1397,4 @@ 

  .. _createrepo: http://createrepo.baseurl.org/

  .. _mock: https://fedoraproject.org/wiki/Mock

  .. _Apache mod_ssl documentation:

-     https://httpd.apache.org/docs/trunk/mod/mod_ssl.html#ssloptions 

+     https://httpd.apache.org/docs/trunk/mod/mod_ssl.html#ssloptions

file modified
-1
@@ -281,7 +281,6 @@ 

  Requires(post): systemd

  Requires(preun): systemd

  Requires(postun): systemd

- Requires: /usr/bin/cvs

  Requires: /usr/bin/svn

  Requires: /usr/bin/git

  Requires: createrepo_c >= 0.11.0

1 new commit added

  • Document supported SCMs
5 months ago

Ok, I have cherry-picked your commit and added it in this pull request.

This looks good to me. What do you think @mikem? We'd like to do the same in the Fedora/EPEL spec file, but don't want to diverge from upstream. If you think this PR is likely to be merged then we can probably proceed with the Fedora/EPEL change as well to solve the EPEL 10 installation problem discussed in rhbz#2319897.

Metadata Update from @mikem:
- Pull-request tagged with: no_qe

4 months ago

Commit cd25b8d fixes this pull-request

Pull-Request has been merged by tkopecek

4 months ago