[gnash/gnash-git] Spec cleanup

Sun Feb 13 19:31:58 UTC 2011

commit 8e7df10533b7488c59bbac4437bab9d826da8f29
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Sun Feb 13 19:31:34 2011 +0000

    Spec cleanup

 .gitignore                                         |    1 +
 ...-Remove-superfluous-linkage-in-kde4_gnash.patch |   24 -----
 0002-Fix-the-check-for-perl-in-docbook.m4.patch    |   34 -------
 0003-More-linkage-fix-for-python-mod.patch         |   38 --------
 0004-Fix-the-check-fo-libkdeui.patch               |   25 ------
 gnash-0.8.8-libcurl721-DNS-resolving.patch         |   28 ------
 gnash-0.8.8-libcurl721-FD_ZERO.patch               |   37 --------
 gnash.spec                                         |   92 ++-----------------
 sources                                            |    2 +-
 9 files changed, 12 insertions(+), 269 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index c1a0f37..541b1c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gnash-0.8.7.tar.bz2
 /gnash-0.8.8.tar.bz2
 /gnash-0.8.9-20110130git.tar.bz2
+/gnash-0.8.9-20110213git.tar.bz2
diff --git a/gnash.spec b/gnash.spec
index 989037c..bc820ff 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -1,9 +1,3 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# uncomment to enable ghelp/omf/scrollkeeper support
-# not working as of version 0.8.7
-#global scrollkeeper 1
-
 %define gitdate 20110130
 
 Name:           gnash
@@ -21,51 +15,24 @@ Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
 # register KComponentData properly in KDE 4 KPart
+# https://savannah.gnu.org/bugs/index.php?32457
 Patch0:         gnash-0.8.3-fix-kde4-port.patch
 
-# Remove superflous linkage in kde4 gnash
-Patch1:         0001-Remove-superfluous-linkage-in-kde4_gnash.patch
-
-# Fix the check for perl in docbook.m4
-Patch2:         0002-Fix-the-check-for-perl-in-docbook.m4.patch
-
-# More linkage fix for python mod
-Patch3:         0003-More-linkage-fix-for-python-mod.patch
-
-# Check for libkdeui.so instead of .la one
-Patch4:         0004-Fix-the-check-fo-libkdeui.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
-BuildRequires:  SDL-devel 
-BuildRequires:  agg-devel 
-BuildRequires:  kde-filesystem
-BuildRequires:  kdelibs-devel
-BuildRequires:  gtkglext-devel
-BuildRequires:  docbook2X
+BuildRequires:  SDL-devel agg-devel
+BuildRequires:  kde-filesystem kdelibs-devel
+BuildRequires:  gtkglext-devel pygtk2-devel
+BuildRequires:  docbook2X gettext
 BuildRequires:  %{_bindir}/docbook2pdf
 BuildRequires:  gstreamer-devel >= 0.10
-%if 0%{?scrollkeeper}
-BuildRequires:  scrollkeeper
-%endif
 BuildRequires:  giflib-devel
-BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  speex-devel
-BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  pygtk2-devel
+BuildRequires:  speex-devel gstreamer-plugins-base-devel
 BuildRequires:  libtool-ltdl-devel
 
 BuildRequires:  autoconf automake libtool
 
-%if 0%{?scrollkeeper}
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-%endif
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -124,14 +91,6 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .fix-kde4
-%patch1 -p1 -b .remove-superfluous-linkage
-%patch2 -p1 -b .fix-check-perl-docbook
-%patch3 -p1 -b .more-linkage-fix-pythonmod
-%patch4 -p1 -b .fix-libkdeui-check
-
-# Use Kevin's hack until we get a proper patch
-sed -i '/AC_LIBLTDL_CONVENIENCE/d;s|convenience recursive||g' configure.ac
-sed -i 's|$(top_builddir)/libltdl/libltdlc.la|-lltdl|g' $(find . -name 'Makefile.am')
 
 iconv -f iso-8859-1 -t utf8 < AUTHORS > AUTHORS.utf8
 touch -r AUTHORS AUTHORS.utf8
@@ -139,9 +98,6 @@ mv AUTHORS.utf8 AUTHORS
 
 autoreconf -if
 
-# delete bundled libltdl stuff to make sure it's not used
-rm -f libltdl/*.[ch] libltdl/*/*.[ch]
-
 %build
 %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
   --enable-docbook --enable-ghelp --enable-media=GST \
@@ -150,33 +106,24 @@ rm -f libltdl/*.[ch] libltdl/*/*.[ch]
   --without-swfdec-testsuite \
   --without-ming \
   --enable-cygnal \
-  --enable-sdkinstall \
   --enable-python \
   --enable-gui=gtk,kde4,sdl,fb \
   --enable-hwaccel=none \
   --enable-renderer=all \
-  --with-kde4-prefix=%{_kde4_prefix} \
-  --with-kde4-lib=%{_kde4_libdir}/kde4/devel \
-  --with-kde4-incl=%{_kde4_includedir} \
-  --without-included-ltdl
-# make sure the Qt 4 moc etc. tools are found
-export PATH=%{_qt4_prefix}/bin:$PATH
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install install-plugins \
  DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' \
  KDE4_PLUGINDIR=%{_kde4_libdir}/kde4 \
  KDE4_SERVICESDIR=%{_kde4_datadir}/kde4/services \
  KDE4_CONFIGDIR=%{_kde4_configdir} \
  KDE4_APPSDATADIR=%{_kde4_appsdir}/klash
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
-# KDE 4 doesn't need the .la file anymore, thankfully
-rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
-# Remove .la file for the python module
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/gnash.la
+
+# Remove unneeded .la files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' \;
+
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 rm -rf __dist_docs
@@ -213,15 +160,7 @@ cp -p ./gui/images/GnashG.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/app
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post 
-/sbin/ldconfig
-%if 0%{?scrollkeeper}
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-%endif
 /sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
 /sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
 
@@ -240,11 +179,6 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-/sbin/ldconfig
-%if 0%{?scrollkeeper}
-scrollkeeper-update -q || :
-%endif
-
 update-desktop-database &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
@@ -283,9 +217,6 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/*.png
 %{_datadir}/applications/*.desktop
 %{_libexecdir}/gnash-wrapper
-%if 0%{?scrollkeeper}
-%{_datadir}/omf/gnash/
-%endif
 
 %files plugin
 %defattr(-,root,root,-)
@@ -320,11 +251,8 @@ fi
 %changelog
 * Sun Jan 30 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110130git
 - Switch to 0.8.9 branch
-- Remove the SEDs related to libltdl bundling
 - Drop the curl patches
 - Explicitly disable testsuite ( we don't have the necessary deps )
-- Enable jemalloc
-- Add more linkage fix to pythonmod
 
 * 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 4dc49b5..f06e87f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f32fe8a222eec4cbd3bdcfba82751137  gnash-0.8.9-20110130git.tar.bz2
+02156293d09e1c32a35fd87e8874ba25  gnash-0.8.9-20110213git.tar.bz2
