#66 Add rust-srpm-macros-epel to the buildroot
Merged a year ago by gotmax23. Opened a year ago by gotmax23.
rpms/ gotmax23/epel-rpm-macros rust  into  epel9-next

file modified
+43 -2
@@ -1,6 +1,6 @@ 

  Name:           epel-rpm-macros

  Version:        9

- Release:        2%{dist}

+ Release:        10%{dist}

  Summary:        Extra Packages for Enterprise Linux RPM macros

  

  License:        GPLv2
@@ -13,6 +13,8 @@ 

  Source1:        macros.zzz-epel-override

  Source2:        GPL

  #Add source for misc macros below here

+ # https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/rawhide/f/macros.shell-completions

+ Source3:        macros.shell-completions

  

  

  BuildArch:      noarch
@@ -23,6 +25,19 @@ 

  # pyproject-rpm-macros in CRB thus not required by python3-devel or python3-rpm-macros

  #   https://bugzilla.redhat.com/show_bug.cgi?id=2001034

  Requires:       (pyproject-rpm-macros if python3-rpm-macros)

+ Requires:       ansible-srpm-macros

+ # Provides backports from Fedora's go-rpm-macros and fixes critical

+ # bugs in RHEL's go-rpm-macros.

+ # Just like in Fedora, only the minimal -srpm-macros are needed in the buildroot.

+ # The rest of the macros are pulled in dynamically.

+ Requires:       go-srpm-macros-epel

+ # Provides backports from Fedora's rust-srpm-macros

+ Requires:       rust-srpm-macros-epel

+ # Provides backport from Fedora's perl-generators related to proposal

+ # https://fedoraproject.org/wiki/Changes/Perl_replace_MODULE_COMPAT_by_generator

+ Requires:       (perl-generators-epel if perl-generators)

+ # Add rpmautospec to the buildroot to mirror Fedora

+ Requires:       rpmautospec-rpm-macros

  

  %description

  This package contains the Extra Packages for Enterprise Linux (EPEL) RPM
@@ -41,15 +56,41 @@ 

      %{buildroot}%{_sysconfdir}/rpm/macros.zzz-epel-override

  

  #Add misc macros below here

- 

+ install -Dpm 644 %{SOURCE3} \

+     %{buildroot}%{_rpmmacrodir}/macros.shell-completions

  

  %files

  %license GPL

  %{_rpmmacrodir}/macros.epel-rpm-macros

  %{_sysconfdir}/rpm/macros.zzz-epel-override

+ %{_rpmmacrodir}/macros.shell-completions

  

  

  %changelog

+ * Sat Feb 25 2023 Maxwell G <maxwell@gtmx.me> - 9-10

+ - Add rust-srpm-macros-epel to the buildroot

+ 

+ * Fri Feb 10 2023 Maxwell G <gotmax@e.email> - 9-9

+ - Add rpmautospec to the buildroot to mirror Fedora

+ 

+ * Mon Jan 23 2023 Jitka Plesnikova <jplesnik@redhat.com> - 9-8

+ - Add perl-generators-epel to the buildroot

+ 

+ * Fri Sep 02 2022 Maxwell G <gotmax@e.email> - 9-7

+ - Add go-srpm-macros-epel to the buildroot

+ 

+ * Thu Sep 01 2022 Maxwell G <gotmax@e.email> - 9-6

+ - Backport macros.shell-completions from Fedora

+ 

+ * Fri May 27 2022 Carl George <carl@george.computer> - 9-5

+ - Backport java_arches macro from Fedora

+ 

+ * Tue May 17 2022 Maxwell G <gotmax@e.email> - 9-4

+ - Add `Requires: ansible-srpm-macros`

+ 

+ * Thu Dec 02 2021 Carl George <carl@george.computer> - 9-3

+ - Rebuild for EPEL9

+ 

  * Mon Oct 25 2021 Troy Dawson <tdawson@redhat.com> - 9-2

  - Add %%dist to Release:

  - Fix pyproject-rpm-macros typo

file modified
+3
@@ -4,3 +4,6 @@ 

  

  # Bash completions; not in bash to not intefere with install ordering

  %bash_completion_dir /usr/share/bash-completion/completions/

+ 

+ # Arches that OpenJDK and dependent packages run on

+ %java_arches aarch64 ppc64le s390x x86_64

@@ -0,0 +1,3 @@ 

+ %bash_completions_dir   %{_datadir}/bash-completion/completions

+ %zsh_completions_dir    %{_datadir}/zsh/site-functions

+ %fish_completions_dir   %{_datadir}/fish/vendor_completions.d

This is https://src.fedoraproject.org/rpms/epel-rpm-macros/pull-request/65 opened against epel9-next instead of epel9. We can build everything in a side tag after I've tested this a bit more.

9 new commits added

  • Add rust-srpm-macros-epel to the buildroot
  • Add rpmautospec to the buildroot to mirror Fedora
  • Add boolean operator to perl-generators-epel
  • Add perl-generators-epel to the buildroot
  • Add go-srpm-macros-epel to the buildroot
  • Backport macros.shell-completions from Fedora
  • Backport java_arches macro from Fedora
  • `AddRequires: ansible-srpm-macros```
  • Rebuild for EPEL9
a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/dcd3616a0aec4db79a421e0d502bdf52

If you want to test this against actual CentOS Stream 9 packages, cargo2rpm and rust-packaging v24 will be available in epel9-next-build-side-64242:

koji wait-repo epel9-next-build-side-64242 --build rust-packaging-24-3.el9.next

Pull-Request has been merged by gotmax23

a year ago

Building epel-rpm-macros-9-10.el9.next for epel9-next-build-side-64242
Created task: 98214518
Task info: https://koji.fedoraproject.org/koji/taskinfo?taskID=98214518