Accepting request 459982 from devel:languages:haskell

- update to 1.6.95
- sync with upstream
* fix compatibility with cabal 1.24.1.0 and 1.24.2.0

OBS-URL: https://build.opensuse.org/request/show/459982
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-rpm-macros?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2017-02-28 22:50:53 +00:00 committed by Git OBS Bridge
commit 6ac1aed32a
4 changed files with 16 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42682dc6f4343d337802fa8d0be0a52d86dad02809638b10b2838d52250782c8
size 23610

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46f5dd0cf3e2ff2757191b2c722d964a7882d439511a372379e7f545a4a049dd
size 16872

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 20 08:39:08 UTC 2017 - mimi.vx@gmail.com
- update to 1.6.95
- sync with upstream
* fix compatibility with cabal 1.24.1.0 and 1.24.2.0
-------------------------------------------------------------------
Fri Oct 14 12:32:13 UTC 2016 - mimi.vx@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package ghc-rpm-macros
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -20,7 +20,7 @@
%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.6.91
Version: 1.6.95
Release: 0
BuildArch: noarch
Summary: RPM Macros for building packages for GHC
@ -30,9 +30,9 @@ Group: Development/Libraries/Other
Url: https://fedoraproject.org/wiki/Haskell_SIG
# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros
Source0: %{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.xz
BuildRequires: bzip2
BuildRequires: xz
Requires: rpm
%if %{undefined without_hscolour}
Requires: hscolour
@ -77,6 +77,7 @@ install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-de
install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag
install -p -D -m 0755 ghc-pkg-wrapper %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
%files
%defattr(-,root,root,-)
@ -88,6 +89,7 @@ install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.att
%{_bindir}/cabal-tweak-flag
%{_prefix}/lib/rpm/ghc-pkg-wrapper
%{_prefix}/lib/rpm/fileattrs/ghc.attr
%{_prefix}/lib/rpm/ghc-dirs.sh
%files extra
%defattr(-,root,root,-)