X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.macros;h=dfebf636f2989c4691f985ec996dc1bd627b9542;hp=402f5883fba9c334efe54388d559a16b054dbac6;hb=c940d7763dbbadc077c4d8cba3a00f8d69f1f4bb;hpb=96e5899786aa5a211194a06f38f0d6dbb3f7c41e

diff --git a/rpm.macros b/rpm.macros
index 402f588..dfebf63 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -520,13 +520,15 @@ fi; }; __spec_install_post_chrpath } } }
 #
 %gconf_schema_install() \
 	umask 022; \
-	GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null; \
+	GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \\\
+	/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null; \
 %{nil}
 
 %gconf_schema_uninstall() \
-if [ $1 = 0 ]; then \
+if [ $1 = 0 -a -x /usr/bin/gconftool-2 ]; then \
 	umask 022; \
-	GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" /usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{?1} > /dev/null \
+	GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \\\
+	/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{?1} > /dev/null \
 fi; \
 %{nil}
 
@@ -1310,7 +1312,7 @@ for cfg in ${cfgs:-dist}; do                                        \
 	[ -z "$PATCH_SH" ] || echo "$PATCH_SH" | %__spec_build_shell	\
 	set -x															\
 																	\
-	%if %{with dist_kernel}											\
+	%if %{with dist_kernel}	|| %(test -f %{_kernelsrcdir}/scripts/bin2c ; echo $?)	\
 		%{__make} -j1 -C %{_kernelsrcdir} prepare scripts			\\\
 			%{-p*} %{-P*}											\\\
 			%{MakeOpts}												\