diff --git a/_service b/_service
index 76828d7..96813c1 100644
--- a/_service
+++ b/_service
@@ -1,3 +1,3 @@
-
-
\ No newline at end of file
+
+
diff --git a/_service:download_files:pandoc-types-1.9.1.tar.gz b/_service:download_files:pandoc-types-1.9.1.tar.gz
deleted file mode 100644
index 87418dd..0000000
--- a/_service:download_files:pandoc-types-1.9.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3188ea41957a0276fded01b64147b439e5da8fc50f663c870de78117d5b4e484
-size 13941
diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes
index d7fea77..b529142 100644
--- a/ghc-pandoc-types.changes
+++ b/ghc-pandoc-types.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May 14 13:22:09 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- new cabal-rpm spec file template
+* macros not spanning multiple spec file sections
+
+-------------------------------------------------------------------
+Fri Jan 25 13:23:53 UTC 2013 - peter.trommler@ohm-hochschule.de
+
+- update to 1.10 from upstream
+- part of pandoc 1.10 release
+
-------------------------------------------------------------------
Tue Jun 5 16:42:19 UTC 2012 - peter.trommler@ohm-hochschule.de
diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec
index 11d21c8..ac43cc7 100644
--- a/ghc-pandoc-types.spec
+++ b/ghc-pandoc-types.spec
@@ -1,8 +1,7 @@
#
-# spec file for ghc-pandoc-types
+# spec file for package ghc-pandoc-types
#
-
-# Copyright (c) 2012 Herbert Graeber
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,59 +15,75 @@
# 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 pandoc-types
-%global common_summary Haskell types for representing a structured document
-
-%global common_description This package contains definitions for the Pandoc data structure, which is used by pandoc to represent structured documents.
-
-Name: ghc-%{pkg_name}
-Version: 1.9.1
-Release: 1
-Summary: %{common_summary}
-
-Group: System/Libraries
+Name: ghc-pandoc-types
+Version: 1.10
+Release: 0
+Summary: Types for representing a structured document
License: GPL-2.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# BEGIN cabal2spec
-URL: http://hackage.haskell.org/package/%{pkg_name}
+Group: System/Libraries
+
+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}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
+BuildRequires: ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires: ghc-containers-devel
BuildRequires: ghc-syb-devel
-# END cabal2spec
+# End cabal-rpm deps
%description
-%{common_description}
+This package contains definitions for the 'Pandoc' data
+structure, which is used by pandoc to represent
+structured documents. These definitions used to live
+in the pandoc package, but starting with pandoc 1.7, they
+have been split off, so that other packages can use them
+without drawing in all of pandoc's dependencies, and
+pandoc itself can depend on packages (like citeproc-hs)
+that use them.
+#' Help EMACS syntax highlighting
+
+%package devel
+Summary: Haskell %{pkg_name} library development files
+Group: Development/Libraries/Other
+%{?ghc_devel_requires}
+
+%description devel
+This package contains definitions for the 'Pandoc' data
+structure, which is used by pandoc to represent
+structured documents. These definitions used to live
+in the pandoc package, but starting with pandoc 1.7, they
+have been split off, so that other packages can use them
+without drawing in all of pandoc's dependencies, and
+pandoc itself can depend on packages (like citeproc-hs)
+that use them.
+
+#' Help EMACS syntax highlighting
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
+%post devel
+%ghc_pkg_recache
-# devel subpackage
-%ghc_devel_package
+%postun devel
+%ghc_pkg_recache
-%ghc_devel_description
-
-
-%ghc_devel_post_postun
-
-
-%ghc_files COPYING
+%files -f %{name}.files
+%defattr(-,root,root)
+%doc COPYING
+%files devel -f %{name}-devel.files
%changelog
diff --git a/pandoc-types-1.10.tar.gz b/pandoc-types-1.10.tar.gz
new file mode 100644
index 0000000..00fc531
--- /dev/null
+++ b/pandoc-types-1.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5
+size 13830
diff --git a/rpmlintrc b/rpmlintrc
deleted file mode 100644
index 6b32474..0000000
--- a/rpmlintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-addFilter("useless-provides")
-addFilter("static-library-without-debuginfo")