SOURCES (AC-branch): rpm.macros, rpm.macros - hide errors from mis...

[glen]

Author: glen                         Date: Fri Sep 16 11:56:50 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- hide errors from missing xmms-config

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.61 -> 1.158.4.62) 
SOURCES:
   rpm.macros (1.239 -> 1.240) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.61 SOURCES/rpm.macros:1.158.4.62
--- SOURCES/rpm.macros:1.158.4.61	Thu Sep 15 19:20:02 2005
+++ SOURCES/rpm.macros	Fri Sep 16 13:56:45 2005
@@ -548,16 +548,16 @@
 }
 
 # XMMS specific macros
-%xmms_prefix                  %(xmms-config --prefix)
-%xmms_exec_prefix             %(xmms-config --exec-prefix)
-%xmms_version                 %(xmms-config --version)
-%xmms_datadir                 %(xmms-config --data-dir)
-%xmms_plugindir               %(xmms-config --plugin-dir)
-%xmms_visualization_plugindir %(xmms-config --visualization-plugin-dir)
-%xmms_input_plugindir         %(xmms-config --input-plugin-dir)
-%xmms_output_plugindir        %(xmms-config --output-plugin-dir)
-%xmms_effect_plugindir        %(xmms-config --effect-plugin-dir)
-%xmms_general_plugindir       %(xmms-config --general-plugin-dir)
+%xmms_prefix                  %(xmms-config --prefix 2>/dev/null)
+%xmms_exec_prefix             %(xmms-config --exec-prefix 2>/dev/null)
+%xmms_version                 %(xmms-config --version 2>/dev/null)
+%xmms_datadir                 %(xmms-config --data-dir 2>/dev/null)
+%xmms_plugindir               %(xmms-config --plugin-dir 2>/dev/null)
+%xmms_visualization_plugindir %(xmms-config --visualization-plugin-dir 2>/dev/null)
+%xmms_input_plugindir         %(xmms-config --input-plugin-dir 2>/dev/null)
+%xmms_output_plugindir        %(xmms-config --output-plugin-dir 2>/dev/null)
+%xmms_effect_plugindir        %(xmms-config --effect-plugin-dir 2>/dev/null)
+%xmms_general_plugindir       %(xmms-config --general-plugin-dir 2>/dev/null)
 
 %_target_base_arch	%(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/')
 

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.239 SOURCES/rpm.macros:1.240
--- SOURCES/rpm.macros:1.239	Thu Sep 15 19:20:03 2005
+++ SOURCES/rpm.macros	Fri Sep 16 13:56:45 2005
@@ -549,16 +549,16 @@
 }
 
 # XMMS specific macros
-%xmms_prefix                  %(xmms-config --prefix)
-%xmms_exec_prefix             %(xmms-config --exec-prefix)
-%xmms_version                 %(xmms-config --version)
-%xmms_datadir                 %(xmms-config --data-dir)
-%xmms_plugindir               %(xmms-config --plugin-dir)
-%xmms_visualization_plugindir %(xmms-config --visualization-plugin-dir)
-%xmms_input_plugindir         %(xmms-config --input-plugin-dir)
-%xmms_output_plugindir        %(xmms-config --output-plugin-dir)
-%xmms_effect_plugindir        %(xmms-config --effect-plugin-dir)
-%xmms_general_plugindir       %(xmms-config --general-plugin-dir)
+%xmms_prefix                  %(xmms-config --prefix 2>/dev/null)
+%xmms_exec_prefix             %(xmms-config --exec-prefix 2>/dev/null)
+%xmms_version                 %(xmms-config --version 2>/dev/null)
+%xmms_datadir                 %(xmms-config --data-dir 2>/dev/null)
+%xmms_plugindir               %(xmms-config --plugin-dir 2>/dev/null)
+%xmms_visualization_plugindir %(xmms-config --visualization-plugin-dir 2>/dev/null)
+%xmms_input_plugindir         %(xmms-config --input-plugin-dir 2>/dev/null)
+%xmms_output_plugindir        %(xmms-config --output-plugin-dir 2>/dev/null)
+%xmms_effect_plugindir        %(xmms-config --effect-plugin-dir 2>/dev/null)
+%xmms_general_plugindir       %(xmms-config --general-plugin-dir 2>/dev/null)
 
 %_target_base_arch	%(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/')
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.61&r2=1.158.4.62&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.239&r2=1.240&f=u