[gtk2hs-buildtools/f14] hand-merge 0.12.1 from f15

Jens Petersen petersen at fedoraproject.org
Fri Sep 23 16:06:08 UTC 2011


commit 0f2994952b4f88e2a506284b4e7a54c83bbdef67
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 24 01:05:55 2011 +0900

    hand-merge 0.12.1 from f15

 .gitignore             |    2 +
 gtk2hs-buildtools.spec |   50 ++++++++++++++++++++++++++++++-----------------
 sources                |    2 +-
 3 files changed, 35 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15c3805..b9cbbfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 gtk2hs-buildtools-0.9.tar.gz
 /gtk2hs-buildtools-0.11.1.tar.gz
 /gtk2hs-buildtools-0.11.2.tar.gz
+/gtk2hs-buildtools-0.12.0.tar.gz
+/gtk2hs-buildtools-0.12.1.tar.gz
diff --git a/gtk2hs-buildtools.spec b/gtk2hs-buildtools.spec
index 5daf90b..ac4c578 100644
--- a/gtk2hs-buildtools.spec
+++ b/gtk2hs-buildtools.spec
@@ -1,24 +1,17 @@
-# link with shared libs
-%bcond_without dynamic
-
-# ghc does not emit debug information
-%global debug_package %{nil}
-
 Name:           gtk2hs-buildtools
-Version:        0.11.2
-Release:        1%{?dist}.1
+Version:        0.12.1
+Release:        1%{?dist}
 Summary:        Haskell Gtk2Hs buildtools
 
 Group:          Development/Tools
 License:        GPLv2+
 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:  alex, happy
+BuildRequires:  ghc-containers-devel, ghc-haskell98-devel, ghc-pretty-devel, ghc-process-devel
 
 %description
 This package provides a set of helper programs necessary to build
@@ -43,21 +36,42 @@ the gtk2hs libraries themselves.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_bin_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_bindir}/gtk2hs*
 %{_datadir}/%{name}-%{version}
 
+
 %changelog
+* Tue Sep 20 2011 Jens Petersen <petersen at redhat.com> - 0.12.1-1
+- update to 0.12.1
+
+* Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-6
+- ghc_arches replaces ghc_excluded_archs
+
+* Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-5
+- BR ghc-Cabal-devel and use ghc_excluded_archs
+
+* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.12.0-4
+- Enable build on sparcv9
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jan 15 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-2
+- update to cabal2spec-0.22.4
+- BR ghc-devel
+
+* Mon Nov 29 2010 Jens Petersen <petersen at redhat.com> - 0.12.0-1
+- update to 0.12.0
+
+* Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 0.11.2-2
+- rebuild
+
 * Tue Oct 05 2010 jkeating - 0.11.2-1.1
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 6c88d14..37d1d65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2eb2a72431870cd741dadf4fa528ebc3  gtk2hs-buildtools-0.11.2.tar.gz
+225cbf3736b5ac3053f8c797687c7554  gtk2hs-buildtools-0.12.1.tar.gz


More information about the scm-commits mailing list