rpms/gnash/OLPC-2 gnash.spec,1.22,1.23

[John (J5) Palmieri (johnp)]

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548

Modified Files:
	gnash.spec 
Log Message:
- fixed remaining bugs in the spec file by refrencing the devel branch



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnash.spec	12 Sep 2007 20:23:09 -0000	1.22
+++ gnash.spec	13 Sep 2007 20:08:46 -0000	1.23
@@ -4,7 +4,7 @@
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,29 +58,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnash/*.la
+#rm -f \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
 
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # don't package libltdl related files!
 rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
+ $RPM_BUILD_ROOT/%{_libdir}/gnash/libltdl* \
  $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+# asspec info isn't generated rightly
+rm -f \
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
 # omf is broken
 rm -rf \
  $RPM_BUILD_ROOT/%{_datadir}/omf
 # cygnal just segfaults
-rm -f \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm -f \
+# $RPM_BUILD_ROOT/%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -101,14 +104,14 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
+%{_libdir}/gnash/
 %{_mandir}/man1/gnash*
 %{_datadir}/gnash/
 
-
 %files plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/libgnashplugin.so