aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-13 06:59:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-13 06:59:29 +0000
commit6b50f4b1f3332dfc4b49d1c26dd760979bf52c9f (patch)
tree8b47f49bd628ce1a2f94c01ad27bb46153549616
parent3154ba03c219bcbfb6a7f09cf37f60a0342e5e2a (diff)
1.80: macros deprecated by rpm filetriggers now return nothing1.80
-rw-r--r--build.macros.in71
-rw-r--r--configure.ac2
2 files changed, 18 insertions, 55 deletions
diff --git a/build.macros.in b/build.macros.in
index 55c25b5..45a1d59 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -79,19 +79,24 @@ Group: %{group}\
%find_lang @RPMVENDORDIR@/find-lang.pl %{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_icon_cache %{nil}
+%clean_icon_cache %{nil}
+%update_scrollkeeper %{nil}
+%clean_scrollkeeper %{nil}
+
# Update Menu
%_update_menus_bin %{_bindir}/update-menus
-%update_menus if [ -x %{_update_menus_bin} ]; then %{_update_menus_bin} || true ; fi \
-%{nil}
-
-# Clean Menu
-%clean_menus if [ "$1" = "0" -a -x %{_update_menus_bin} ]; then %{_update_menus_bin} || true ; fi \
-%{nil}
# Update Window Managers session.
%_fndsession_bin %{_sbindir}/fndSession
-%make_session if [ -x %{_fndsession_bin} ]; then %{_fndsession_bin} || true ; fi \
-%{nil}
+%make_session %{nil}
# For rebuilding gcj-db
%_rebuildgcjdb_bin %{_bindir}/rebuild-gcj-db
@@ -101,43 +106,10 @@ Group: %{group}\
%clean_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
%{nil}
-# Rebuild .desktop / MIME mapping database
-%update_desktop_database if [ -x %{_update_desktop_database_bin} ]; then \
-%{_update_desktop_database_bin} %{_datadir}/applications > /dev/null || \
-true ; fi \
-%{nil}
-
-%clean_desktop_database if [ "$1" = "0" -a -x %{_update_desktop_database_bin} ]; then \
-%{_update_desktop_database_bin} %{_datadir}/applications > /dev/null || true ; fi \
-%{nil}
-
-# Rebuild freedesktop.org MIME magic/extension database
-%update_mime_database if [ -x %{_update_mime_database_bin} ]; then \
-%{_update_mime_database_bin} %{_datadir}/mime > /dev/null || true ; fi \
-%{nil}
-
-%clean_mime_database if [ "$1" = "0" -a -x %{_update_mime_database_bin} ]; \
-then %{_update_mime_database_bin} %{_datadir}/mime > /dev/null || true ; fi \
-%{nil}
-
-# Rebuild icon cache
-%update_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
-%{_update_icon_cache_bin} --force --quiet %{_iconsdir}/%{1} || true; fi \
-%{nil}
-
-%clean_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_iconsdir}/%{1}/index.theme ]; then \
-%{_update_icon_cache_bin} --force --quiet %{_iconsdir}/%{1} || true ; fi \
-%{nil}
-
-# Install GConf schemas
-%post_install_gconf_schemas() if [ -x %{_gconftool_bin} ]; then \
-SCHEMAS="" \
-for SCHEMA in %{*} ; do \
- SCHEMAS="$SCHEMAS %{_sysconfdir}/gconf/schemas/$SCHEMA.schemas" \
-done \
-GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-install-rule $SCHEMAS > /dev/null || true ; fi \
-%{nil}
-
+# GConf schemas:
+# installation is handled by filetriggers
+%post_install_gconf_schemas %{nil}
+# but uninstall still need to be done in %preun:
%preun_uninstall_gconf_schemas() if [ "$1" = "0" -a -x %{_gconftool_bin} ]; then \
SCHEMAS="" \
for SCHEMA in %{*} ; do \
@@ -146,15 +118,6 @@ done \
GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-uninstall-rule $SCHEMAS > /dev/null || true ; fi \
%{nil}
-# Rebuild scrollkeeper database
-%update_scrollkeeper if [ -x %{_scrollkeeper_bin} ]; then \
-%{_scrollkeeper_bin} -q || true ; fi \
-%{nil}
-
-%clean_scrollkeeper if [ "$1" = "0" -a -x %{_scrollkeeper_bin} ]; \
-then %{_scrollkeeper_bin} -q || true ; fi \
-%{nil}
-
# Mandriva Linux version
# - "9.1" => 910
# - "10.2.2" => 1022
diff --git a/configure.ac b/configure.ac
index 038a2f8..ccf1cb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.79, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.80, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR