[Gnash-commit] gnash doc/C/Makefile.am packaging/redhat/gnash....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/03 02:54:21

Modified files:
        doc/C          : Makefile.am 
        packaging/redhat: gnash.spec 
        .              : Makefile.am configure.ac 

Log message:
                * packaging/redhat/gnash.spec: Update for current layout.
                * configure.ac: Add a --disable-testsuite option for package
                builders. This spends builds up, and we already tested Gnash
                before packaging, right ?
                * Makefile.am: Always include testsuite directory, but don't 
add it
                to SUBDIRS. Install the packaging files.
                * doc/C/Makefile.am: Add some extra dependencies to keep 
distcheck
                happy.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.490&r2=1.491

Patches:
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- doc/C/Makefile.am   2 Mar 2008 23:39:24 -0000       1.65
+++ doc/C/Makefile.am   3 Mar 2008 02:54:21 -0000       1.66
@@ -224,6 +224,16 @@
          echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
          $(LN_S) -f $(srcdir)/preformatted/gnash_ref.info.in ./gnashref.info; \
        fi
+gnashref.html: gnashref.xml
+       @if test -d $(srcdir)/preformatted; then \
+         echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
+         $(LN_S) -f $(srcdir)/preformatted/gnash_ref.html.in ./gnashref.html; \
+       fi
+gnashref.html: gnashref.xml
+       @if test -d $(srcdir)/preformatted; then \
+         echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
+         $(LN_S) -f $(srcdir)/preformatted/gnash_user.html.in 
./gnashuser.html; \
+       fi
 endif
 
 # When we build in a seperate build tree, we need links to the images
@@ -258,10 +268,10 @@
 # documentation.
 #
 
-install-html-hook: gnashuser.html gnashref.html
+install-html-hook: $(HTMLS)
        @test -d "$(DESTDIR)$(htmldir)" || $(mkinstalldirs) 
"$(DESTDIR)$(htmldir)"
-       $(INSTALL_DATA) gnashuser.html $(DESTDIR)$(htmldir)
-       $(INSTALL_DATA) gnashref.html $(DESTDIR)$(htmldir)
+       -$(INSTALL_DATA) gnashuser.html $(DESTDIR)$(htmldir)
+       -$(INSTALL_DATA) gnashref.html $(DESTDIR)$(htmldir)
        @test -d "$(DESTDIR)$(htmldir)/images" || $(mkinstalldirs) 
"$(DESTDIR)$(htmldir)/images"
        for file in $(srcdir)/images/*.png; do \
          basefile=`echo $$file | sed -e  's,^.*/,,'`; \
@@ -271,10 +281,10 @@
 # There are two versions of install-info, with unfortunately different options.
 # Rather than test the version at configure time, we do it at runtime instead
 # so we can switch versions at installation time.
-install-info-hook: 
+install-info-hook: $(INFOS)
 if ENABLE_INFO
        @test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) 
"$(DESTDIR)$(infodir)"
-       for i in *.info; do \
+       -for i in *.info; do \
          $(INSTALL_DATA) "$$i" $(DESTDIR)$(infodir)/"$$i"; \
        done; \
        type="`file $(INSTALL_INFO) | grep -ic " perl " 2>&1`"; \

Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- packaging/redhat/gnash.spec 14 Feb 2008 01:11:14 -0000      1.19
+++ packaging/redhat/gnash.spec 3 Mar 2008 02:54:21 -0000       1.20
@@ -1,4 +1,4 @@
-%define version 20080104
+%define version 20080216
 Name:           gnash
 Version:        %{version}cvs
 Release:        1%{?dist}
@@ -15,22 +15,21 @@
 #AutoReqProv: no
 
 BuildRequires:  libpng-devel libjpeg-devel libogg-devel
-BuildRequires:  gtk2-devel libX11-devel libXt-devel
-# BuildRequires:  agg-devel libxml2-devel boost-devel curl-devel libXt-devel
-# the opengl devel packages are required by gtkglext-devel
-# monolithic Xorg
-#BuildRequires:  xorg-x11-devel
-# modular Xorg 
-#BuildRequires:  libGLU-devel libGL-devel
-#BuildRequires:  gtkglext-devel
-BuildRequires:  mysql-devel mysqlclient14-devel
+BuildRequires:  gtk2-devel libX11-devel libXt-devel glib2-devel
+BuildRequires:  cairo-devel atk-devel pango-devel
+BuildRequires:  agg-devel libxml2-devel boost-devel curl-devel libXt-devel
+# the opengl devel packages are required by monolithic Xorg
+BuildRequires:  xorg-x11-proto-devel gtkglext-devel
+BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel
-BuildRequires:  kdelibs-devel
-BuildRequires:  docbook2X
-BuildRequires:  gstreamer >= 0.10
+BuildRequires:  kdelibs-devel kdebase-devel qt-devel
+BuildRequires:  gstreamer >= 0.10, gstreamer-ffmpeg
+
 # Installation requirements
 Requires: gstreamer >= 0.10
 Requires: gstreamer-plugins-base, gstreamer-plugins-ugly, gstreamer-plugins-bad
