From b7f8198dd95bd78f90387688956d13dec7eab2f4801d9658f5ad2c17142e3e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 18 Jul 2016 12:02:48 +0000 Subject: [PATCH] Accepting request 409784 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/409784 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-gitrev?expand=0&rev=3 --- ghc-gitrev.changes | 5 +++++ ghc-gitrev.spec | 24 ++++++++---------------- gitrev-1.1.0.tar.gz | 3 --- gitrev-1.2.0.tar.gz | 3 +++ 4 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 gitrev-1.1.0.tar.gz create mode 100644 gitrev-1.2.0.tar.gz diff --git a/ghc-gitrev.changes b/ghc-gitrev.changes index 2058995..8e6e71d 100644 --- a/ghc-gitrev.changes +++ b/ghc-gitrev.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:07:18 UTC 2016 - psimons@suse.com + +- Update to version 1.2.0 revision 0 with cabal2obs. + ------------------------------------------------------------------- Tue Nov 17 21:50:28 UTC 2015 - mimi.vx@gmail.com diff --git a/ghc-gitrev.spec b/ghc-gitrev.spec index 2d633d0..13e39de 100644 --- a/ghc-gitrev.spec +++ b/ghc-gitrev.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-gitrev # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global pkg_name gitrev -Name: ghc-gitrev -Version: 1.1.0 +%global pkg_name gitrev +Name: ghc-%{pkg_name} +Version: 1.2.0 Release: 0 Summary: Compile git revision info into Haskell projects -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-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-process-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description @@ -42,19 +40,17 @@ Some handy Template Haskell splices for including the current git hash and branch in the code of your project. Useful for including in panic messages, '--version' output, or diagnostic info for more informative bug reports. - %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} @@ -70,18 +66,14 @@ This package provides the Haskell %{pkg_name} library development files. %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,-) - %changelog diff --git a/gitrev-1.1.0.tar.gz b/gitrev-1.1.0.tar.gz deleted file mode 100644 index 60468fd..0000000 --- a/gitrev-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aabc77851c0de49bd3495fb2cf933170a5d566a19cfb230e1cc758f5775de120 -size 3075 diff --git a/gitrev-1.2.0.tar.gz b/gitrev-1.2.0.tar.gz new file mode 100644 index 0000000..7fb2642 --- /dev/null +++ b/gitrev-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4391e34edb5caaab901c6faa4369b246b6896c747869f6ab85b6db5524003102 +size 3238