[Gnash-commit] gnash packaging/redhat/gnash.spec packaging/sna...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/10 06:19:21

Modified files:
        packaging/redhat: gnash.spec 
        packaging      : snapshot.am 
        .              : ChangeLog 

Log message:
                * packaging/snapshot.am: Fix rules to build binary tarballs
                correctly. Add snapshot-rpm target that builds an rpm which is
                properly cvs date stamped.
                * packaging/redhat/gnash.spec: Update to work with cvs HEAD.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5604&r2=1.5605

Patches:
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- packaging/redhat/gnash.spec 16 Jan 2008 00:42:55 -0000      1.17
+++ packaging/redhat/gnash.spec 10 Feb 2008 06:19:19 -0000      1.18
@@ -1,22 +1,22 @@
 %define version 20080104
 Name:           gnash
-Version:        cvs%{version}
+Version:        %{version}cvs
 Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 Vendor:                Gnash Project
 Packager:      Rob Savoye <address@hidden>
-License:        GPL
+License:        GPLv3
 URL:            http://www.gnu.org/software/gnash/
 Source0:        
http://www.gnu.org/software/gnash/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
 
 #AutoReqProv: no
 
-BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
-BuildRequires:  gtk2-devel libX11-devel agg-devel
-BuildRequires:  boost-devel curl-devel libXt-devel
+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
@@ -28,6 +28,9 @@
 BuildRequires:  kdelibs-devel
 BuildRequires:  docbook2X
 BuildRequires:  gstreamer >= 0.10
+# Installation requirements
+Requires: gstreamer >= 0.10
+Requires: gstreamer-plugins-base, gstreamer-plugins-ugly, gstreamer-plugins-bad
 # BuildRequires:  scrollkeeper
 
 #Requires(post): scrollkeeper
@@ -88,8 +91,8 @@
 # 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 1
-%define olpc 1
+%define cross_compile 0
+%define olpc 0
 
 # Build rpms for an ARM based processor, in our case the Nokia 770/800
 # tablet. 
@@ -114,14 +117,14 @@
 # build RPMs on, so we do it this way.
   %if olpc
     CROSS_OPTS="$CROSS_OPTS --disable-kparts --disable-menus"
-    SOUND="--enable-media=ffmpeg"
+    SOUND="--enable-media=gst"
     GUI="--enable-gui=gtk"
     RENDERER="$RENDERER --with-pixelformat=RGB565"
   %endif
 %else
 # Native RPM build
   CROSS_OPTS="--enable-ghelp --enable-docbook"
-  SOUND="--enable-media=ffmpeg"
+  SOUND="--enable-media=gst"
   RENDERER=""
 %endif
 
@@ -140,12 +143,9 @@
 make %{?_smp_mflags} dumpconfig all
 %else
 ./configure \
-       --with-qtdir=$QTDIR \
        $CROSS_OPTS \
        $SOUND \
        $RENDERER \
-       --enable-static \
-       --enable-shared \
        --disable-dependency-tracking \
        --disable-rpath \
        --disable-cygnal \
@@ -156,11 +156,14 @@
 %endif
 
 %install
-strip gui/.libs/*-gnash utilities/.libs/dumpshm  utilities/.libs/g*  
utilities/.libs/soldumper
+strip gui/.libs/*-gnash
+strip utilities/.libs/dumpshm  utilities/.libs/g*  utilities/.libs/soldumper
 rm -rf $RPM_BUILD_ROOT
-make install install-plugin DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+make install install-plugins DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.a
 %if !%{cross_compile}
+
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %endif
@@ -191,23 +194,26 @@
 %dump
 %doc README AUTHORS COPYING NEWS 
 %{_bindir}/gnash
-%{_bindir}/gparser
+%{_bindir}/*-gnash
 %{_bindir}/gprocessor
 %{_bindir}/soldumper
 %{_bindir}/dumpshm
-%{_libdir}/libgnash*.so
+%{_libdir}/gnash/*.so*
 %{_libdir}/mozilla/plugins/*.so
-%{_libdir}/libltdl*
 %{_prefix}/include/ltdl.h
 %{_prefix}/share/gnash/GnashG.png
 %{_prefix}/share/gnash/gnash_128_96.ico
 %if !%{cross_compile}
-%{_prefix}/man/man1/gnash.1*
+%{_datadir}/man/man1/gnash.1*
+%{_datadir}/locale/*/LC_MESSAGES/gnash.mo
 %doc doc/C/gnash.html 
 %doc %{_prefix}/share/gnash/doc/gnash/C/images
 %{_datadir}/omf/gnash/gnash-C.omf
