[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-344-g672a249

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  672a249b56d2685c93f4e36385299556eabe7e9f (commit)
       via  e65ff4577f89825f5e43f556c71f3760a4744e71 (commit)
       via  3bcd22a7a3d1fdb73579007d005c9914bee26e43 (commit)
       via  5cfba6b818d7349874712d376f5b43570851bb2e (commit)
       via  062ae78d9ed7e0ee9ff1e6f4b7ec9cae850b11d5 (commit)
      from  e33b62756b136aa4295f5c8625a2723507006c8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=672a249b56d2685c93f4e36385299556eabe7e9f


commit 672a249b56d2685c93f4e36385299556eabe7e9f
Author: Gabriele Giacone <address@hidden>
Date:   Fri Mar 25 04:40:57 2011 +0100

    Fix files inclusion in rpm

diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 8358330..5827e7c 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -346,6 +346,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_mandir}/man1/findwebcams.1.gz
 %{_mandir}/man1/rtmpget.1.gz
 %{_datadir}/locale/*/LC_MESSAGES/gnash.mo
+%{_prefix}/share/gnash/gnash-splash.swf
 %if !%{cross_compile}
 #%{_prefix}/share/info/*.info*
 %{_prefix}/share/doc/gnash/*.html
@@ -391,10 +392,11 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_mandir}/man1/qt4-gnash.1.gz
 %{_mandir}/man1/gnash-qt-launcher.1.gz
 %{_datadir}/applications/klash.desktop
-%{_prefix}/%{_lib}/kde4/libklashpart.*
+%{_prefix}/lib*/kde4/libklashpart.*
 %{_prefix}/share/kde4/apps/klash/klashpartui.rc
 %{_prefix}/share/kde4/apps/klash/pluginsinfo
 %{_prefix}/share/kde4/services/klash_part.desktop
+%{_datadir}/icons/hicolor/32x32/apps/klash.xpm
 
 %files fileio-extension
 %defattr(-,root,root,-)

http://git.savannah.gnu.org/cgit//commit/?id=e65ff4577f89825f5e43f556c71f3760a4744e71


commit e65ff4577f89825f5e43f556c71f3760a4744e71
Author: Gabriele Giacone <address@hidden>
Date:   Fri Mar 25 03:21:19 2011 +0100

    Make rpm versioning follow fedora guidelines

diff --git a/packaging/rpm.am b/packaging/rpm.am
index e548472..2a79c83 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -30,11 +30,14 @@ RPMBUILD_FLAGS = --macros=/usr/lib/rpm/macros:$(RPMMACROS) 
# --clean --rmsource
 gnash.spec spec: $(srcdir)/packaging/redhat/gnash.spec
        mkdir -p $(RPMBUILD_DIR); \
        echo "%_topdir $(RPMBUILD_DIR)" > $(RPMMACROS); \
-       snapshot_version="$(SNAPSHOT_VERSION)"; \
-       snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
+       snapshot_version=$(SNAPSHOT_VERSION); \
+       snapshot_release=`echo $${snapshot_version}|grep "~"|sed 
's/.*~\(.*\)/0.1.\1/'`; \
+       snapshot_version=`echo $${snapshot_version}|cut -d"~" -f1`; \
+       if [ "$${snapshot_release}" = "" ];then snapshot_release=1;fi; \
        distro=`lsb_release -is`; \
-       echo "Editing the version in the spec file to be $${snapshot_version} 
for Distribution $${distro}..."; \
+       echo "Editing the version in the spec file to be $${snapshot_version} 
$${snapshot_release} for Distribution $${distro}..."; \
        sed -e "s/Version.*/Version:    $${snapshot_version}/" \
+           -e "s/Release.*/Release:    $${snapshot_release}/" \
            -e "s/Distribution:.*/Distribution:   $${distro}/" 
$(srcdir)/packaging/redhat/gnash.spec > $(RPMSPEC)
 
 
@@ -82,21 +85,16 @@ rpm-install:
 # requires we do it ourselves, and copy it to $HOME/rpmbuild/SOURCES
 # before rpmbuild will work.
 setup-rpm: 
-       -snapshot_version="gnash-$(SNAPSHOT_VERSION)"; \
-       snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
+       snapshot_version=$(SNAPSHOT_VERSION); \
+       snapshot_dir="gnash-`echo $${snapshot_version}|cut -d"~" -f1`"; \
        if test -d gnash-$(PACKAGE_VERSION); then \
