merge f17 for haskell-platform-2011.4

#2781)

.cvsignore

@@ -1 +0,0 @@
-alex-2.3.1.tar.gz

.gitignore

@@ -0,0 +1,3 @@
+alex-2.3.3.tar.gz
+/alex-2.3.4.tar.gz
+/alex-2.3.5.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: alex
-# $Id$
-NAME := alex
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

alex.spec

@@ -1,20 +1,16 @@
-# ghc does not emit debug information
-%global debug_package %{nil}
-
 Name:           alex
-# part of haskell-platform-2009.2.0.2
+# part of haskell-platform-2011.2.0.1
-Version:        2.3.1
+Version:        2.3.5
-Release:        6%{?dist}
+Release:        6%{?dist}.2
 Summary:        A lexer generator for Haskell
 
 Group:          Development/Tools
 License:        BSD
-URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/alex
+URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch:  %{ghc_arches}
-# fedora ghc archs:
+BuildRequires:  ghc-Cabal-devel
-ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc-rpm-macros
-BuildRequires:  ghc, ghc-rpm-macros
 BuildRequires:  autoconf docbook-style-xsl libxslt
 
 %description
@@ -28,23 +24,17 @@ expressions.  It is similar to the tool lex or flex for C/C++.
 
 
 %build
-%cabal_configure
+%ghc_bin_build
-%cabal build
 
 cd doc
 autoreconf
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
 make html
-cd -
+cd ..
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%ghc_bin_install
-%cabal_install
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -55,6 +45,69 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-6.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Oct 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.3.5-5.2
+- rebuild with new gmp without compat lib
+
+* Mon Oct 10 2011 Peter Schiffer <pschiffe@redhat.com> - 2.3.5-5.1
+- rebuild with new gmp
+
+* Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-5
+- ghc_arches replaces ghc_excluded_archs
+
+* Mon Jun 20 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-4
+- BR ghc-Cabal-devel
+- use ghc_excluded_archs
+
+* Wed May 18 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-3
+- add ppc64
+
+* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.3.5-2
+- Enable build on sparcv9
+
+* Tue Feb 15 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-1
+- update to 2.3.5 for haskell-platform-2011.1
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jan 15 2011 Jens Petersen <petersen@redhat.com> - 2.3.4-2
+- update to cabal2spec-0.22.4
+- BR ghc-devel
+
+* Sun Dec  5 2010 Jens Petersen <petersen@redhat.com> - 2.3.4-1
+- update to 2.3.4
+
+* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 2.3.3-2
+- rebuild
+
+* Fri Jul 30 2010 Jens Petersen <petersen@redhat.com>
+- update to simpler url
+
+* Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 2.3.3-1
+- 2.3.3 release for haskell-platform-2010.2.0.0
+
+* Sun Jun 27 2010 Jens Petersen <petersen@redhat.com> - 2.3.2-3
+- sync cabal2spec-0.22.1
+
+* Sat Apr 24 2010 Jens Petersen <petersen@redhat.com> - 2.3.2-2
+- rebuild against ghc-6.12.2
+
+* Wed Mar 24 2010 Jens Petersen <petersen@redhat.com> - 2.3.2-1
+- update to 2.3.2 for haskell-platform-2010.1.0.0
+
+* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 2.3.1-8
+- dynamic bcond is now handled by cabal_configure
+- drop redundant buildroot and its install cleaning
+
+* Tue Dec 22 2009 Jens Petersen <petersen@redhat.com>
+- add bcond for dynamic linking
+
+* Mon Dec 21 2009 Jens Petersen <petersen@redhat.com> - 2.3.1-7
+- build dynamically with ghc-6.12.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a8c26af3370388297cee4b8c767d72d9  alex-2.3.1.tar.gz
+5e08c688ded0dcff98eaad6fc03a9402  alex-2.3.5.tar.gz