[Gnash-commit] gnash ./README ./ChangeLog macros/kde.m4 packag...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/07 17:11:00

Modified files:
        .              : README ChangeLog 
        macros         : kde.m4 
        packaging/redhat: gnash.spec 

Log message:
        * macros/kde.m4: Also look for QT with qt-3.3 as well as qt3.
        * README: minor typo corrections.
        * packaging/redhat/gnash.spec: Build klash, add additional
        dependancies, and tweak till it works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/README.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.205&tr2=1.206&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/redhat/gnash.spec.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.205 gnash/ChangeLog:1.206
--- gnash/ChangeLog:1.205       Thu Apr  6 15:09:30 2006
+++ gnash/ChangeLog     Fri Apr  7 17:11:00 2006
@@ -1,3 +1,21 @@
+
+2006-04-07  Rob Savoye  <address@hidden>
+
+       * macros/kde.m4: Also look for QT with qt-3.3 as well as qt3.
+       * README: minor typo corrections.
+       * packaging/redhat/gnash.spec: Build klash, add additional
+       dependancies, and tweak till it works.
+
+2006-04-07  Patrice Dumas <pertusus at free.fr>
+
+       * macros/ghelp.m4: Don't warn if the user doing ./configure
+       isn't root.
+       * doc/omf.make, doc/xmldocs.make, doc/C/Makefile.am: use '-hook'
+       targets for omf files installation, and '-local' targets for xml
+       files installation. Remove intermediate useless targets. If ghelp
+       isn't enabled, disableonly the omf files installation. Remove
+       the @ in front of make rules.
+
 2006-04-06  Rob Savoye  <address@hidden>
        
        * backend/gnash.cpp: Make width and height global variables.
Index: gnash/README
diff -u gnash/README:1.7 gnash/README:1.8
--- gnash/README:1.7    Fri Apr  7 01:01:22 2006
+++ gnash/README        Fri Apr  7 17:11:00 2006
@@ -46,8 +46,8 @@
 Microphone, NetStream, Selection, SharedObject, Stage, System, Button,
 Camera, Color, ContextMenu, CustomActions, Video.
 
-Unimplemented Opcodes are: Throw, Implements, Extends, enum_object, Try,
-new_method, md length, md substring, md chr, delete, get target.
+Unimplemented Opcodes are: Throw, Implements, Extends, EnumObject, Try,
+NewMethod, MDLength, MDSubstring, MDChr, Delete, GetTarget.
 
 There is currently no FLV video, only minimal AMF data support,
 and no loading of external jpegs. Sound is currently non-functional.
@@ -150,12 +150,11 @@
 us fill in missing functionality. Offers of help can be sent to
 <address@hidden>.
 
-For information about
-contributing to the GNU Project, please read How to help GNU at
-<http://www.gnu.org/help/help.html>.
-
-If you think you have found a bug in Gnash, then
-you should file as complete a report as possible at
-https://savannah.gnu.org/bugs/?group=gnash.  Please include the operating
-system name and version, and which gnash version you are using, in your
-bug reports.
+For information about contributing to the GNU Project, please read How
+to help GNU at <http://www.gnu.org/help/help.html>.
+
+If you think you have found a bug in Gnash, then you should file as
+complete a report as possible at 
+https://savannah.gnu.org/bugs/?group=gnash.  Please include the
+operating system name and version, and which gnash version you are
+using, in your bug reports.
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.6 gnash/macros/kde.m4:1.7
--- gnash/macros/kde.m4:1.6     Fri Mar 31 19:55:37 2006
+++ gnash/macros/kde.m4 Fri Apr  7 17:11:00 2006
@@ -1215,7 +1215,7 @@
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
 fi
 if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+  kde_qt_dirs="$QTDIR /usr/lib/qt-3.3 /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
 fi
 if test $kde_qtver = 2; then
    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
Index: gnash/packaging/redhat/gnash.spec
diff -u gnash/packaging/redhat/gnash.spec:1.1 
gnash/packaging/redhat/gnash.spec:1.2
--- gnash/packaging/redhat/gnash.spec:1.1       Mon Feb 20 17:35:43 2006
+++ gnash/packaging/redhat/gnash.spec   Fri Apr  7 17:11:00 2006
@@ -1,18 +1,29 @@
 Name:           gnash
 Version:        0.7
-Release:        1%{?dist}
-Summary:        Flash movie player
+Release:        0%{?dist}
+Summary:        GNU flash movie player
 
-Group:          Applications/Multimedia
+Group:          Applications/Internet
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
-Source0:        ftp://ftp.gnu.org/pub/gnu/gnash/gnash-%{version}.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
-BuildRequires:  xorg-x11-devel
-BuildRequires:  SDL-devel SDL_mixer-devel
-BuildRequires:  webclient
+# the opengl devel packages are required by gtkglext-devel
+# monolithic Xorg
+#BuildRequires:  xorg-x11-devel
+# modular Xorg 
+#BuildRequires:  libGLU-devel libGL-devel
+# SDL-devel is required by SDL_mixer-devel
+#BuildRequires:  SDL-devel 
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  kdelibs-devel
+BuildRequires:  gtkglext-devel
+# GStreamer isn't used yet, but will be in the near future.
+BuildRequires:  gstreamer-devel
+#BuildRequires:  gstreamer-devel >= 0.10
+#BuildRequires:  webclient
 BuildRequires:  scrollkeeper
 
 Requires(post): scrollkeeper
@@ -21,22 +32,17 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Gnash is originally based on the code of GameSWF, by Thatcher
-Ulrich. GameSWF is the most advanced of the free flash movie player
-projects, and implements a fairly broad set of Flash Format v7
-compliance. GameSWF was unsupported public domain software though,
-and not really setup to be an industrial strength project that could
-be used by everyone that uses Firefox.
+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}
-Requires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
-Requires:  xorg-x11-devel
-Requires:  SDL-devel SDL_mixer-devel
 
 %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.
 
@@ -49,12 +55,23 @@
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
 
-%prep
-%setup -q
+%package -n klash
+Summary:   Konqueror flash movie player plugin
+Requires:  %{name} = %{version}-%{release}
+Group:     Applications/Multimedia
 
+%description -n klash
+The gnash flash movie player plugin for Konqueror.
+
+%prep
+%setup -q -n %{name}-%{version}
+#%patch1 -p1 -b .1
+#%%patch2 -p1 -b .2
+#./autogen.sh
 
 %build
-%configure --disable-static --with-plugin-dir=%{_libdir}/mozilla/plugins
+%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
+  --enable-ghelp --enable-docbook --enable-klash --disable-dependency-tracking
 #make %{?_smp_mflags}
 make
 
@@ -63,6 +80,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +98,8 @@
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html doc/C/images
+%doc doc/C/gnash.html 
+%doc doc/C/images
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
@@ -99,6 +118,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
+%files -n klash
+%{_libdir}/kde3/libklashpart.*
+%{_datadir}/apps/klash/
+%{_datadir}/config/klashrc
+%{_datadir}/services/klash_part.desktop
+
 %changelog
 * Fri Feb  3 2006 Patrice Dumas <address@hidden> - 0.7-1
 - initial packaging