diff --git a/ghc-data-default.changes b/ghc-data-default.changes
index 042417b..3650da3 100644
--- a/ghc-data-default.changes
+++ b/ghc-data-default.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  8 11:25:21 UTC 2012 - peter.trommler@ohm-hochschule.de
+
+- use cabal2spec 0.25.5 spec file template 
+
 -------------------------------------------------------------------
 Sat Jan 21 11:25:35 UTC 2012 - herbert@graeber-clan.de
 
diff --git a/ghc-data-default.spec b/ghc-data-default.spec
index bc88627..9a525d3 100644
--- a/ghc-data-default.spec
+++ b/ghc-data-default.spec
@@ -1,6 +1,6 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+#
+# spec file for ghc-data-default
+#
 
 # Copyright (c) 2012 Herbert Graeber <herbert@graeber-clan.de>
 #
@@ -16,12 +16,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name data-default
 
-# common part of summary for all the subpackages
 %global common_summary Haskell %{pkg_name} library
 
-# main description used for all the subpackages
 %global common_description A %{pkg_name} library for Haskell.
 
 Name:           ghc-%{pkg_name}
@@ -29,53 +31,29 @@ Version:        0.3.0
 Release:        1
 Summary:        %{common_summary}
 
-Group:          Development/Libraries/Other
+Group:          System/Libraries
 License:        BSD-3-Clause
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 ExclusiveArch:  %{ix86} x86_64 %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-dlist-devel
+BuildRequires:  ghc-old-locale-devel
 # END cabal2spec
-# BR any C devel dependency here
-# list ghc-*-prof dependencies:
-
-%if %{defined sles_version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
 
 %description
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries/Other
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-# remember to require any C devel dependency here
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
 
 %build
-#%%define cabal_configure_options -f "opt1 -opt2 ..."
 %ghc_lib_build
 
 
@@ -83,22 +61,16 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
+
+%ghc_devel_description
 
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_post_postun
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%defattr(-,root,root,-)
-%endif
-
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%defattr(-,root,root,-)
+%ghc_files LICENSE
 
 
 %changelog