[Gnash-commit] /srv/bzr/gnash/trunk r11925: add target to remove old RPM files. Tweak the names of the X11 dependencies to match Fedora 12.

[Rob Savoye]

------------------------------------------------------------
revno: 11925
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2010-02-08 21:07:04 -0700
message:
  add target to remove old RPM files. Tweak the names of the X11 dependencies 
to match Fedora 12.
modified:
  packaging/redhat/gnash.spec
  packaging/rpm.am

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2010-02-08 22:16:24 +0000
+++ b/packaging/redhat/gnash.spec       2010-02-09 04:07:04 +0000
@@ -23,23 +23,13 @@
 BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 # These are for the kde4 support
 BuildRequires:  kdelibs-devel >= 4.0, kdebase-devel >= 4.0, qt-devel >= 4.0
-
-# Mandriva uses different names for the X11 library packages
-%if %{distribution} != "fc12"
-BuildRequires:  libx11_6-devel libxt_6-devel
-%else
-BuildRequires:  libX11-devel libXt-devel xorg-x11-proto-devel 
-%endif
+BuildRequires:  libX11-devel libXt-devel
 
 # Installation requirements
 Requires: libpng libjpeg libogg gtk2 glib2 atk pango
 Requires:  gstreamer gstreamer-ffmpeg gstreamer-plugins-base
 # Mandriva uses differ names for the X11 library packages
-%if %{distribution} != "fc12"
-Requires: libx11_6 libxt_6
-%else
 Requires: libX11 libXt 
-%endif
 Requires: agg boost libcurl SDL boost-date-time boost-thread
 Requires: freetype fontconfig libstdc++
 

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2010-02-08 19:01:05 +0000
+++ b/packaging/rpm.am  2010-02-09 04:07:04 +0000
@@ -89,4 +89,12 @@
          --exclude=$${snapshot_version}/configure.orig $${snapshot_version}; \
        cp $${snapshot_version}.tar.gz $${HOME}/rpmbuild/SOURCES/
 
-.PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm
+# 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