Due to huge amount of bots taking interest in registering here registration is now invite-only. Any user can make an invite, you need to create it here and give resulting link to someone to register.
avatar
mikhailnov has added b5db950a83
Use universal macro installation for both RPM 4 and RPM 5

%%install_macro has been added to the RPM 4 package,
%%install_macro and %%_rpmacrodir will be added to RPM 5.

... ... --- a/waf.spec
... ... +++ b/waf.spec
... ... @@ -12,7 +12,7 @@
12 12
Summary:	A framework for configuring, compiling and installing applications
13 13
Name:		waf
14 14
Version:	2.0.14
15
Release:	2
15
Release:	3
16 16
License:	BSD
17 17
Group:		Development/Tools
18 18
Url:		https://waf.io/
... ... @@ -51,7 +51,7 @@ Scons, Autotools, CMake, and Ant.
51 51
52 52
%files 
53 53
%doc README.md
54
%{_sysconfdir}/rpm/macros.d/%{name}.macros
54
%{_rpmmacrodir}/*%{name}*
55 55
%{_bindir}/%{name}
56 56
%{_bindir}/%{name}-%{python_version}
57 57
%{_datadir}/%{name}
... ... @@ -88,7 +88,7 @@ This package contains the Python 3 version of %{name}.
88 88
89 89
%files -n %{name}-python3
90 90
%doc README.md
91
%{_sysconfdir}/rpm/macros.d/%{name}-python3.macros
91
%{_rpmmacrodir}/*%{name}-python3*
92 92
%{_bindir}/waf-%{python3_version}
93 93
%{_datadir}/waf3
94 94
%endif
... ... @@ -176,9 +176,9 @@ find demos utils -type f -exec chmod 0644 {} \;
176 176
rm -f docs/sphinx/build/html/.buildinfo
177 177
178 178
# Install waf rpm macro helpers
179
install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.d/%{name}.macros
179
%install_macro %{name} %{SOURCE1}
180 180
%if %{build_py3}
181
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.d/%{name}-python3.macros
181
%install_macro %{name}-python3 %{SOURCE2}
182 182
%endif
183 183
184 184
# Do byte compilation

Comments