From ae0985a107d42c0ad8f9b34e32814a4024d44a55 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 9 Feb 2017 10:51:32 +0900
Subject: [PATCH] build subpackages inside main package dir

---
 ghc-rpm-macros.spec | 5 ++++-
 macros.ghc          | 2 +-
 macros.ghc-extra    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 7c915c2..100cf6a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,7 +10,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.6.12
+Version:        1.6.13
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -147,6 +147,9 @@ EOF
 
 
 %changelog
+* Thu Feb  9 2017 Jens Petersen <petersen@redhat.com> - 1.6.13-1
+- build subpackages inside main package directory
+
 * Wed Feb  8 2017 Jens Petersen <petersen@redhat.com> - 1.6.12-1
 - no longer use a topdir for subpackage building
 - only autopackage license if subpackaging
diff --git a/macros.ghc b/macros.ghc
index 9e2f4a1..00be8b5 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -88,7 +88,7 @@ echo "%{docdir}" >> %{basepkg}-devel.files\
 fi\
 %if 0%{?1:1}\
 for i in $(ls %{buildroot}%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/%{!?1:%{name}}%{?1:%{basepkg}}); do\
-echo "%%license %{?1:../%{pkgnamever}/}$i" >> %{basepkg}.files\
+echo "%%license %{?1:%{pkgnamever}/}$i" >> %{basepkg}.files\
 done\
 %endif\
 for i in %{basepkg}.files %{basepkg}-devel.files; do\
diff --git a/macros.ghc-extra b/macros.ghc-extra
index 9c525af..cafbfa2 100644
--- a/macros.ghc-extra
+++ b/macros.ghc-extra
@@ -51,13 +51,13 @@ This package provides the Haskell %{pkgname} library development files.\
 %postun -n %{basepkg}-devel\
 %ghc_pkg_recache\
 \
-%files -n %{basepkg} -f ../%{pkgname}-%{pkgver}/%{basepkg}.files\
+%files -n %{basepkg} -f %{pkgname}-%{pkgver}/%{basepkg}.files\
 %if 0%{?rhel} && 0%{?rhel} < 7\
 %defattr(-,root,root,-)\
 %endif\
 %{?base_doc_files:%doc %base_doc_files}\
 \
-%files -n %{basepkg}-devel -f ../%{pkgname}-%{pkgver}/%{basepkg}-devel.files\
+%files -n %{basepkg}-devel -f %{pkgname}-%{pkgver}/%{basepkg}-devel.files\
 %if 0%{?rhel} && 0%{?rhel} < 7\
 %defattr(-,root,root,-)\
 %endif\