+Requires: gtk2 libX11 libpng libjpeg cairo atk pango Xt
+
 # BuildRequires:  scrollkeeper
 
 #Requires(post): scrollkeeper
@@ -46,7 +45,7 @@
 %package plugin
 Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
-Requires:  xulrunner
+Requires: gstreamer >= 0.10 gnash
 Group:     Applications/Internet
 
 %description plugin
@@ -55,6 +54,7 @@
 %package klash
 Summary:   Konqueror flash movie player plugin
 Requires:  %{name} = %{version}-%{release}
+Requires:  kdelibs kdelibs qt gnash
 Group:     Applications/Multimedia
 
 %description klash
@@ -86,13 +86,14 @@
 %else
 %define cross_compile 0
 %endif
-%{?do_cross_compile:%define cross_compile 1}
+# if not defined, assume this is a native package.
+%{?do_cross_compile:%define cross_compile 0}
 
 # FIXME: this ia a bad hack! Although all this does work correctly and
 # build an RPM, it's set for an geode-olpc, so the actual hardware
 # won't let us install it.
-%define cross_compile 0
-%define olpc 0
+# %define cross_compile 0
+# %define olpc 0
 
 # Build rpms for an ARM based processor, in our case the Nokia 770/800
 # tablet. 
@@ -137,7 +138,8 @@
        $CROSS_OPTS \
        $SOUND $GUI \
        $RENDERER \
-       --disable-dependency-tracking --disable-rpath \
+       --disable-dependency-tracking \
+       --disable-rpath \
        --with-plugindir=%{_libdir}/mozilla/plugins
  
 make %{?_smp_mflags} dumpconfig all
@@ -149,8 +151,15 @@
        --disable-dependency-tracking \
        --disable-rpath \
        --disable-cygnal \
-        --prefix=%{_prefix} \
-       --with-plugindir=%{_libdir}/mozilla/plugins
+        --prefix=/usr \
+       --mandir=/usr/share/man \
+       --infodir=/usr/share/info \
+       --with-plugindir=/usr/lib/mozilla/plugins \
+       --disable-static \
+       --enable-shared \
+       --disable-testsuite \
+       --enable-docbook \
+       CXXFLAGS=-O0
 
 make dumpconfig all
 %endif
@@ -160,8 +169,7 @@
 strip utilities/.libs/dumpshm  utilities/.libs/g*  utilities/.libs/soldumper
 rm -rf $RPM_BUILD_ROOT
 make install install-plugins DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
 %if !%{cross_compile}
 
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
@@ -194,7 +202,7 @@
 %dump
 %doc README AUTHORS COPYING NEWS 
 %{_bindir}/gnash
-%{_bindir}/*-gnash
+%{_bindir}/gtk-gnash
 %{_bindir}/gprocessor
 %{_bindir}/soldumper
 %{_bindir}/dumpshm
@@ -203,17 +211,18 @@
 %{_prefix}/include/ltdl.h
 %{_prefix}/share/gnash/GnashG.png
 %{_prefix}/share/gnash/gnash_128_96.ico
-%if !%{cross_compile}
-%{_datadir}/man/man1/gnash.1*
+%{_datadir}/man/man1/*.1*
 %{_datadir}/locale/*/LC_MESSAGES/gnash.mo
