aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2023-01-15 14:16:18 +0200
committerJani Välimaa <wally@mageia.org>2023-01-15 14:16:18 +0200
commit7130b539c9a86d6c5feadabacb9ca7fc0791ae42 (patch)
treec47f998394fb09b0d3df6af4fe58f8ab8d4a8cff
parent28ccfb23e5ef6edf639cd0a48439f41fcc189aee (diff)
downloadrpm-setup-7130b539c9a86d6c5feadabacb9ca7fc0791ae42.tar
rpm-setup-7130b539c9a86d6c5feadabacb9ca7fc0791ae42.tar.gz
rpm-setup-7130b539c9a86d6c5feadabacb9ca7fc0791ae42.tar.bz2
rpm-setup-7130b539c9a86d6c5feadabacb9ca7fc0791ae42.tar.xz
rpm-setup-7130b539c9a86d6c5feadabacb9ca7fc0791ae42.zip
macros: drop unused %_sys_macros_dir and %build_sysmacrospath()
-rw-r--r--NEWS2
-rw-r--r--macros.in3
2 files changed, 2 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index b6d1bdd..d4f0e03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- macros: drop unused %_sys_macros_dir and %build_sysmacrospath()
+
Version 2.70 - 7 January 2023, by Jani Välimaa
- macros: drop separate macros.build and combine it with macros
diff --git a/macros.in b/macros.in
index 9a4d84e..083ac48 100644
--- a/macros.in
+++ b/macros.in
@@ -50,9 +50,6 @@
# activate filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers)
%_filetriggers_dir /var/lib/rpm/filetriggers
-%_sys_macros_dir @RPMSYSCONFDIR@/macros.d
-%build_sysmacrospath() %{_sys_macros_dir}/%{?1:%{1}}%{?!1:%{name}}.macros
-
# Various programs used in rpm scripts
%_update_icon_cache_bin %{_bindir}/gtk-update-icon-cache
%_gconftool_bin %{_bindir}/gconftool-2