[hugin/f14/master] * Mon Aug 23 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2010.0.0-5 - The xorg-x11-devel packa

[Denis Arnaud]

commit 3aca4b39a8ba14ca63591a00edd09193a9806419
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Mon Aug 23 09:38:10 2010 +0200

    * Mon Aug 23 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2010.0.0-5
    - The xorg-x11-devel package is not available on Fedora. So,
       removed it.

 .gitignore |    6 +++++-
 hugin.spec |   16 ++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d329644..a1e2b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-hugin-2010.0.0.tar.gz
+hugin-*.tar.*
+.gitignore
+clog
+.build*
+
diff --git a/hugin.spec b/hugin.spec
index 46e6b48..c9eea1f 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,24 +1,19 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
 Version: 2010.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
 URL: http://hugin.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: shared-mime-info
 Requires: webclient
 Requires: %{name}-base = %{version}-%{release}
 BuildRequires: libpano13-devel >= 2.9.14 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
-%if 0%{?fedora} >= 9
 BuildRequires: mesa-libGLU-devel libXmu-devel
-%endif
-%if 0%{?rhl} >= 4
-BuildRequires: xorg-x11-devel
-%endif
+%{?rhel:BuildRequires: xorg-x11-devel}
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -44,7 +39,6 @@ without a GUI environment.
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # unused symlinks
@@ -61,8 +55,6 @@ desktop-file-install --vendor="" --delete-original \
   %{buildroot}/%{_datadir}/applications/PTBatcherGUI.desktop
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
 
 %post
 update-desktop-database &> /dev/null ||:
@@ -135,6 +127,10 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/deghosting_mask.*
 
 %changelog
+* Mon Aug 23 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2010.0.0-5
+- The xorg-x11-devel package is not available on Fedora. So,
+   removed it.
+
 * Wed Aug 04 2010 Adam Williamson <awilliam at redhat.com> - 2010.0.0-4
 - rebuilt against Boost 1.44