Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.8
diff -u -3 -p -r1.8 gnash.spec
--- packaging/redhat/gnash.spec	5 May 2006 22:17:53 -0000	1.8
+++ packaging/redhat/gnash.spec	28 Aug 2006 10:45:44 -0000
@@ -1,12 +1,12 @@
 Name:           gnash
-Version:        0.7
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        GNU flash movie player
 
-Group:          Applications/Internet
+Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://www.gnu.org/software/gnash/releases/%{name}-%{version}.%{release}.tar.gz
+Source0:        http://www.gnu.org/software/gnash/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -37,22 +37,11 @@ Requires(preun): /sbin/install-info
 Gnash is a GNU Flash movie player based on GameSWF,
 and supports many SWF v7 features.
 
-%package devel
-Summary:   Header files for gnash libraries
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-
-%description devel
-# actually there are no headers, as Gnash isn't really an API
-# for other applications, so this package is rather pointless
-This package contains all the files needed to develop applications that
-will use the gnash libraries.
-
 %package plugin
 Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
 Requires:  webclient
-Group:     Applications/Multimedia
+Group:     Applications/Internet
 
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
@@ -66,19 +55,22 @@ Group:     Applications/Multimedia
 The gnash flash movie player plugin for Konqueror.
 
 %prep
-%setup -q -n gnash-%{version}.%{release}
+%setup -q
 
 %build
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-klash --disable-dependency-tracking
-#make %{?_smp_mflags}
-make
+  --enable-ghelp --enable-docbook --enable-klash --enable-plugin \
+  --disable-dependency-tracking --disable-rpath \
+  --with-qtdir=$QTDIR
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.so
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -114,23 +106,19 @@ scrollkeeper-update -q || :
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
 
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libgnash*.so
-
 %files plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
 %files klash
-%{_libdir}/kde3/libklashpart.*
+%defattr(-,root,root,-)
 %{_bindir}/klash
+%{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 %{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
 %changelog
-
 * Sat Apr  22 2006 Rob Savoye <address@hidden> - 0.7-1
 - install the info file. Various tweaks for my system based on
 Patrice's latest patch,