diff --git a/_service b/_service
index 76828d7..1a837da 100644
--- a/_service
+++ b/_service
@@ -1,3 +1,3 @@
-
-
\ No newline at end of file
+
+
diff --git a/_service:download_files:tagged-0.2.3.1.tar.gz b/_service:download_files:tagged-0.2.3.1.tar.gz
deleted file mode 100644
index 4c99154..0000000
--- a/_service:download_files:tagged-0.2.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76d44c8fd5eff2022519639795543b4c3c31a88a784e35d1f9997e5f064fac51
-size 3872
diff --git a/ghc-tagged.changes b/ghc-tagged.changes
index dceb8f4..a390bcb 100644
--- a/ghc-tagged.changes
+++ b/ghc-tagged.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 9 06:45:39 UTC 2013 - sbahling@suse.com
+
+- Update to 0.7 using cabal-rpm template
+
-------------------------------------------------------------------
Fri Jun 8 17:05:42 UTC 2012 - peter.trommler@ohm-hochschule.de
diff --git a/ghc-tagged.spec b/ghc-tagged.spec
index dafc422..ac99d8c 100644
--- a/ghc-tagged.spec
+++ b/ghc-tagged.spec
@@ -1,8 +1,7 @@
#
-# spec file for package ghc
+# spec file for package ghc-tagged
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2012 Herbert Graeber
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,40 +16,35 @@
#
-# 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 tagged
-%global common_summary Haskell 98 phantom types library
-
-%global common_description Haskell 98 phantom types to avoid unsafely passing dummy arguments.
-
-Name: ghc-%{pkg_name}
-Version: 0.2.3.1
+Name: ghc-tagged
+Version: 0.7
Release: 0
-Summary: %{common_summary}
+Summary: Haskell 98 phantom types to avoid unsafely passing dummy arguments
License: BSD-3-Clause
-Group: System/Libraries
+Group: System/Libraries
-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: %{!?without_hscolour:hscolour}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-data-default-devel
-BuildRequires: ghc-rpm-macros-extra
-BuildRequires: ghc-semigroups-devel
-# END cabal2spec
+BuildRequires: ghc-rpm-macros
%description
-%{common_description}
+This package provides Haskell 98 phantom types to avoid unsafely passing dummy arguments.
+
+
+%package devel
+Summary: Haskell %{pkg_name} library development files
+Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
+Requires: ghc-compiler = %{ghc_version}
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
+
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -61,13 +55,18 @@ BuildRequires: ghc-semigroups-devel
%install
%ghc_lib_install
-# devel subpackage
-%ghc_devel_package
+%post devel
+%ghc_pkg_recache
-%ghc_devel_description
+%postun devel
+%ghc_pkg_recache
-%ghc_devel_post_postun
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%doc LICENSE
-%ghc_files LICENSE
+%files devel -f %{name}-devel.files
+%defattr(-,root,root,-)
+%doc README.markdown
%changelog
diff --git a/rpmlintrc b/rpmlintrc
deleted file mode 100644
index 9cb85b4..0000000
--- a/rpmlintrc
+++ /dev/null
@@ -1 +0,0 @@
-addFilter("useless-provides")
diff --git a/tagged-0.7.tar.gz b/tagged-0.7.tar.gz
new file mode 100644
index 0000000..542be0b
--- /dev/null
+++ b/tagged-0.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f51b0ff097dadfa0508d4fff889f96e274743876c33f13c08335aca80d85e8bc
+size 5457