[luci] Fix import from 0.24.0

[Fabio M. Di Nitto]

commit d744cf36635f3b28ebf15e055c274832a542ea96
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Fri Apr 15 08:49:07 2011 +0200

    Fix import from 0.24.0
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore |    3 ---
 luci.spec  |   20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e78d347..a388d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/luci-0.22.4.tar.bz2
-/logo.png
-/luci-0.22.6.tar.bz2
 /luci-0.24.0.tar.bz2
diff --git a/luci.spec b/luci.spec
index dc8fd15..b9b662d 100644
--- a/luci.spec
+++ b/luci.spec
@@ -47,10 +47,12 @@
 %global lucipamconfig       %{_sysconfdir}/pam.d/%{luciservice}
 %global lucisasl2config     %{_sysconfdir}/sasl2/%{luciservice}.conf
 
+## keep around for git snapshots
+## global alphatag 0.b9faf868074git
 
 Name:           luci
 Version:        0.24.0
-Release:        1%{?dist}
+Release:        2%{?alphatag:.%{alphatag}}%{?dist}
 
 Summary:        Web-based high availability administration application
 URL:            http://sources.redhat.com/cluster/wiki/Luci
@@ -61,7 +63,10 @@ Source0:        http://people.redhat.com/rmccabe/luci/luci-%{version}.tar.bz2
 # Avoid ez_setup downloading setuptools if missing (already in BuildRequires)
 #Patch0:         %{name}-setup.patch
 
+%if 0%{?rhel}
 ExclusiveArch:  i686 x86_64
+%endif
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel python-setuptools
 BuildRequires:  cyrus-sasl-devel
@@ -235,6 +240,12 @@ fi
 
 
 %changelog
+* Fri Apr 15 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.24.0-2
+- Fix spec file from 0.24.0 import:
+  - readd alphatag to support git snapshots
+  - drop exclusivearch on fedora
+  - readd missing changelog entries
+
 * Thu Apr 14 2011 Ryan McCabe <rmccabe at redhat.com> - 0.24.0-1
 - New upstream release (0.24.0)
 
@@ -274,8 +285,11 @@ fi
 - Fix bz678424 (can't add node to existing cluster)
 - Fix bz682843 (luci still tries to setup obsolete smb.sh Resource)
 
-* Mon Dec 13 2010 Ryan McCabe <rmccabe at redhat.com> - 0.23.0-1
-- New upstream release (0.23.0)
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 13 2010 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.22.6-2
+- Fix bad merge from upstream spec file
 
 * Mon Dec 13 2010 Ryan McCabe <rmccabe at redhat.com> - 0.22.6-1
 - New upstream release (0.22.6)