[Gnash-commit] /srv/bzr/gnash/trunk r11940: Remove dupmshm for now.

[Rob Savoye]

------------------------------------------------------------
revno: 11940
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-13 16:09:57 -0700
message:
  Remove dupmshm for now.
  Pass --build-id to ld to keep fc11 happy when building packages.
  Make boost-date-time and boost-thread not a dependency for fc11, as
  it only uses one big package for all the boost libraries.
modified:
  packaging/redhat/gnash.spec

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2010-02-09 04:07:04 +0000
+++ b/packaging/redhat/gnash.spec       2010-02-13 23:09:57 +0000
@@ -17,8 +17,7 @@
 BuildRequires:  libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  gtk2-devel glib2-devel
 BuildRequires:  atk-devel pango-devel openssl-devel
-BuildRequires:  agg-devel boost-devel boost-date-time boost-thread
-BuildRequires: curl-devel libXt-devel
+BuildRequires:  agg-devel boost-devel curl-devel libXt-devel
 BuildRequires:  pygtk2-devel giflib-devel
 BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 # These are for the kde4 support
@@ -33,6 +32,12 @@
 Requires: agg boost libcurl SDL boost-date-time boost-thread
 Requires: freetype fontconfig libstdc++
 
+# Fedora 12 packages the boost libraries as separate packages,
+# whereas Fedora 11 has just the one dependency on boost-devel.
+%if %{distribution} != "fc11"
+BuildRequires:   boost-date-time boost-thread
+%endif
+
 # BuildRequires:  scrollkeeper
 
 #Requires(post): scrollkeeper
@@ -181,8 +186,10 @@
        $RENDERER \
        $OTHER \
        $OPTIONAL \
+       CXXFLAGS="$CXXFLAGS" \
        --disable-dependency-tracking \
        --disable-rpath \
+       --enable-cygnal \
        --enable-sdkinstall \
        --disable-testsuite \
         --prefix=/usr \
@@ -190,13 +197,7 @@
        --infodir=%{_prefix}/share/info \
        --with-plugins-install=system
 
-        # --with-kde4-pluginprefix=%{_prefix} \
-       # --with-kde4-plugindir=%{_libdir}/kde4/plugins \
-        # --with-kde4-servicesdir=%{_prefix}/share/kde4/services \
-        # --with-kde4-appsdatadir=%{_prefix}/share/kde4/apps/klash \
-        # --with-kde4-configdir=${_datadir}/config
-
-make $MAKEFLAGS dumpconfig all
+make $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*
@@ -204,10 +205,10 @@
 
 %install
 strip gui/.libs/*-gnash
-strip utilities/.libs/dumpshm  utilities/.libs/g*  utilities/.libs/soldumper 
utilities/.libs/flvdumper cygnal/.libs/cygnal
+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
-make $MAKEFLAGS install-plugins DESTDIR=$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
 %if !%{cross_compile}
 
@@ -247,7 +248,7 @@
 %{_bindir}/flvdumper
 %{_bindir}/findmicrophones
 %{_bindir}/findwebcams
-%{_bindir}/dumpshm
+#%{_bindir}/dumpshm
 %{_libdir}/gnash/*.so*
 %{_prefix}/share/gnash/GnashG.png
 %{_prefix}/share/gnash/gnash_128_96.ico