#5 Disable the macros subpackage in F40+
Merged 10 months ago by yselkowitz. Opened 10 months ago by yselkowitz.
rpms/ yselkowitz/python-rpmautospec rawhide  into  rawhide

file modified
+5 -1
@@ -86,7 +86,8 @@ 

  %files -n koji-builder-plugin-rpmautospec

  %{_prefix}/lib/koji-builder-plugins/*

  

- # Package the placeholder rpm-macros

+ %if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)

+ # Package the placeholder rpm-macros (moved to redhat-rpm-config in F40)

  

  %package -n rpmautospec-rpm-macros

  Summary: Rpmautospec RPM macros for local rpmbuild
@@ -97,6 +98,7 @@ 

  

  %files -n rpmautospec-rpm-macros

  %{rpmmacrodir}/macros.rpmautospec

+ %endif

  

  #--------------------------------------------------------

  
@@ -117,9 +119,11 @@ 

  

  %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/

  

+ %if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)

  # RPM macros

  mkdir -p %{buildroot}%{rpmmacrodir}

  install -m 644  rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/

+ %endif

  

  %check

  %pytest \

The macros were added to F40 (and hence ELN and RHEL 10) in redhat-rpm-config 264.

Pull-Request has been merged by yselkowitz

10 months ago
Metadata