[Gnash-commit] /srv/bzr/gnash/trunk r11494: don't use qt3 script with qt4 builds. Add versions for kde dependencies.

[Rob Savoye]

------------------------------------------------------------
revno: 11494
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2009-09-08 11:26:47 -0600
message:
  don't use qt3 script with qt4 builds. Add versions for kde dependencies.
modified:
  packaging/redhat/gnash.spec

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2009-09-07 23:25:28 +0000
+++ b/packaging/redhat/gnash.spec       2009-09-08 17:26:47 +0000
@@ -17,10 +17,10 @@
 BuildRequires:  gtk2-devel glib2-devel
 BuildRequires:  atk-devel pango-devel openssl-devel
 BuildRequires:  agg-devel boost-devel curl-devel libXt-devel
-BuildRequires:  SDL-devel pygtk2-devel libungif-devel
-BuildRequires:  gstreamer-devel gstreamer-ffmpeg gstreamer-plugins-base-devel
+BuildRequires:  pygtk2-devel giflib-devel
+BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 # These are for the kde4 support
-BuildRequires:  kdelibs-devel kdebase-devel qt-devel
+BuildRequires:  kdelibs-devel >= 4.0, kdebase-devel >= 4.0, qt-devel >= 4.0
 
 # YellowDog doesn't ship ffmpeg
 %if %{distribution} != "ydl6"
@@ -35,6 +35,7 @@
 
 # Installation requirements
 Requires: libpng libjpeg libogg gtk2 glib2 atk pango
+Requires:  gstreamer gstreamer-ffmpeg gstreamer-plugins-base
 # Mandriva uses differ names for the X11 library packages
 %if %{distribution} != "fc11"
 Requires: libx11_6 libxt_6
@@ -93,7 +94,7 @@
 %package klash4
 Summary:   Konqueror SWF player plugin for KDE 4
 Requires:  %{name} = %{version}-%{release}
-Requires:  kdelibs kdelibs qt gnash
+Requires:  kdelibs >= 4, kdebase >= 4, qt >= 4, gnash
 Group:     Applications/Multimedia
 
 %description klash4
@@ -104,7 +105,8 @@
 
 %build
 
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+# For QT3
+# [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 
 # handle cross building rpms. This gets messy when building for two
 # archtectures with the same CPU type, like x86-Linux -> OLPC. We have