[Gnash-commit] gnash ./ChangeLog packaging/redhat/gnash.spec d...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/23 02:51:44

Modified files:
        .              : ChangeLog 
        packaging/redhat: gnash.spec 
        doc            : omf.make xmldocs.make 
        doc/C          : Makefile.am 

Log message:
        * doc/omf.make: Rename omf-hook to be more consistant.
        * doc/xmldocs.make: Set enable-ghelp and enable-docbook together.
        * doc/C/Makefile.am: Use /sbin/install-info. Don't try to run
        install-info if it doesn't exist.
        * packaging/redhat/gnash.spec: Remove the info/dir file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.224&tr2=1.225&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/redhat/gnash.spec.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/xmldocs.make.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.224 gnash/ChangeLog:1.225
--- gnash/ChangeLog:1.224       Sat Apr 22 23:39:16 2006
+++ gnash/ChangeLog     Sun Apr 23 02:51:44 2006
@@ -1,5 +1,11 @@
 2006-04-22  Rob Savoye  <address@hidden>
 
+       * doc/omf.make: Rename omf-hook to be more consistant.
+       * doc/xmldocs.make: Set enable-ghelp and enable-docbook together.
+       * doc/C/Makefile.am: Use /sbin/install-info. Don't try to run
+       install-info if it doesn't exist.
+       * packaging/redhat/gnash.spec: Remove the info/dir file.
+
        * macros/atk.m4: Look for libraries in /usr/X11R6/lib, and headers
        in /usr/X11R6/include.
        * macros/gtk2.m4: Look for libraries in /usr/X11R6/lib, and
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.23 gnash/doc/C/Makefile.am:1.24
--- gnash/doc/C/Makefile.am:1.23        Sat Apr 22 00:01:26 2006
+++ gnash/doc/C/Makefile.am     Sun Apr 23 02:51:44 2006
@@ -178,15 +178,16 @@
 
 install-info-hook: gnash.info
        test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) 
"$(DESTDIR)$(infodir)"
-       $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info
-       version=`install-info --version | grep -c 'GNU texinfo'`; \
-       if test $$version -eq 0; then \
-          install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 
2>&1; \
-       else \
-          install-info --entry="* Gnash: (gnash). GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 
2>&1; \
+       $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info ; \
+         if (/sbin/install-info --version) >/dev/null 2>&1; then \
+         version=`install-info --version | grep -c 'GNU texinfo'`; \
+         if test $$version -eq 0; then \
+           /sbin/install-info --menuentry="Gnash" --description="GNU Flash 
Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info 
>/dev/null 2>&1; \
+         else \
+           /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 
2>&1; \
+         fi; \
        fi
 
-
 uninstall-info-hook:
        $(RM) $(DESTDIR)$(infodir)/gnash.info
 
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.8 gnash/doc/omf.make:1.9
--- gnash/doc/omf.make:1.8      Fri Apr  7 00:59:42 2006
+++ gnash/doc/omf.make  Sun Apr 23 02:51:44 2006
@@ -37,14 +37,14 @@
        done
        touch omf_timestamp
 
-install-data-hook-omf:
+install-data-omf-hook:
        $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
        for file in $(omffile); do \
          $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
        done
        $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o 
$(DESTDIR)$(omf_dest_dir)
 
-uninstall-local-omf:
+uninstall-omf-hook:
        -for file in $(omffile); do \
            $(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \
        done
Index: gnash/doc/xmldocs.make
diff -u gnash/doc/xmldocs.make:1.6 gnash/doc/xmldocs.make:1.7
--- gnash/doc/xmldocs.make:1.6  Fri Apr 21 17:20:55 2006
+++ gnash/doc/xmldocs.make      Sun Apr 23 02:51:44 2006
@@ -95,13 +95,19 @@
        -$(RM) -r $(DESTDIR)$(docdir)/images
        -rmdir $(DESTDIR)$(docdir)
 
+INSTALL_DATA_HOOK = 
+UNINSTALL_HOOK =
+
 if GHELP
 all-local: omf
-install-data-hook: omf install-data-hook-omf
-uninstall-hook: uninstall-hook-omf
+INSTALL_DATA_HOOK += omf install-data-omf-hook
+UNINSTALL_HOOK += uninstall-omf-hook
 endif
 
 if ENABLE_TEXI
-install-data-hook: install-info-hook
-uninstall-hook: uninstall-info-hook
+INSTALL_DATA_HOOK += install-info-hook
+UNINSTALL_HOOK += uninstall-info-hook
 endif
+
+install-data-hook: $(INSTALL_DATA_HOOK)
+uninstall-hook: $(UNINSTALL_HOOK)
Index: gnash/packaging/redhat/gnash.spec
diff -u gnash/packaging/redhat/gnash.spec:1.5 
gnash/packaging/redhat/gnash.spec:1.6
--- gnash/packaging/redhat/gnash.spec:1.5       Sat Apr 22 00:32:44 2006
+++ gnash/packaging/redhat/gnash.spec   Sun Apr 23 02:51:44 2006
@@ -80,6 +80,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,7 +89,7 @@
 %post 
 /sbin/ldconfig
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-/sbin/install-info  --menuentry="Gnash" --description="GNU Flash Player" 
%{_infodir}/%{name}.info %{_infodir}/dir || :
+/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" 
%{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
@@ -99,7 +100,6 @@
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -111,7 +111,6 @@
 %{_libdir}/libgnash*.so.*
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
-%{_infodir}/dir
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
 
@@ -130,5 +129,11 @@
 %{_datadir}/services/klash_part.desktop
 
 %changelog
-* Fri Feb  3 2006 Patrice Dumas <address@hidden> - 0.7-1
+
+* 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,
+
+* Fri Feb  3 2006 Patrice Dumas <address@hidden> - 0.7-0
 - initial packaging
+