-         mv gnash-$(PACKAGE_VERSION) $${snapshot_version}; \
-         if test ! -f $${snapshot_version}/configure.ac.orig; then \
-           mv -f $${snapshot_version}/configure.ac 
$${snapshot_version}/configure.ac.orig; \
-           sed -e "s/AC_INIT(gnash, master)/AC_INIT(gnash, 
$${snapshot_version})/" \
-             $${snapshot_version}/configure.ac.orig > 
$${snapshot_version}/configure.ac; \
-         fi; \
+         mv gnash-$(PACKAGE_VERSION) $${snapshot_dir}; \
        fi; \
-       tar zcf $${snapshot_version}.tar.gz \
-         --exclude=$${snapshot_version}/autom4te.cache \
-         --exclude=$${snapshot_version}/configure.ac.orig \
-         --exclude=$${snapshot_version}/configure.orig $${snapshot_version}; \
+       tar zcf $${snapshot_dir}.tar.gz \
+         --exclude=$${snapshot_dir}/autom4te.cache \
+         --exclude=$${snapshot_dir}/configure.ac.orig \
+         --exclude=$${snapshot_dir}/configure.orig $${snapshot_dir}; \
        mkdir -p $(RPMBUILD_DIR)/SOURCES; \
-       cp $${snapshot_version}.tar.gz $(RPMBUILD_DIR)/SOURCES
+       cp $${snapshot_dir}.tar.gz $(RPMBUILD_DIR)/SOURCES
 
 .PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm

http://git.savannah.gnu.org/cgit//commit/?id=3bcd22a7a3d1fdb73579007d005c9914bee26e43


commit 3bcd22a7a3d1fdb73579007d005c9914bee26e43
Author: Gabriele Giacone <address@hidden>
Date:   Fri Mar 25 03:18:55 2011 +0100

    Add mysql-devel to rpm builddep

diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index d88f378..8358330 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -15,7 +15,7 @@ URL:            http://www.gnu.org/software/gnash/
 Source0:        
http://www.getgnash.org/packages/snapshots/fedora/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
 
-BuildRequires:  redhat-lsb
+BuildRequires:  redhat-lsb mysql-devel
 # bitmap libraries for loading images
 BuildRequires:  libpng-devel libjpeg-devel giflib-devel
 # these are needed for the python gtk widget

http://git.savannah.gnu.org/cgit//commit/?id=5cfba6b818d7349874712d376f5b43570851bb2e


commit 5cfba6b818d7349874712d376f5b43570851bb2e
Author: Gabriele Giacone <address@hidden>
Date:   Fri Mar 25 03:17:33 2011 +0100

    Remove .la from gnash-dev package

diff --git a/packaging/debian/gnash-dev.install 
b/packaging/debian/gnash-dev.install
index a9cfa74..c3ad3a6 100644
--- a/packaging/debian/gnash-dev.install
+++ b/packaging/debian/gnash-dev.install
@@ -1,4 +1,3 @@
 usr/include/gnash
 #usr/lib/gnash/lib*.a
-usr/lib/gnash/*.la
 usr/*/pkgconfig/*

http://git.savannah.gnu.org/cgit//commit/?id=062ae78d9ed7e0ee9ff1e6f4b7ec9cae850b11d5


commit 062ae78d9ed7e0ee9ff1e6f4b7ec9cae850b11d5
Author: Gabriele Giacone <address@hidden>
Date:   Fri Mar 25 03:16:39 2011 +0100

    Add ~codename to deb package version.

diff --git a/packaging/deb.am b/packaging/deb.am
index 5d410a5..9529d5b 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -202,9 +202,9 @@ deb-edit-changelog:
        fi; \
        if test -e $(BUILD_DIR)/debian/changelog; then \
          mv -f $(BUILD_DIR)/debian/changelog 
$(BUILD_DIR)/debian/changelog.orig; \
-         sed -e "s:master:$(BUILD_VERSION):" -e "s/distro/$${dist}/" 
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
+         sed -e "s:master:$(BUILD_VERSION)-1~$${dist}:" -e 
"s/distro/$${dist}/" $(srcdir)/packaging/debian/changelog > 
$(BUILD_DIR)/debian/changelog; \
        else \
-         sed -e "s:master:$(BUILD_VERSION):"  -e "s/distro/$${dist}/" 
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
+         sed -e "s:master:$(BUILD_VERSION)-1~$${dist}:"  -e 
"s/distro/$${dist}/" $(srcdir)/packaging/debian/changelog > 
$(BUILD_DIR)/debian/changelog; \
        fi
 
 # Edit the configure scripts, so if somebody reconfigures from this tarball,

-----------------------------------------------------------------------

Summary of changes:
 packaging/deb.am                   |    4 ++--
 packaging/debian/gnash-dev.install |    1 -
 packaging/redhat/gnash.spec        |    6 ++++--
 packaging/rpm.am                   |   30 ++++++++++++++----------------
 4 files changed, 20 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
Gnash