[Gnash-commit] [SCM] Gnash branch, master, updated. 6cd92f25434e0aab3fe61350f0ffd82d54669ced

[Rob Savoye]

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  6cd92f25434e0aab3fe61350f0ffd82d54669ced (commit)
      from  29738fa9e97660ace33b32301d614cc85b643e26 (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=6cd92f25434e0aab3fe61350f0ffd82d54669ced


commit 6cd92f25434e0aab3fe61350f0ffd82d54669ced
Author: Gabriele Giacone <address@hidden>
Date:   Fri Dec 24 02:58:21 2010 +0100

    Fix and improve rpm packaging, move rpm temp dir from $HOME to buildroot

diff --git a/Makefile.am b/Makefile.am
index 36844b5..4c7ab7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -514,4 +514,4 @@ packageclean:
        -test -z "$(CLEANFILES)" || rm -rf $(CLEANFILES)
  
 # these files are created when building packages
-CLEANFILES += *.deb rpmbuild *.dsc *.gz *.bz2 *.changes deb-copy-stamp 
gnash*git*
+CLEANFILES += *.deb *.dsc *.gz *.bz2 *.changes deb-copy-stamp gnash*git* 
gnash*dev rpmbuild gnash.spec .rpmmacros
diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index ae89360..faf6b50 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -15,6 +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
 # bitmap libraries for loading images
 BuildRequires:  libpng-devel libjpeg-devel giflib-devel
 # these are needed for the python gtk widget
@@ -230,7 +231,7 @@ RPM_TARGET=%{_target}
        --disable-rpath \
        --with-plugindir=%{_libdir}/mozilla/plugins
 
-make $MAKEFLAGS dumpconfig all
+make MAKEFLAGS=$MAKEFLAGS dumpconfig all
 %else
 # uncommenting these will produce huge volumes of debug info from the
 # shell, but sometimes that's what you need to do.
@@ -243,6 +244,7 @@ sh ./configure \
        $OTHER \
        $OPTIONAL \
         --prefix=/usr \
+       --libdir=%{_libdir} \
        --mandir=%{_prefix}/share/man \
        --infodir=%{_prefix}/share/info \
        --disable-dependency-tracking \
@@ -252,9 +254,10 @@ sh ./configure \
        --enable-cygnal \
        --enable-python \
        --with-plugins-install=system \
+       --with-plugindir=%{_libdir}/mozilla/plugins \
        --enable-extensions=fileio,lirc,dejagnu,mysql
 
-make $MAKEFLAGS dumpconfig all LDFLAGS="-Wl,--build-id"
+make MAKEFLAGS=$MAKEFLAGS dumpconfig all LDFLAGS="-Wl,--build-id"
 %endif
 # When testing the spec file, try setting MAKEFLAGS to
 # "CXXFLAGS-O0 -j4" to speed up getting results. Note *don't*
@@ -264,14 +267,14 @@ make $MAKEFLAGS dumpconfig all LDFLAGS="-Wl,--build-id"
 strip gui/.libs/*-gnash
 strip utilities/.libs/g* utilities/.libs/soldumper utilities/.libs/flvdumper 
cygnal/.libs/cygnal
 rm -rf $RPM_BUILD_ROOT
-make $MAKEFLAGS install DESTDIR=$RPM_BUILD_ROOT LDFLAGS="-Wl,--build-id"
-make $MAKEFLAGS install-plugins DESTDIR=$RPM_BUILD_ROOT 
LDFLAGS="-Wl,--build-id"
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
+make MAKEFLAGS=$MAKEFLAGS install DESTDIR=$RPM_BUILD_ROOT 
LDFLAGS="-Wl,--build-id"
+make MAKEFLAGS=$MAKEFLAGS install-plugins DESTDIR=$RPM_BUILD_ROOT 
LDFLAGS="-Wl,--build-id"
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
 %if !%{cross_compile}
-
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %endif
+/usr/lib/rpm/brp-compress
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -297,14 +300,14 @@ scrollkeeper-update -q || :
 %files
 %defattr(-,root,root,-)
 %{_bindir}/gtk-gnash
-%{_datadir}/man/man1/gtk-gnash.1.gz
+%{_mandir}/man1/gtk-gnash.1.gz
 
 %files common
 %defattr(-,root,root,-)
 %dump
 %doc README AUTHORS COPYING NEWS 
 %{_bindir}/gnash
-%{_datadir}/man/man1/gnash.1.gz
+%{_mandir}/man1/gnash.1.gz
 %{_bindir}/gprocessor
 %{_bindir}/soldumper
 %{_bindir}/flvdumper
@@ -315,12 +318,12 @@ scrollkeeper-update -q || :
 %{_libdir}/gnash/*.so*
 %{_prefix}/share/gnash/GnashG.png
 %{_prefix}/share/gnash/gnash_128_96.ico
-%{_datadir}/man/man1/gprocessor.1.gz
-%{_datadir}/man/man1/soldumper.1.gz
-%{_datadir}/man/man1/flvdumper.1.gz
-%{_datadir}/man/man1/findmicrophones.1.gz
-%{_datadir}/man/man1/findwebcams.1.gz
-%{_datadir}/man/man1/rtmpget.1.gz
+%{_mandir}/man1/gprocessor.1.gz
+%{_mandir}/man1/soldumper.1.gz
+%{_mandir}/man1/flvdumper.1.gz
+%{_mandir}/man1/findmicrophones.1.gz
+%{_mandir}/man1/findwebcams.1.gz
+%{_mandir}/man1/rtmpget.1.gz
 %{_datadir}/locale/*/LC_MESSAGES/gnash.mo
 %if !%{cross_compile}
 #%{_prefix}/share/info/*.info*
@@ -345,38 +348,44 @@ scrollkeeper-update -q || :
 %{_bindir}/cygnal
 %{_prefix}/etc/cygnalrc
 %{_libdir}/cygnal/plugins/*.so*
-%{_datadir}/man/man1/cygnal.1.gz
+%{_mandir}/man1/cygnal.1.gz
 
 %files devel
+%defattr(-,root,root,-)
 %{_prefix}/include/gnash/*.h*
 %{_prefix}/include/gnash/vm/*.h
 %{_prefix}/include/gnash/asobj/*.h
 %{_prefix}/include/gnash/parser/*.h
-%{_prefix}/lib/pkgconfig/gnash.pc
+%{_libdir}/pkgconfig/gnash.pc
 
 %files widget
+%defattr(-,root,root,-)
 %{_prefix}/include/gnash/*.h
-%{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
+%{_prefix}/lib*/python*/site-packages/gtk-2.0/gnash.*
 
 %files klash4
 %defattr(-,root,root,-)
 %{_bindir}/kde4-gnash
-%{_datadir}/man/man1/kde4-gnash.1.gz
-%{_libdir}/kde4/libklashpart.*
+%{_mandir}/man1/kde4-gnash.1.gz
+%{_prefix}/%{_lib}/kde4/libklashpart.*
 %{_prefix}/share/kde4/apps/klash/klashpartui.rc
 %{_prefix}/share/kde4/apps/klash/pluginsinfo
 %{_prefix}/share/kde4/services/klash_part.desktop
 
 %files fileio-extension
+%defattr(-,root,root,-)
 %{_libdir}/gnash/plugins/fileio.so
 
 %files lirc-extension
+%defattr(-,root,root,-)
 %{_libdir}/gnash/plugins/lirc.so
 
 %files dejagnu-extension
+%defattr(-,root,root,-)
 %{_libdir}/gnash/plugins/dejagnu.so
 
 %files mysql-extension
+%defattr(-,root,root,-)
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
diff --git a/packaging/rpm.am b/packaging/rpm.am
index 7a37e3b..e548472 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -22,15 +22,20 @@
 #      rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
 #               -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
 
-RPMBUILD_FLAGS = # --clean --rmsource --rmspec
+RPMBUILD_DIR = $(abs_top_builddir)/rpmbuild
+RPMMACROS = $(abs_top_builddir)/.rpmmacros
+RPMSPEC = $(abs_top_builddir)/gnash.spec
+RPMBUILD_FLAGS = --macros=/usr/lib/rpm/macros:$(RPMMACROS) # --clean 
--rmsource --rmspec
 
 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 "~" "_"`; \
-       distver=`cat /etc/redhat-release | cut -d ' ' -f 3`; \
-       echo "Editing the version in the spec file to be $${snapshot_version} 
for Distribution $${distver}..."; \
+       distro=`lsb_release -is`; \
+       echo "Editing the version in the spec file to be $${snapshot_version} 
for Distribution $${distro}..."; \
        sed -e "s/Version.*/Version:    $${snapshot_version}/" \
-           -e "s/Distribution:.*/Distribution:   fc$${distver}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; 
+           -e "s/Distribution:.*/Distribution:   $${distro}/" 
$(srcdir)/packaging/redhat/gnash.spec > $(RPMSPEC)
 
 
 # Build an Redhat/Fedora .rpm package
@@ -47,22 +52,22 @@ rpm: distdir spec setup-rpm rpm-gnash
 # build everything in one pass using rpmbuild. This was using
 # --sign gnash.spec, but it didn't work for the automated builds.
 rpm-gnash: 
-       rpmbuild -ba $(RPMBUILD_FLAGS) gnash.spec
+       rpmbuild -ba $(RPMBUILD_FLAGS) $(RPMSPEC)
 
 # configure the build directory, which we do by executing only the %prep stage,
 # which doesn't actually run configure
 rpm-configure: 
-       rpmbuild -bp $(RPMBUILD_FLAGS) gnash.spec
+       rpmbuild -bp $(RPMBUILD_FLAGS) $(RPMSPEC)
 
 # compile the build, which we do by executing only the %build stage, which
 # runs configure as the first step.
 rpm-build:
-       rpmbuild -bc --short-circuit $(RPMBUILD_FLAGS) gnash.spec
+       rpmbuild -bc --short-circuit $(RPMBUILD_FLAGS) $(RPMSPEC)
 
 # install the build, which we do by executing only the %install stage, which
 # also builds the actual rpms
 rpm-install: 
-       rpmbuild -bi --short-circuit $(RPMBUILD_FLAGS) gnash.spec
+       rpmbuild -bi --short-circuit $(RPMBUILD_FLAGS) $(RPMSPEC)
 
 # After distdir is done, all we have is an empty subdirectory
 # populated from the *_DIST variables used by Automake. RPM and Deb
@@ -91,14 +96,7 @@ setup-rpm:
          --exclude=$${snapshot_version}/autom4te.cache \
          --exclude=$${snapshot_version}/configure.ac.orig \
          --exclude=$${snapshot_version}/configure.orig $${snapshot_version}; \
-       cp $${snapshot_version}.tar.gz $${HOME}/rpmbuild/SOURCES/
+       mkdir -p $(RPMBUILD_DIR)/SOURCES; \
+       cp $${snapshot_version}.tar.gz $(RPMBUILD_DIR)/SOURCES
 
-# this removes old builds from the maintainer's $HOME/rpmbuild directory.
-rpmbuild-clean:
-       rm -f  ~/rpmbuild/SOURCES/gnash*
-       rm -fr ~/rpmbuild/BUILD/gnash*
-       rm -fr ~/rpmbuild/BUILDROOT/gnash*
-       rm -fr ~/rpmbuild/SRPMS/gnash*
-       rm -fr ~/rpmbuild/RPMS/i686/gnash*
-
-.PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm 
rpmbuild-clean
+.PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm

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

Summary of changes:
 Makefile.am                 |    2 +-
 packaging/redhat/gnash.spec |   47 +++++++++++++++++++++++++-----------------
 packaging/rpm.am            |   34 ++++++++++++++----------------
 3 files changed, 45 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
Gnash