[audacious-plugins] Fix thinko in the plugin-api %global, so src.rpm build does not fail.

Michael Schwendt mschwendt at fedoraproject.org
Thu Jan 27 12:52:44 UTC 2011


commit 3fe7d104bcb3a8da9c32a426abd470c31f8a397d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jan 27 13:52:33 2011 +0100

    Fix thinko in the plugin-api %global, so src.rpm build does not fail.

 audacious-plugins.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index de2739b..dde04f3 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -1,8 +1,13 @@
-# Minimum audacious/audacious-plugins version in inter-package
-# dependencies.
+%global aud_plugin_api %(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' %{_includedir}/audacious/plugin.h | sed 's!.*__AUDACIOUS_PLUGIN_API__[ ]*\\([0-9]\\+\\).*!\\1!')
+%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0)
+Requires: audacious(plugin-api) = %{aud_plugin_api}
+%endif
+
+# Minimum audacious/audacious-plugins version in inter-package dependencies.
 # We need at least 2.4.3 because of the plugin API change after 2.4.0
 # and in 2.4.3
 %global aud_ver 2.4.3
+Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.4.3
@@ -63,12 +68,6 @@ BuildRequires: libprojectM-devel gtkglext-devel
 # experimental, disabled by default
 BuildRequires: neon-devel
 
-# The minimum version of the base Audacious player to ensure
-# compatibility with these plugins.
-Requires: audacious >= %{aud_ver}
-
-Requires: audacious(plugin-api) = %(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' %{_includedir}/audacious/plugin.h | sed 's!.*__AUDACIOUS_PLUGIN_API__[ ]*\([0-9]\+\).*!\1!')
-
 # last tagged dist-f12-updates
 # obsolete old subpackage -- no reason to split this off
 Obsoletes: audacious-plugins-metronome < 2.2-2


More information about the scm-commits mailing list