? packaging/redhat/gnash.spec-pat
? doc/omf.make-warn_root
? doc/C/Makefile.am-conflict
? doc/C/gnash.1
? doc/C/gnash.info
? doc/C/gnash.texi
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.20
diff -u -3 -p -r1.20 Makefile.am
--- plugin/Makefile.am	20 Apr 2006 17:21:40 -0000	1.20
+++ plugin/Makefile.am	21 Apr 2006 22:27:01 -0000
@@ -106,8 +106,9 @@ AM_LDFLAGS  = $(X_LIBS) -lX11 -lXi -lXmu
 
 plugin_LTLIBRARIES = libgnashplugin.la
 
-noinst_HEADERS = plugin.h \
+noinst_HEADERS = plugin.h player.h \
 	 mozilla-sdk/pluginbase.h \
+	 mozilla-sdk/npplat.h \
          mozilla-sdk/include/jri.h \
 	 mozilla-sdk/include/npapi.h \
          mozilla-sdk/include/npupp.h \
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.3
diff -u -3 -p -r1.3 gnash.spec
--- packaging/redhat/gnash.spec	20 Apr 2006 17:21:40 -0000	1.3
+++ packaging/redhat/gnash.spec	21 Apr 2006 22:27:01 -0000
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.7
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Internet
@@ -30,6 +30,8 @@ Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
@@ -64,10 +66,7 @@ Group:     Applications/Multimedia
 The gnash flash movie player plugin for Konqueror.
 
 %prep
-%setup -q -n %{name}-%{version}
-#%patch1 -p1 -b .1
-#%%patch2 -p1 -b .2
-#./autogen.sh
+%setup -q
 
 %build
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
@@ -89,12 +88,17 @@ rm -rf $RPM_BUILD_ROOT
 %post 
 /sbin/ldconfig
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+/sbin/install-info  --menuentry="Gnash" --description="GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -107,6 +111,7 @@ scrollkeeper-update -q || :
 %{_mandir}/man1/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
+%{_infodir}/gnash*
 
 %files devel
 %defattr(-,root,root,-)
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.20
diff -u -3 -p -r1.20 Makefile.am
--- doc/C/Makefile.am	21 Apr 2006 17:20:55 -0000	1.20
+++ doc/C/Makefile.am	21 Apr 2006 22:27:01 -0000
@@ -177,8 +177,11 @@ MAINTAINERCLEANFILES = \
         gnash.html
 
 install-info-hook: gnash.info
+	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
 	$(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/
-	install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info
+	if (install-info --version) >/dev/null 2>&1; then \
+	   install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info ; \
+	fi
 
 uninstall-info-hook:
 	$(RM) $(DESTDIR)$(infodir)/gnash.info