diff --git a/ghc-show.spec b/ghc-show.spec
index a8b446d..dcf19bc 100644
--- a/ghc-show.spec
+++ b/ghc-show.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -6,31 +5,30 @@
 
 %global common_summary Show library that provides ShowQ, ShowFun, and SimpleReflect
 
-%global common_description The library provides ShowQ, ShowFun, and \
-SimpleReflect. ShowFun gives us Typeable instances for neutering \
-IO expressions. ShowQ adds SmallCheck & QuickCheck support. SimpleReflect \
-allows us to literally see how functions 'expand'.
+%global common_description This library provides ShowQ, ShowFun, and SimpleReflect.\
+ShowFun gives us Typeable instances for neutering IO expressions.\
+ShowQ adds SmallCheck & QuickCheck support.\
+SimpleReflect allows us to literally see how functions 'expand'.
 
 Name:           ghc-%{pkg_name}
 Version:        0.4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
-License:        GPLv2
-# BEGIN cabal2spec
+# SimpleReflect is BSD and show.cabal says GPL
+License:        GPL+
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 Patch0:         show-0.4.1.2-fix-fsf-address.patch
-ExclusiveArch:  %{ghc_arches}
-BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
 
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-QuickCheck-devel
 BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-smallcheck-devel
 BuildRequires:  ghc-syb-devel
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -38,7 +36,8 @@ BuildRequires:  ghc-syb-devel
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-%patch0 -p1 -b .fix
+%patch0 -p1 -b .orig
+
 
 %build
 %ghc_lib_build
@@ -48,7 +47,6 @@ BuildRequires:  ghc-syb-devel
 %ghc_lib_install
 
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -61,6 +59,10 @@ BuildRequires:  ghc-syb-devel
 
 
 %changelog
+* Sun Nov 18 2012 Jens Petersen <petersen@redhat.com> - 0.4.1.2-3
+- update with cabal-rpm
+- change license tag to GPL+ since no version specified
+
 * Fri Sep 07 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 0.4.1.2-2
 - Updated summary