[gnash/gnash-git] New upstream snapshot
Hicham HAOUARI
hicham at fedoraproject.org
Sat Feb 26 14:25:39 UTC 2011
commit 13695ab030aa4222941c78aaca78d859761257f1
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sat Feb 26 14:25:01 2011 +0000
New upstream snapshot
.gitignore | 1 +
0001-Remove-libtool-.la-files.patch | 124 -----------
...Rename-gtk-gnash-and-kde4-gnash-launchers.patch | 224 --------------------
gnash.spec | 18 +--
sources | 2 +-
5 files changed, 4 insertions(+), 365 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c1edd4..815a9d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gnash-0.8.7.tar.bz2
/gnash-0.8.9-20110213git.tar.bz2
/gnash-0.8.9-20110214git.tar.bz2
/gnash-0.8.9-20110223git.tar.bz2
+/gnash-0.8.9-20110226git.tar.bz2
diff --git a/gnash.spec b/gnash.spec
index 4e52568..76e6166 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -1,4 +1,4 @@
-%define gitdate 20110223
+%define gitdate 20110226
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_setup
@@ -14,11 +14,6 @@ URL: http://www.gnu.org/software/gnash/
#Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
Source0: %{name}-%{version}-%{gitdate}git.tar.bz2
-# https://savannah.gnu.org/bugs/index.php?32504
-Patch0: 0001-Rename-gtk-gnash-and-kde4-gnash-launchers.patch
-
-Patch1: 0001-Remove-libtool-.la-files.patch
-
BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
BuildRequires: boost-devel curl-devel freetype-devel fontconfig-devel
BuildRequires: SDL-devel agg-devel
@@ -35,8 +30,6 @@ BuildRequires: dejagnu
BuildRequires: autoconf automake libtool
-BuildRequires: git
-
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -94,8 +87,6 @@ application.
%prep
%setup -q
-git apply %{PATCH0}
-%patch1 -p1
iconv -f iso-8859-1 -t utf8 < AUTHORS > AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS
@@ -124,9 +115,6 @@ make %{?_smp_mflags}
make install install-plugins \
DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# Remove unneeded .la files
-#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' \;
-
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -rf __dist_docs
@@ -242,10 +230,8 @@ touch --no-create %{_datadir}/icons/hicolor
%{python_sitearch}/gtk-2.0/gnash.so
%changelog
-* Wed Feb 23 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110223git
+* Sat Feb 26 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110226git
- Switch to 0.8.9 branch
-- Drop the curl patches
-- Explicitly disable testsuite ( we don't have the necessary deps )
* Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.8-4
- backport 2 upstream commits to make it work with libcurl >= 7.21.x (#639737)
diff --git a/sources b/sources
index 141796a..1a08ae8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfac5e522eb7365d1ba880c470ca7960 gnash-0.8.9-20110223git.tar.bz2
+03d4bd06eeacb89cef7963749ae7dcbf gnash-0.8.9-20110226git.tar.bz2
More information about the scm-commits
mailing list