From 768aba3fabca76ccd37222bef3ad865bcc365326c345aaafd205650ba58ff86e Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Fri, 23 Mar 2018 13:29:33 +0000
Subject: [PATCH] Accepting request 590692 from home:mimi_vx:ghc-rpm

- update to 1.7.4
- sync with ustream
- support sublibraries

OBS-URL: https://build.opensuse.org/request/show/590692
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=82
---
 ghc-rpm-macros-1.7.2.tar.xz |  3 ---
 ghc-rpm-macros-1.7.4.tar.xz |  3 +++
 ghc-rpm-macros.changes      |  7 +++++++
 ghc-rpm-macros.spec         | 11 +++++------
 4 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 ghc-rpm-macros-1.7.2.tar.xz
 create mode 100644 ghc-rpm-macros-1.7.4.tar.xz

diff --git a/ghc-rpm-macros-1.7.2.tar.xz b/ghc-rpm-macros-1.7.2.tar.xz
deleted file mode 100644
index 8f56b9d..0000000
--- a/ghc-rpm-macros-1.7.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1b0b857799c9d949758891bd4254dec7ed1ed075db1c73b5cdeb84ed0b20d3c
-size 17140
diff --git a/ghc-rpm-macros-1.7.4.tar.xz b/ghc-rpm-macros-1.7.4.tar.xz
new file mode 100644
index 0000000..3b7b6a4
--- /dev/null
+++ b/ghc-rpm-macros-1.7.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fdf26d03383c2d6ce667c68a6546db7516ad51dd43e047bd344a54483277280
+size 17304
diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes
index d092184..ceeb304 100644
--- a/ghc-rpm-macros.changes
+++ b/ghc-rpm-macros.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 20 14:03:36 UTC 2018 - mimi.vx@gmail.com
+
+- update to 1.7.4
+- sync with ustream
+- support sublibraries
+
 -------------------------------------------------------------------
 Fri Jul 14 14:23:54 UTC 2017 - mimi.vx@gmail.com
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index bc55a12..039f149 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -19,10 +19,10 @@
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
 Name:           ghc-rpm-macros
-Version:        1.7.2
+Version:        1.7.4
 Release:        0
 Summary:        RPM Macros for building packages for GHC
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Development/Libraries/Other
 Url:            https://fedoraproject.org/wiki/Haskell_SIG
 # source gets updated with osc service dr
@@ -76,8 +76,8 @@ install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.att
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc AUTHORS
+%license COPYING
 %config %{macros_dir}/macros.ghc
 %config %{macros_dir}/macros.ghc-suse
 %{_prefix}/lib/rpm/ghc-deps.sh
@@ -89,7 +89,6 @@ install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 %{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files extra
-%defattr(-,root,root,-)
 %config %{macros_dir}/macros.ghc-extra
 
 %changelog