From f00f72b18133aca0b3698df928e8d2d43406508bfe1a0ca697cb1284b59bbca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rostecki?= Date: Wed, 8 May 2019 12:16:10 +0000 Subject: [PATCH] Accepting request 701536 from home:dimstar:Factory Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701536 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=93 --- firewalld.changes | 5 +++++ firewalld.spec | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/firewalld.changes b/firewalld.changes index 2e2f159..994f47e 100644 --- a/firewalld.changes +++ b/firewalld.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 09:39:08 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Thu Mar 28 14:29:54 UTC 2019 - Dominique Leuenberger diff --git a/firewalld.spec b/firewalld.spec index 1d06ea2..59dba7a 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -154,10 +154,6 @@ rm %{buildroot}%{_sysconfdir}/sysconfig/firewalld ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld -# Put RPM macros into /etc/rpm/ -rm %{buildroot}%{_rpmconfigdir}/macros.d/macros.firewalld -install -D -m644 config/macros.firewalld %{buildroot}%{_sysconfdir}/rpm/macros.firewalld - %fdupes %{buildroot}%{python3_sitelib} %find_lang %{name} --all-name @@ -271,7 +267,7 @@ fi %{python3_sitelib}/firewall/server/__pycache__/*.py* %files -n firewall-macros -%config %{_sysconfdir}/rpm/macros.firewalld +%{_rpmmacrodir}/macros.firewalld %files -n firewall-applet %attr(0755,root,root) %{_bindir}/firewall-applet