From 883fd34c894718c7e40064d9ecef3d80de34b349ac5449012b8970cdfe863f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 17 Jul 2016 21:51:46 +0000 Subject: [PATCH] Accepting request 409741 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/409741 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=6 --- ghc-generic-deriving.changes | 5 +++++ ghc-generic-deriving.spec | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index 2543911..edb5b71 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:06:54 UTC 2016 - psimons@suse.com + +- Update to version 1.10.5 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sun Jun 19 14:47:57 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index f1b3a67..115f876 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -15,24 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global pkg_name generic-deriving +%global pkg_name generic-deriving Name: ghc-%{pkg_name} Version: 1.10.5 Release: 0 Summary: Generic programming library for generalised deriving -Group: System/Libraries - License: BSD-3-Clause +Group: System/Libraries Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-containers-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description @@ -46,23 +44,21 @@ The current implementation integrates with the new GHC Generics. See for more information. Template Haskell code is provided for supporting GHC before version 7.2. - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} -sed -i 's/\r//' examples/*.hs + %build %ghc_lib_build @@ -75,19 +71,15 @@ sed -i 's/\r//' examples/*.hs %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md examples - +%doc CHANGELOG.md README.md examples %changelog