packages: mythplugins/mythplugins.spec - %define are expanded before checki...

[pawelz]

Author: pawelz                       Date: Sat Sep 25 21:01:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %define are expanded before checking BRs, so %define cannot rely on BR

---- Files affected:
packages/mythplugins:
   mythplugins.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: packages/mythplugins/mythplugins.spec
diff -u packages/mythplugins/mythplugins.spec:1.60 packages/mythplugins/mythplugins.spec:1.61
--- packages/mythplugins/mythplugins.spec:1.60	Fri Sep 24 19:03:00 2010
+++ packages/mythplugins/mythplugins.spec	Sat Sep 25 23:01:31 2010
@@ -120,7 +120,7 @@
 ExclusiveArch:	%{ix86} %{x8664} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		myth_api_version %(awk '/LIBVERSION/{print $3}' %{_datadir}/mythtv/build/settings.pro | cut -d. -f1,2 2>/dev/null || echo ERROR)
+%define     myth_api_version %%(awk '/LIBVERSION/{print $3}' %{_datadir}/mythtv/build/settings.pro | cut -d. -f1,2 2>/dev/null || echo ERROR)
 %define		_webapps	/etc/webapps
 %define		_webapp		mythweb
 
@@ -138,7 +138,7 @@
 Group:		Applications/Multimedia
 Requires:	dvdauthor
 Requires:	mjpegtools
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 Requires:	python-MySQLdb
 Requires:	python-PIL
 Suggests:	dvdrtools-mkisofs
@@ -163,7 +163,7 @@
 Summary(pl.UTF-8):	Moduł odtwarzacza muzyki dla MythTV
 Group:		Applications/Multimedia
 BuildRequires:	libvisual-devel
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythmusic
 Music add-on for MythTV. Support playlists, visualisations, tag editing
@@ -180,7 +180,7 @@
 Summary(pl.UTF-8):	Moduł ogólnego interfejsu do odtwarzania obrazu dla MythTV
 Group:		Applications/Multimedia
 Requires:	mplayer
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythvideo
 A generic video and dvd player frontend module for MythTV.
@@ -192,7 +192,7 @@
 Summary:	A MythTV module that displays a weather forcast
 Summary(pl.UTF-8):	Moduł MythTV wyświetlający prognozę pogody
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythweather
 A MythTV module that displays a weather forcast.
@@ -204,7 +204,7 @@
 Summary:	A gallery/slideshow module for MythTV
 Summary(pl.UTF-8):	Moduł galerii/pokazu slajdów dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythgallery
 A gallery/slideshow module for MythTV.
@@ -216,7 +216,7 @@
 Summary:	A game frontend (xmame, nes, snes, pc) for MythTV
 Summary(pl.UTF-8):	Interfejs do gier (xmame, nes, snes, pc) dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythgame
 A game frontend (xmame, nes, snes, pc) for MythTV.
@@ -228,7 +228,7 @@
 Summary:	A DVD ripper module for MythTV
 Summary(pl.UTF-8):	Moduł rippujący DVD dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 Requires:	mythvideo
 Requires:	transcode >= 0.6.8
 
@@ -251,7 +251,7 @@
 Summary:	A RSS News Feed plugin for MythTV
 Summary(pl.UTF-8):	Wtyczka czytnika nowinek RSS dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythnews
 A RSS News Feed plugin for MythTV.
@@ -263,7 +263,7 @@
 Summary:	A small web browser module for MythTV
 Summary(pl.UTF-8):	Moduł małej przeglądarki WWW dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythbrowser
 MythBrowser is a full fledged web-browser (multiple tabs) to display
@@ -305,7 +305,7 @@
 Summary:	Mythtv extension to watch network movie shows
 Summary(pl.UTF-8):	Dodatek do MythTV do oglądania sieciowych transmisji
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 Requires:	mythbrowser
 
 %description -n mythnetvision
@@ -319,7 +319,7 @@
 Summary:	MythTV cinemas timetable
 Summary(pl.UTF-8):	Moduł MythTV do repertuaru kinowego
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythmovies
 MythTV cinemas timetable.
@@ -332,7 +332,7 @@
 Summary:	MythTV security TV manager
 Summary(pl.UTF-8):	Obsługa kamer przemysłowych dla MythTV
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	mythtv-frontend-api = %{expand:myth_api_version}
 
 %description -n mythzoneminder
 MythTV security TV manager.
@@ -757,6 +757,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2010/09/25 21:01:31  pawelz
+- %define are expanded before checking BRs, so %define cannot rely on BR
+
 Revision 1.60  2010/09/24 17:03:00  w.kier
 - redefined mythtv-frontend-api to not include developer release version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythplugins/mythplugins.spec?r1=1.60&r2=1.61&f=u