[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10579: fix packaging so we can buil
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10579: fix packaging so we can build rpm snapshots again. |
|
Date: |
Sat, 14 Feb 2009 09:31:57 -0700 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10579
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-02-14 09:31:57 -0700
message:
fix packaging so we can build rpm snapshots again.
added:
packaging/redhat/klash.spec
modified:
packaging/redhat/gnash.spec
packaging/rpm.am
packaging/snapshot.am
=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec 2008-10-25 17:48:00 +0000
+++ b/packaging/redhat/gnash.spec 2009-02-14 16:31:57 +0000
@@ -1,7 +1,8 @@
Name: gnash
-Version: 20081024
+Version: 20090213
Release: 1
-Distribution: fc9
+Distribution: fc10
+# Distribution: ydl6
Summary: GNU SWF player
Group: Applications/Multimedia
@@ -9,27 +10,25 @@
Packager: Rob Savoye <address@hidden>
License: GPLv3
URL: http://www.gnu.org/software/gnash/
-Source0:
http://www.getgnash.org/packages/snapshots/fedora/%{name}_%{version}.tar.gz
+Source0:
http://www.getgnash.org/packages/snapshots/fedora/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
-
-#AutoReqProv: no
-
BuildRequires: libpng-devel libjpeg-devel libogg-devel
BuildRequires: gtk2-devel libX11-devel libXt-devel glib2-devel
-BuildRequires: cairo-devel atk-devel pango-devel
-BuildRequires: agg-devel libxml2-devel boost-devel curl-devel libXt-devel
+BuildRequires: atk-devel pango-devel
+BuildRequires: agg-devel boost-devel curl-devel libXt-devel
BuildRequires: xorg-x11-proto-devel SDL-devel
-BuildRequires: kdelibs3-devel kdebase3-devel qt3-devel
-BuildRequires: gstreamer >= 0.10, gstreamer-ffmpeg
+%if %{distribution} != "ydl6"
+BuildRequires: ffmpeg-devel
+%endif
# Installation requirements
Requires: libpng libjpeg libogg
-Requires: gtk2 libX11 libXt glib2 cairo atk pango
-Requires: agg libxml2 boost libcurl libXt SDL
-Requires: gstreamer >= 0.10 gstreamer-ffmpeg
-Requires: gstreamer-plugins-base
-#Requires: xorg-x11-proto kdelibs3 kdebase3 qt3
+Requires: gtk2 libX11 libXt glib2 atk pango
+Requires: agg boost libcurl libXt SDL
+%if %{distribution} != "ydl6"
+Requires: ffmpeg
+%endif
# BuildRequires: scrollkeeper
@@ -52,15 +51,6 @@
%description plugin
The gnash SWF player plugin for firefox or mozilla.
-%package klash
-Summary: Konqueror SWF player plugin
-Requires: %{name} = %{version}-%{release}
-Requires: kdelibs kdelibs qt gnash
-Group: Applications/Multimedia
-
-%description klash
-The gnash SWF player plugin for Konqueror.
-
%package cygnal
Summary: Streaming media server
Requires: %{name} = %{version}-%{release}
@@ -74,8 +64,6 @@
%build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
# handle cross building rpms. This gets messy when building for two
# archtectures with the same CPU type, like x86-Linux -> OLPC. We have
# to do this because an OLPC requires RPMs to install software, but
@@ -119,19 +107,30 @@
# build RPMs on, so we do it this way.
%if olpc
CROSS_OPTS="$CROSS_OPTS --disable-kparts --disable-menus"
- SOUND="--enable-media=gst"
+ SOUND="--enable-media=gst --enable-jemalloc"
GUI="--enable-gui=gtk"
RENDERER="$RENDERER --with-pixelformat=RGB565"
%endif
%else
# Native RPM build
CROSS_OPTS="" # "--enable-ghelp --enable-docbook"
- SOUND="--enable-media=gst"
- RENDERER=""
-%endif
+ GUI="--enable-gui=gtk"
+ SOUND="--enable-media=ffmpeg --enable-jemalloc"
+ RENDERER="" # --enable-render=ogl
+%endif
+
+%if %{distribution} != "ydl6"
+ SOUND="--enable-media=gst"
+%endif
+
+# we disable the testuites by default, as when building packages we
+# should have already been running the testsuites as part of the
+# normal build & test development cycle.
# The default options for the configure aren't suitable for
# cross configuring, so we force them to be what we know is correct.
+# uncommenting these will produce huge volumes of debug info from the
+# shell, but sometimes that's what you need to do.
# export CONFIG_SHELL="sh -x"
# sh -x ./configure \
%if %{cross_compile}
@@ -140,36 +139,34 @@
$SOUND $GUI \
$RENDERER \
--disable-dependency-tracking \
+ --disable-testsuites \
--disable-rpath \
--with-plugindir=%{_libdir}/mozilla/plugins
-make %{?_smp_mflags} $(MAKEFLAGS) dumpconfig all
+make $(MAKEFLAGS) dumpconfig all
%else
./configure \
$CROSS_OPTS \
- $SOUND \
+ $SOUND $GUI \
$RENDERER \
--disable-dependency-tracking \
--disable-rpath \
- --disable-cygnal \
- --enable-shared \
+ --enable-cygnal \
--disable-testsuite \
--prefix=/usr \
--mandir=%{_prefix}/share/man \
--infodir=%{_prefix}/share/info \
- --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
- --with-kde-plugindir=%{_libdir}/kde3 \
- --with-kde-pluginprefix=%{_prefix} \
- --with-kde-servicesdir=%{_prefix}/share/services \
- --with-kde-appsdatadir=%{_prefix}/share/apps/klash \
- --with-kde-configdir=${_datadir}/config
+ --with-npapi-plugindir=%{_libdir}/mozilla/plugins
make $(MAKEFLAGS) dumpconfig all
%endif
+# When testing the spec file, try setting MAKEFLAGS to
+# "CXXFLAGS-O0 -j4" to speed up getting results. Note *don't*
+# do that for release buulds, as the performance will suffer.
%install
strip gui/.libs/*-gnash
-strip utilities/.libs/dumpshm utilities/.libs/g* utilities/.libs/soldumper
+strip utilities/.libs/dumpshm utilities/.libs/g* utilities/.libs/soldumper
utilities/.libs/flvdumper utilities/.libs/rtmpget cygnal/.libs/cygnal
rm -rf $RPM_BUILD_ROOT
make install install-plugins DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
@@ -210,6 +207,8 @@
%{_bindir}/soldumper
%{_bindir}/flvdumper
%{_bindir}/dumpshm
+%{_bindir}/rtmpget
+%{_bindir}/cygnal
%{_libdir}/gnash/*.so*
%{_libdir}/mozilla/plugins/*.so
%{_prefix}/share/gnash/GnashG.png
@@ -234,21 +233,14 @@
%defattr(-,root,root,-)
%{_libdir}/mozilla/plugins/libgnashplugin.so
-%files klash
+%files cygnal
%defattr(-,root,root,-)
-%if !%{cross_compile}
-%{_bindir}/kde-gnash
-%{_libdir}/kde3/libklashpart.*
-%{_prefix}/share/apps/klash/klashpartui.rc
-%{_prefix}/share/apps/klash/pluginsinfo
-%{_prefix}/share/services/klash_part.desktop
-%endif
-
-# %files cygnal
-# %defattr(-,root,root,-)
-# %{_bindir}/cygnal
+%{_bindir}/cygnal
%changelog
+* Sat Feb 13 2009 Rob Savoye <address@hidden> - trunk
+- Split off klash into it's own spec file.
+
* Sat Oct 24 2008 Rob Savoye <address@hidden> - trunk
- Adjust dependencies for current bzr trunk
=== added file 'packaging/redhat/klash.spec'
--- a/packaging/redhat/klash.spec 1970-01-01 00:00:00 +0000
+++ b/packaging/redhat/klash.spec 2009-02-14 16:31:57 +0000
@@ -0,0 +1,269 @@
+Name: gnash
+Version: 20090213
+Release: 1
+Distribution: fc10
+Summary: GNU SWF player
+
+Group: Applications/Multimedia
+Vendor: Gnash Project
+Packager: Rob Savoye <address@hidden>
+License: GPLv3
+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: libpng-devel libjpeg-devel libogg-devel
+BuildRequires: libX11-devel libXt-devel
+BuildRequires: agg-devel boost-devel curl-devel libXt-devel
+BuildRequires: xorg-x11-proto-devel SDL-devel
+BuildRequires: kdelibs-devel kdebase-devel qt-devel
+BuildRequires: ffmpeg-devel
+
+# Installation requirements
+Requires: libpng libjpeg libogg
+Requires: libX11 libXt
+Requires: agg boost libcurl libXt SDL
+Requires: ffmpeg
+
+# BuildRequires: scrollkeeper
+
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+#Requires(post): /sbin/install-info
+#Requires(preun): /sbin/install-info
+
+%description
+Gnash is a GNU SWF movie player that supports many SWF v7 features, with
growing support for swf v8 and v9.
+
+%package klash3
+Summary: Konqueror SWF player plugin for KDE 3
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs kdelibs qt gnash
+Group: Applications/Multimedia
+
+%description klash3
+The gnash SWF player plugin for Konqueror in KDE 3.
+
+%package klash4
+Summary: Konqueror SWF player plugin for KDE 4
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs kdelibs qt gnash
+Group: Applications/Multimedia
+
+%description klash4
+The gnash SWF player plugin for Konqueror in KDE4.
+
+%prep
+%setup -q
+
+%build
+
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+
+# Native RPM build
+CROSS_OPTS="" # "--enable-ghelp --enable-docbook"
+GUI="" # --enable-gui=gtk,kde3,kde4
+SOUND="--enable-media=ffmpeg --enable-jemalloc"
+RENDERER="" # --enable-render=ogl
+KDE3_OPTS="--with-kde3-plugindir=%{_libdir}/kde3/plugins \
+ --with-kde3-pluginprefix=%{_prefix} \
+ --with-kde3-servicesdir=%{_prefix}/share/services \
+ --with-kde3-appsdatadir=%{_prefix}/share/apps/klash \
+ --with-kde3-configdir=${_datadir}/config"
+KDE4_OPTS="--with-kde4-plugindir=%{_libdir}/kde4/plugins \
+ --with-kde4-pluginprefix=%{_prefix} \
+ --with-kde4-servicesdir=%{_prefix}/share/services \
+ --with-kde4-appsdatadir=%{_prefix}/share/apps/klash \
+ --with-kde4-configdir=${_datadir}/config"
+
+# we disable the testuites by default, as when building packages we
+# should have already been running the testsuites as part of the
+# normal build & test development cycle.
+./configure \
+ $CROSS_OPTS \
+ $SOUND $GUI \
+ $RENDERER \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --enable-cygnal \
+ --disable-testsuite \
+ --prefix=/usr \
+ --mandir=%{_prefix}/share/man \
+ --infodir=%{_prefix}/share/info \
+ --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
+ $KDE3_OPTS \
+ $KDE$_OPTS
+
+make $(MAKEFLAGS) dumpconfig all
+# When testing the spec file, try setting MAKEFLAGS to
+# "CXXFLAGS-O0 -j4" to speed up getting results. Note *don't*
+# do that for release buulds, as the performance will suffer.
+
+%install
+strip gui/.libs/kde*-gnash
+strip utilities/.libs/dumpshm utilities/.libs/g* utilities/.libs/soldumper
utilities/.libs/flvdumper cygnal/.libs/cygnal
+rm -rf $RPM_BUILD_ROOT
+make install install-plugins DESTDIR=$RPM_BUILD_ROOT
+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
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+%if !%{cross_compile}
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+/sbin/install-info --entry="* Gnash: (gnash). GNU SWF Player"
%{_infodir}/%{name}.info %{_infodir}/dir || :
+%endif
+
+%preun
+if [ $1 = 0 ]; then
+ /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+%postun
+/sbin/ldconfig
+%if !%{cross_compile}
+scrollkeeper-update -q || :
+%endif
+
+%files
+%defattr(-,root,root,-)
+%dump
+%doc README AUTHORS COPYING NEWS
+%{_bindir}/gnash
+%{_bindir}/kde*-gnash
+%{_bindir}/gprocessor
+%{_bindir}/soldumper
+%{_bindir}/flvdumper
+%{_bindir}/dumpshm
+%{_bindir}/cygnal
+%{_libdir}/gnash/*.so*
+%{_prefix}/share/gnash/GnashG.png
+%{_prefix}/share/gnash/gnash_128_96.ico
+%{_datadir}/man/man1/*.1*
+%{_datadir}/locale/*/LC_MESSAGES/gnash.mo
+%if !%{cross_compile}
+#%{_prefix}/share/info/*.info*
+%{_prefix}/share/doc/gnash/*.html
+%{_prefix}/share/doc/gnash/images/*.png
+%{_prefix}/etc/gnashrc
+%{_prefix}/etc/gnashpluginrc
+# %{_infodir}/*.info*
+#%doc doc/C/gnash*.html
+#%doc doc/C/images/*.png
+#%doc doc/C/images/*.txt
+# %doc %{_prefix}/share/gnash/doc/gnash/C/images
+# %doc %{_prefix}/share/gnash/doc/gnash/C/*.xml
+%endif
+
+%files plugin
+%defattr(-,root,root,-)
+%{_libdir}/mozilla/plugins/libgnashplugin.so
+
+%files cygnal
+%defattr(-,root,root,-)
+%{_bindir}/cygnal
+
+%files klash3
+%defattr(-,root,root,-)
+%if !%{cross_compile}
+%{_bindir}/kde3-gnash
+%{_libdir}/kde3/libklashpart.*
+%{_prefix}/share/apps/klash/klashpartui.rc
+%{_prefix}/share/apps/klash/pluginsinfo
+%{_prefix}/share/services/klash_part.desktop
+%endif
+
+%files klash4
+%defattr(-,root,root,-)
+%if !%{cross_compile}
+%{_bindir}/kde4-gnash
+%{_bindir}/gnash
+%{_libdir}/kde4/libklashpart.*
+%{_prefix}/share/apps/klash/klashpartui.rc
+%{_prefix}/share/apps/klash/pluginsinfo
+%{_prefix}/share/services/klash_part.desktop
+%endif
+
+%changelog
+* Sat Feb 13 2009 Rob Savoye <address@hidden> - trunk
+- Split off from gnash.spec
+
+* Sat Oct 24 2008 Rob Savoye <address@hidden> - trunk
+- Adjust dependencies for current bzr trunk
+
+* Sat Feb 16 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.
+
+* Tue Mar 06 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070306-1
+- update to new snapshot
+
+* Thu Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-3
+- require xulrunner instead of webclient
+
+* Wed Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-2
+- don't delete requires .so files
+
+* Mon Feb 26 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-1
+- cvs snapshot built for olpc
+
+* Sat Nov 7 2006 Rob Savoye <address@hidden> - 0.7.2-2
+- update for 0.7.2 release.
+
+* Sat Nov 6 2006 Patrice Dumas <address@hidden> 0.7.2-1
+- update for 0.7.2 release.
+
+* Thu Oct 05 2006 Christian Iseli <address@hidden> 0.7.1-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sun Sep 24 2006 Patrice Dumas <address@hidden> 0.7.1-8
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and
+ temporarily, but there is no better solution yet) #207613
+
+* Sun Aug 27 2006 Patrice Dumas <address@hidden> - 0.7.1-7
+- add defattr for klash
+- add warnings in the description about stability
+
+* Mon Aug 21 2006 Patrice Dumas <address@hidden> - 0.7.1-6
+- remove superfluous buildrequires autoconf
+- rename last patch to gnash-plugin-tempfile-dir.patch
+- add README.fedora to plugin to explain tmpdirs
+
+* Wed Aug 16 2006 Jens Petersen <address@hidden> - 0.7.1-5
+- source qt.sh and configure --with-qtdir (Dominik Mierzejewski)
+- add plugin-tempfile-dir.patch for plugin to use a safe tempdir
+
+* Fri Jul 28 2006 Jens Petersen <address@hidden> - 0.7.1-4
+- buildrequire autotools (Michael Knox)
+
+* Fri Jun 2 2006 Patrice Dumas <address@hidden> - 0.7.1-3
+- add gnash-continue_on_info_install_error.patch to avoid
+- buildrequire libXmu-devel
+
+* Wed May 17 2006 Jens Petersen <address@hidden> - 0.7.1-2
+- configure with --disable-rpath
+- buildrequire docbook2X
+- remove devel files
+
+* Sun May 7 2006 Jens Petersen <address@hidden> - 0.7.1-1
+- update to 0.7.1 alpha release
+
+* Sat Apr 22 2006 Rob Savoye <address@hidden> - 0.7-1
+- install the info file. Various tweaks for my system based on
+Patrice's latest patch,
+
+* Fri Feb 3 2006 Patrice Dumas <address@hidden> - 0.7-0
+- initial packaging
+
=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am 2008-10-25 17:48:21 +0000
+++ b/packaging/rpm.am 2009-02-14 16:31:57 +0000
@@ -29,16 +29,23 @@
address@hidden "+%Y%m%d"`; \
pkgname="gnash-trunk_$${now}"; \
snapshot_tar="$${pkgname}.tar.gz"; \
- sed -e "s/Version.*/Version: $${now}/"
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
+ sed -e "s/Version.*/Version: trunk_$${now}/"
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
# Build an Redhat/Fedora .rpm package
+# We do this by using the source snapshot that we know is 'distclean'.
+# After copying the source tarball to where rpmbuild expects it,
+# we can then build the binary package.
+# older versions of Fedora used /usr/src/redhat/{SOURCES, BUILD} for
+# everything, but the newer version appears to use one's hone directory
+# instead, so now you don't have to be root to build rpm packages.
rpm redhat: snapshot spec
address@hidden "+%Y%m%d"`; \
pkgname="gnash-trunk_$${now}"; \
snapshot_tar="$${pkgname}.tar.gz"; \
- cp $${snapshot_tar} /usr/src/redhat/SOURCES/gnash_$${now}.tar.gz
+ cp $${snapshot_tar} $${HOME}/rpmbuild/SOURCES/
rpmbuild -ba $(RPMBUILD_FLAGS) gnash.spec
+
.PHONY : rpm redhat
=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am 2008-10-24 23:00:19 +0000
+++ b/packaging/snapshot.am 2009-02-14 16:31:57 +0000
@@ -19,9 +19,9 @@
# 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)
+SNAPSHOT_DIR = gnash-trunk_${NOW}
+SNAPSHOT_BUILD = gnash-trunk_${NOW}/_build
+SNAPSHOT_TMP = /tmp/gnash-trunk_$(NOW)
#
# build a binary snapshot from of Gnash for systems we don't have
@@ -36,7 +36,7 @@
snapshot: distdir
address@hidden "+%Y%m%d"`; \
pkgname="gnash-trunk_$${now}"; \
- snapshot_dir="gnash-$${now}"; \
+ snapshot_dir="gnash-trunk_$${now}"; \
snapshot_tar="$${pkgname}.tar.gz"; \
if test -d $${snapshot_dir}; then \
rm -fr $${snapshot_dir}; \
@@ -54,7 +54,7 @@
snapshot-configure: snapshot
address@hidden "+%Y%m%d"`; \
- pkgname="gnash-$${now}trunk"; \
+ pkgname="gnash-trunk_$${now}"; \
snapshot_dir="$${pkgname}"; \
snapshot_build="$${snapshot_dir}/_build"; \
if test ! -d $${snapshot_build}; then \
@@ -80,7 +80,7 @@
snapshot-build: snapshot-configure
address@hidden "+%Y%m%d"`; \
- pkgname="gnash-$${now}trunk"; \
+ pkgname="gnash-trunk_$${now}"; \
snapshot_dir="$${pkgname}"; \
snapshot_build="$${snapshot_dir}/_build"; \
$(LN_S) -f $${snapshot_build}/packaging/doc
$${snapshot_build}/packaging/; \
@@ -91,16 +91,16 @@
# DocBook and DocBook2X aren't installed on this machine.
snapshot-install: #snapshot-build
now=`date "+%Y%m%d"`; \
- snapshot_dir="gnash-$${now}trunk"; \
+ snapshot_dir="gnash-trunk_$${now}"; \
snapshot_build="$${snapshot_dir}/_build"; \
- snapshot_dest="/tmp/gnash-$${now}trunk-tmp"; \
+ snapshot_dest="/tmp/gnash_trunk_$${now}-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
address@hidden "+%Y%m%d"`; \
- pkgname="gnash-$${now}trunk"; \
+ pkgname="gnash-trunk_$${now}"; \
snapshot_dest="/tmp/$${pkgname}-tmp"; \
snapshot_tmp="/tmp/$${pkgname}"; \
snapshot_tar="$${snapshot_tmp}-$(host_cpu)-$(host_os).tar.gz"; \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10579: fix packaging so we can build rpm snapshots again.,
rob <=