-%doc doc/C/gnash.html 
+%if !%{cross_compile}
+%{_prefix}/share/info/*.info*
+%{_prefix}/share/doc/gnash/*.html
+%{_prefix}/share/doc/gnash/images/*.png
+# %{_infodir}/*.info*
+#%doc doc/C/gnash*.html 
+#%doc doc/C/images/*.png
+#%doc doc/C/images/*.txt
 # %doc %{_prefix}/share/gnash/doc/gnash/C/images
-# %{_datadir}/omf/gnash/gnash-C.omf
-# %{_datadir}/omf/gnash/asspec-C.omf
-# %{_infodir}/*.info.gz
-# %{_prefix}/share/gnash/doc/gnash/C/*.xml
-# %{_prefix}/share/gnash/doc/asspec/C/*.xml
-# %{_prefix}/share/gnash/doc/asspec/images/*.png
+# %doc %{_prefix}/share/gnash/doc/gnash/C/*.xml
 %endif
 
 %files plugin
@@ -222,8 +231,8 @@
 
 %files klash
 %defattr(-,root,root,-)
-%{_bindir}/gnash
 %if !%{cross_compile}
+%{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 %{_datadir}/services/klash_part.desktop
@@ -234,7 +243,7 @@
 # %{_bindir}/cygnal
 
 %changelog
-* Sat Feb  9 2008 Rob Savoye <address@hidden> - %{version}-%{release}
+* Sat Feb  16 2008 Rob Savoye <address@hidden> - %{version}-%{release}
 - Adjust dependencies for current cvs HEAD
 
 * Sat Mar  6 2007 Rob Savoye <address@hidden> - %{version}-%{release}

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- Makefile.am 22 Feb 2008 08:01:47 -0000      1.104
+++ Makefile.am 3 Mar 2008 02:54:21 -0000       1.105
@@ -52,20 +52,19 @@
        gui \
        plugin \
        pythonmodule \
-       testsuite \
        doc \
        po \
        $(NULL)
 
 if CYGNAL
-CYGNAL_DIRS = cygnal
+CYGNAL_DIR = cygnal
 endif
 
-# if DOCBOOK
-# DOC_DIRS = doc
-# endif
+SUBDIRS = $(STD_DIRS) $(CYGNAL_DIR)
 
-SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS) $(DOC_DIRS)
+if TESTSUITE
+SUBDIRS += testsuite
+endif
 
 if BUILD_EXTENSIONS
 SUBDIRS += extensions
@@ -73,16 +72,19 @@
 
 # man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
 
-DIST_SUBDIRS = $(STD_DIRS) cygnal extensions
+DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite
 
 EXTRA_DIST =  autogen.sh \
-       packaging \
        config.rpath \
        macros/incllist macros/libslist \
        ChangeLog-0.8.0 ChangeLog-0.8.1
 
 noinst_HEADERS = compatibility_include.h
 
+dist-hook:
+       @test -d "$(distdir)/packaging" || $(mkinstalldirs) 
"$(distdir)/packaging"
+       cp -p $(srcdir)/*.am $(top_distdir)/packaging/
+
 #
 # Build an RPM package
 #
@@ -314,10 +316,12 @@
        @echo " NPAPI (Mozilla) plugin disabled"
 endif
 
+if TESTSUITE
 check: check-recursive anal
 
 anal testreport checksum:
        $(srcdir)/testsuite/anaylse-results.sh
+endif
 
 .PHONY : dumpconfig \
        anal \

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -b -r1.490 -r1.491
--- configure.ac        1 Mar 2008 15:45:16 -0000       1.490
+++ configure.ac        3 Mar 2008 02:54:21 -0000       1.491
@@ -285,6 +285,24 @@
 fi
 AM_CONDITIONAL(MENUS, test x$menus = xyes)
 
+dnl Disable running any tests for "make check". This may sound stupid, but
+dnl this option is designed to soley be used by maintainers in the 
+dnl DISTCHECK_CONFIGURE_FLAGS when building packages. Gnash's testing 
infrastructure
+dnl is complex, and often the the testsuites will work, but due to some 
obscure reason,
+dnl make distcheck fails.
+AC_ARG_ENABLE(testsuite,
+  AC_HELP_STRING([--disable-testsuite],[Disable the testsuite, maintainers 
option only]),
+[case "${enableval}" in
+  yes) testsuite=yes ;;
+  no)  testsuite=no ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-testsuite option]) ;;
+esac],testsuite=yes)
+
+if test x"$testsuite" = x"yes"; then
+  AC_DEFINE([USE_TESTSUITE], [], [Testsuite support, maintainers option only])
+fi
+AM_CONDITIONAL(TESTSUITE, test x$testsuite = xyes)
+
 dnl -- dnl Enable building the gui support even when statically
 dnl -- dnl linking. Normally this is only disabled when building a statically
 dnl -- dnl linked gnash executable.
@@ -1914,11 +1932,6 @@
 cygnal/Makefile
 cygnal/testsuite/Makefile
 cygnal/testsuite/cygnal.all/Makefile
-packaging/Makefile
-packaging/debian/Makefile
-packaging/redhat/Makefile
-packaging/ipkg/Makefile
-packaging/doc/Makefile
 )
 
 ###