From 4e04cfd1ef83f6470d7e964373b1fe2845787bb6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:11:41 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for alex --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 62e762baded156d0d2342e98e2a804e3d4e6d715 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:07 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c932de2..e921a95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alex -# $Id$ +# $Id: Makefile,v 1.1 2007/09/25 18:24:22 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 96bda3fdd42f957d812805b89472e103da6e017f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:41:33 +0000 Subject: [PATCH 3/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e921a95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alex -# $Id: Makefile,v 1.1 2007/09/25 18:24:22 kevin Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 488576ff8b7320547b91eed99ee43cc6aa18626a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 7 Oct 2010 13:19:14 +1000 Subject: [PATCH 4/5] update to f14 package --- .gitignore | 2 +- alex.spec | 43 ++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b7ecb13..7db6941 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -alex-2.3.1.tar.gz +alex-2.3.3.tar.gz diff --git a/alex.spec b/alex.spec index 1fb91fe..edb9975 100644 --- a/alex.spec +++ b/alex.spec @@ -1,20 +1,24 @@ +# link with shared libs +%bcond_without dynamic + # ghc does not emit debug information %global debug_package %{nil} Name: alex -# part of haskell-platform-2009.2.0.2 -Version: 2.3.1 -Release: 6%{?dist} +# part of haskell-platform-2010.2.0.0 +Version: 2.3.3 +Release: 1%{?dist} 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/cgi-bin/hackage-scripts/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros +BuildRequires: ghc +BuildRequires: ghc-rpm-macros >= 0.7.0 BuildRequires: autoconf docbook-style-xsl libxslt %description @@ -28,19 +32,18 @@ expressions. It is similar to the tool lex or flex for C/C++. %build -%cabal_configure -%cabal build +%ghc_bin_build cd doc autoreconf ./configure --prefix=%{_prefix} --libdir=%{_libdir} make html -cd - +cd .. %install rm -rf $RPM_BUILD_ROOT -%cabal_install +%ghc_bin_install %clean @@ -55,6 +58,28 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 16 2010 Jens Petersen - 2.3.3-1 +- 2.3.3 release for haskell-platform-2010.2.0.0 + +* Sun Jun 27 2010 Jens Petersen - 2.3.2-3 +- sync cabal2spec-0.22.1 + +* Sat Apr 24 2010 Jens Petersen - 2.3.2-2 +- rebuild against ghc-6.12.2 + +* Wed Mar 24 2010 Jens Petersen - 2.3.2-1 +- update to 2.3.2 for haskell-platform-2010.1.0.0 + +* Mon Jan 11 2010 Jens Petersen - 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 +- add bcond for dynamic linking + +* Mon Dec 21 2009 Jens Petersen - 2.3.1-7 +- build dynamically with ghc-6.12.1 + * Fri Jul 24 2009 Fedora Release Engineering - 2.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 7411b82..15f1d74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8c26af3370388297cee4b8c767d72d9 alex-2.3.1.tar.gz +bc5d90c932470ee8a64e6cda162ca05e alex-2.3.3.tar.gz From ec71274b7ece3a87c727ba4a5d850db7a1a27e23 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 14 May 2012 14:23:09 +0900 Subject: [PATCH 5/5] merge f17 for haskell-platform-2011.4 --- .gitignore | 2 ++ alex.spec | 68 ++++++++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7db6941..efe2d61 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ alex-2.3.3.tar.gz +/alex-2.3.4.tar.gz +/alex-2.3.5.tar.gz diff --git a/alex.spec b/alex.spec index edb9975..87e4206 100644 --- a/alex.spec +++ b/alex.spec @@ -1,24 +1,16 @@ -# link with shared libs -%bcond_without dynamic - -# ghc does not emit debug information -%global debug_package %{nil} - Name: alex -# part of haskell-platform-2010.2.0.0 -Version: 2.3.3 -Release: 1%{?dist} +# part of haskell-platform-2011.2.0.1 +Version: 2.3.5 +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/%{name} +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) -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc -BuildRequires: ghc-rpm-macros >= 0.7.0 +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros BuildRequires: autoconf docbook-style-xsl libxslt %description @@ -42,14 +34,9 @@ cd .. %install -rm -rf $RPM_BUILD_ROOT %ghc_bin_install -%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root,-) %doc ANNOUNCE LICENSE README TODO doc/alex examples @@ -58,6 +45,47 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.3.5-6.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Oct 20 2011 Marcela Mašláňová - 2.3.5-5.2 +- rebuild with new gmp without compat lib + +* Mon Oct 10 2011 Peter Schiffer - 2.3.5-5.1 +- rebuild with new gmp + +* Tue Jun 21 2011 Jens Petersen - 2.3.5-5 +- ghc_arches replaces ghc_excluded_archs + +* Mon Jun 20 2011 Jens Petersen - 2.3.5-4 +- BR ghc-Cabal-devel +- use ghc_excluded_archs + +* Wed May 18 2011 Jens Petersen - 2.3.5-3 +- add ppc64 + +* Thu Mar 10 2011 Fabio M. Di Nitto - 2.3.5-2 +- Enable build on sparcv9 + +* Tue Feb 15 2011 Jens Petersen - 2.3.5-1 +- update to 2.3.5 for haskell-platform-2011.1 + +* Mon Feb 07 2011 Fedora Release Engineering - 2.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Jens Petersen - 2.3.4-2 +- update to cabal2spec-0.22.4 +- BR ghc-devel + +* Sun Dec 5 2010 Jens Petersen - 2.3.4-1 +- update to 2.3.4 + +* Thu Nov 25 2010 Jens Petersen - 2.3.3-2 +- rebuild + +* Fri Jul 30 2010 Jens Petersen +- update to simpler url + * Fri Jul 16 2010 Jens Petersen - 2.3.3-1 - 2.3.3 release for haskell-platform-2010.2.0.0 diff --git a/sources b/sources index 15f1d74..694bb21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc5d90c932470ee8a64e6cda162ca05e alex-2.3.3.tar.gz +5e08c688ded0dcff98eaad6fc03a9402 alex-2.3.5.tar.gz