aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2019-12-27 23:22:30 +0200
committerJani Välimaa <wally@mageia.org>2019-12-27 23:22:30 +0200
commit26fcbeb77f1e982a8a8d5ff73947eb0210b71fba (patch)
tree9a0a43ee02a8addea41e90ad131a399b5b378c0d
parent42154015211347afcc2c33d3f913ecc1f0ae061e (diff)
downloadrpm-setup-26fcbeb77f1e982a8a8d5ff73947eb0210b71fba.tar
rpm-setup-26fcbeb77f1e982a8a8d5ff73947eb0210b71fba.tar.gz
rpm-setup-26fcbeb77f1e982a8a8d5ff73947eb0210b71fba.tar.bz2
rpm-setup-26fcbeb77f1e982a8a8d5ff73947eb0210b71fba.tar.xz
rpm-setup-26fcbeb77f1e982a8a8d5ff73947eb0210b71fba.zip
build.macros: drop deprecated and unused macros
-rw-r--r--NEWS9
-rw-r--r--build.macros.in10
2 files changed, 9 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 9e2124b..d7f3251 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+- build.macros: drop deprecated and unused macros
+ - update_menus
+ - clean_menus
+ - update_desktop_database
+ - clean_desktop_database
+ - update_mime_database
+ - clean_mime_database
+ - update_scrollkeeper
+ - clean_scrollkeeper
- build.macros: use rpm built-in %{warn:...} macro for deprecation warnings
- remove unused git-repository--after-tarball and git-repository--apply-patch
- build.macros: remove %_after_setup leftovers after
diff --git a/build.macros.in b/build.macros.in
index a48fa9c..df65a81 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -62,16 +62,6 @@
# Note: Disable (by commenting out) for legacy compatibility.
#%__check_multiarch_files @RPMLIBDIR@/check-multiarch-files %{buildroot}
-# stuff below has been deprecated by rpm filetriggers [June 2008]
-%update_menus %{nil}
-%clean_menus %{nil}
-%update_desktop_database %{nil}
-%clean_desktop_database %{nil}
-%update_mime_database %{nil}
-%clean_mime_database %{nil}
-%update_scrollkeeper %{nil}
-%clean_scrollkeeper %{nil}
-
# Update Menu
%_update_menus_bin %{_bindir}/update-menus