-%{_infodir}/gnash.info*.gz
+%{_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
 %endif
 
 %files plugin
@@ -223,11 +229,14 @@
 %{_datadir}/services/klash_part.desktop
 %endif
 
-%files cygnal
-%defattr(-,root,root,-)
-%{_bindir}/cygnal
+# %files cygnal
+# %defattr(-,root,root,-)
+# %{_bindir}/cygnal
 
 %changelog
+* Sat Feb  9 2008 Rob Savoye <address@hidden> - %{version}-%{release}
+- Adjust dependencies for current cvs HEAD
+
 * Sat Mar  6 2007 Rob Savoye <address@hidden> - %{version}-%{release}
 - merge in patch from John @ Redhat.
 

Index: packaging/snapshot.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/snapshot.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- packaging/snapshot.am       7 Feb 2008 03:20:45 -0000       1.1
+++ packaging/snapshot.am       10 Feb 2008 06:19:19 -0000      1.2
@@ -15,12 +15,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-NOW = `date -u "+%Y%m%d"`
+NOW = `date "+%Y%m%d"`
 
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory
 SNAPSHOT_DIR = gnash-${NOW}
 SNAPSHOT_BUILD = gnash-${NOW}/_build
+SNAPSHOT_TMP = /tmp/gnash-$(NOW)
 
 #
 # build a binary snapshot from of Gnash for systems we don't have
@@ -32,61 +33,94 @@
 # rename it to the dir we want to stay clear. Then we change the default
 # version from 'cvs' to a date stamped version of cvs, like '20080202cvs'
 snapshot: distdir
-       now=`date -u "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}"; \
+       @now=`date "+%Y%m%d"`; \
+       snapshot_dir="gnash-$${now}cvs"; \
        snapshot_build="$${snapshot_dir}/_build"; \
-       if test -d $${snapshot_dir} ; then \
-         rm -fr $${snapshot_dir};\
-       fi ; \
+       if test -d gnash-cvs -a ! -d $${snapshot_dir}; then \
        mv -f gnash-cvs $${snapshot_dir}; \
+       fi; \
+       if test ! -d $${snapshot_build}; then \
+         $(MKINSTALLDIRS) $${snapshot_build}; \
+       fi; \
+       if test ! -f $${snapshot_dir}/configure.ac.orig; then \
        mv -f $${snapshot_dir}/configure.ac $${snapshot_dir}/configure.ac.orig; 
\
        sed -e "s/AC_INIT(gnash, cvs)/AC_INIT(gnash, $${now}cvs)/" \
          $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; \
-       cd $${snapshot_dir} ; ./autogen.sh
+         cd $${snapshot_dir} ; ./autogen.sh; \
+       fi
 #      tardir=$${snapshot_dir} && $(am__tar) | bzip2 -9 -c > 
$${snapshot_dir}.tar.bz2;
 #      $(RM) -fr $${snapshot_dir}
 
-
-snapshot-configure: snapshot-unpack $(SNAPSHOT_BUILD)
-       $(MKINSTALLDIRS) $(SNAPSHOT_BUILD)
-       address@hidden -f snapshot-configure
-       cd $(SNAPSHOT_BUILD); ./configure \
+snapshot-configure: snapshot
+       @now=`date "+%Y%m%d"`; \
+       snapshot_dir="gnash-$${now}cvs"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       if test -d /usr/local/mozilla-firefox/plugins; then \
+          plugindir=/usr/local/mozilla-firefox/plugins; \
+       else \
+         plugindir=/usr/lib/mozilla/plugins; \
+        fi; \
+       cd $${snapshot_build}; ../configure \
+       --disable-dependency-tracking --disable-rpath \
          --prefix=/usr \
          --mandir=/usr/share/man \
          --infodir=/usr/share/info \
-         --with-plugindir=/usr/lib/mozilla/plugins \
-         --with-extension=all
-         --enable-gui=all
-       @touch snapshot-configure
-
-snapshot-unpack: $(top_builddir)/config.status
-       address@hidden -f snapshot-*            # nuke everything, we're 
starting over
-       address@hidden -f snapshot-unpack
-       rm -rf $(SNAPSHOT_BUILD)
-       tar jxf $(SNAPSHOT_BUILD).tar.bz2
-       @touch snapshot-unpack
+         --with-plugindir=$${plugindir} \
+         --disable-static \
+         --enable-allstatic \
+         CXXFLAGS=-g
+#        --with-extensions=all 
+#        --enable-gui=all 
 
 snapshot-build: snapshot-configure
-       address@hidden -f snapshot-build
-       $(MAKE) -C $(SNAPSHOT_BUILD) all
-       @touch snapshot-build
-
-snapshot-install: snapshot-build Makefile
-       address@hidden -f snapshot-install
-       $(MAKE) -C $(SNAPSHOT_BUILD) install DESTDIR=$(SNAPSHOT_TMP)
-       @touch snapshot-install
-
-snapshot-depend: 
-       address@hidden -f snapshot-depend
-       rsync -avc $(libdir)/libcurl* $(SNAPSHOT_TMP)/usr/lib
-       rsync -avc $(libdir)/libagg* $(SNAPSHOT_TMP)/usr/lib
-       rsync -avc $(libdir)/libboost_thread* $(SNAPSHOT_TMP)/usr/lib
-       rsync -avc $(libdir)/libboost_serialization* $(SNAPSHOT_TMP)/usr/lib
-       @touch snapshot-depend
+       @now=`date "+%Y%m%d"`; \
+       snapshot_dir="gnash-$${now}cvs"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} all
+
+snapshot-install: #snapshot-build
+       now=`date "+%Y%m%d"`; \
+       snapshot_dir="gnash-$${now}cvs"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       snapshot_dest="/tmp/gnash-$${now}cvs-tmp"; \
+       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} install install-plugins 
DESTDIR=$${snapshot_dest}
+
+# We only want to bundle an installed gnash, so all the linker paths are
+# correct
+snapshot-bundle: #snapshot-install
+       now=`date "+%Y%m%d"`; \
+       snapshot_dest="/tmp/gnash-$${now}cvs-tmp"; \
+       snapshot_tmp="/tmp/gnash-$${now}cvs"; \
+       snapshot_tar="$${snapshot_tmp}-$(host_cpu).tar.bz2"; \
+       if test ! -d $${snapshot_tmp}; then \
+         $(MKINSTALLDIRS) $${snapshot_tmp}; \
+       fi; \
+       cp @srcdir@/COPYING $${snapshot_tmp}; \
+       cp @srcdir@/config.guess $${snapshot_tmp}; \
+       cp @srcdir@/packaging/install-gnash.sh $${snapshot_tmp}; \
+       cp -rp $${snapshot_dest}/usr/bin $${snapshot_tmp}; \
+       cp -rp $${snapshot_dest}/usr/lib $${snapshot_tmp}; \
+       cp -rp $${snapshot_dest}/usr/share $${snapshot_tmp}; \
+       cp -rp $${snapshot_dest}/usr/lib/mozilla/plugins $${snapshot_tmp}; \
+       cp -rp $${snapshot_dest}/usr/lib/kde3 $${snapshot_tmp}; \
+       strip $${snapshot_tmp}/bin/*-gnash; \
+       strip $${snapshot_tmp}/bin/gprocessor; \
+       strip $${snapshot_tmp}/bin/dumpshm; \
+       strip $${snapshot_tmp}/bin/soldumper; \
+       cd /tmp; tar jcvf $${snapshot_tar} gnash-$${now}cvs
+
+snapshot-rpm: snapshot $(srcdir)/packaging/redhat/gnash.spec
+       rm -f /usr/src/redhat/SPECS/gnash.spec
+       now=`date "+%Y%m%d"`; \
+       pkgname="gnash-$${now}cvs"; \
+       snapshot_tar="/tmp/$${pkgname}cvs.tar.bz2"; \
+        tar jcvf $${snapshot_tar} --exclude=gnash-$${now}cvs/_build 
gnash-$${now}cvs; \
+       sed -e "s:%define version .*:%define version $${now}:" 
$(srcdir)/packaging/redhat/gnash.spec > /usr/src/redhat/SPECS/gnash.spec; \
+       cp $${snapshot_tar} /usr/src/redhat/SOURCES/
+       rpmbuild -ba --clean --rmsource --rmspec 
/usr/src/redhat/SPECS/gnash.spec
 
 snapshot-clean:
        rm -fr snapshot-* $(SNAPSHOT_BUILD) $(SNAPSHOT_TMP) 
gnash*$(VERSION)*.ipk
 
-
-.PHONY : snapshot
+# .PHONY : snapshot
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5604
retrieving revision 1.5605
diff -u -b -r1.5604 -r1.5605
--- ChangeLog   9 Feb 2008 15:05:59 -0000       1.5604
+++ ChangeLog   10 Feb 2008 06:19:19 -0000      1.5605
@@ -1,3 +1,10 @@
+2008-02-09  Rob Savoye  <address@hidden>
+
+       * packaging/snapshot.am: Fix rules to build binary tarballs
+       correctly. Add snapshot-rpm target that builds an rpm which is
+       properly cvs date stamped.
+       * packaging/redhat/gnash.spec: Update to work with cvs HEAD.
+
 2008-02-08 Bastiaan Jacques <address@hidden>
 
        * libmedia/sound_handler.h: Add a few notes.