[gnash/gnash-git] Resnapshot and enable testsuite

Hicham HAOUARI hicham at fedoraproject.org
Wed Feb 23 23:26:24 UTC 2011


commit fbc18a2b8fb6bd1259ec3c891209be24c3805c04
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Wed Feb 23 23:25:29 2011 +0000

    Resnapshot and enable testsuite

 .gitignore                                         |    1 +
 0001-Add-desktop-files.patch                       |  454 --------------------
 ...ssion-making-gui-gnash.in-not-preprocesse.patch |   37 ++
 gnash.spec                                         |   13 +-
 sources                                            |    2 +-
 5 files changed, 48 insertions(+), 459 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e80e12..8c1edd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnash-0.8.7.tar.bz2
 /gnash-0.8.9-20110130git.tar.bz2
 /gnash-0.8.9-20110213git.tar.bz2
 /gnash-0.8.9-20110214git.tar.bz2
+/gnash-0.8.9-20110223git.tar.bz2
diff --git a/0001-Fix-a-regression-making-gui-gnash.in-not-preprocesse.patch b/0001-Fix-a-regression-making-gui-gnash.in-not-preprocesse.patch
new file mode 100644
index 0000000..0c7f2d3
--- /dev/null
+++ b/0001-Fix-a-regression-making-gui-gnash.in-not-preprocesse.patch
@@ -0,0 +1,37 @@
+From f7577d0dcf8c6b6eccb11e70d9227ea156ced2d7 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Wed, 23 Feb 2011 23:12:59 +0000
+Subject: [PATCH] Fix a regression making gui/gnash.in not preprocessed
+
+---
+ configure.ac    |    1 +
+ gui/Makefile.am |    1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 14b4f41..24ac2fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2954,6 +2954,7 @@ AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashr
+ 
+ AC_CONFIG_FILES(
+ gnash.pc:gnash.pc.in
++gui/gnash:gui/gnash.in
+ gui/klash:gui/klash.in
+ )
+ 
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 46cd7ca..e73b48e 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -188,7 +188,6 @@ bin_SCRIPTS = gnash
+ bin_PROGRAMS = 
+ 
+ gnash: gnash.in
+-	cp $(srcdir)/gnash.in $@
+ 	chmod +x $@
+ 
+ if BUILD_KDE4_GUI
+-- 
+1.7.4
+
diff --git a/gnash.spec b/gnash.spec
index 10563c8..465e329 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -1,4 +1,4 @@
-%define gitdate 20110214
+%define gitdate 20110223
 %filter_provides_in %{python_sitearch}/.*\.so$ 
 %filter_setup
 
@@ -15,7 +15,7 @@ URL:            http://www.gnu.org/software/gnash/
 Source0:        %{name}-%{version}-%{gitdate}git.tar.bz2
 
 # https://savannah.gnu.org/bugs/index.php?32504
-Patch0:         0001-Add-desktop-files.patch
+Patch0:         0001-Fix-a-regression-making-gui-gnash.in-not-preprocesse.patch
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
@@ -29,6 +29,7 @@ BuildRequires:  giflib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  speex-devel gstreamer-plugins-base-devel
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  dejagnu
 
 BuildRequires:  autoconf automake libtool
 
@@ -111,7 +112,8 @@ autoreconf -if
   --enable-hwaccel=none \
   --enable-renderer=all \
   --with-plugins-install=system \
-  --enable-doublebuf
+  --enable-doublebuf \
+  --disable-jemalloc
 
 make %{?_smp_mflags}
 
@@ -131,6 +133,9 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
 
 %find_lang %{name}
 
+%check
+make check
+
 %post 
 /sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
 /sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
@@ -233,7 +238,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{python_sitearch}/gtk-2.0/gnash.so
 
 %changelog
-* Mon Feb 14 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110214git
+* Wed Feb 23 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110223git
 - Switch to 0.8.9 branch
 - Drop the curl patches
 - Explicitly disable testsuite ( we don't have the necessary deps )
diff --git a/sources b/sources
index c8f79d8..141796a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92673ba2848b50df0db872dbd58573e4  gnash-0.8.9-20110214git.tar.bz2
+dfac5e522eb7365d1ba880c470ca7960  gnash-0.8.9-20110223git.tar.bz2


More information about the scm-commits mailing list