Accepting request 517377 from devel:languages:haskell

fix build to cope with recent lua refactoring

OBS-URL: https://build.opensuse.org/request/show/517377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-hslua?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2017-08-18 13:05:53 +00:00 committed by Git OBS Bridge
commit 1c3242618d
2 changed files with 19 additions and 19 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Aug 17 09:35:36 UTC 2017 - dimstar@opensuse.org
- Fix build with the new lua package layout by specifying
--extra-include-dirs based on lua.pc.
-------------------------------------------------------------------
Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com
- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
-------------------------------------------------------------------
Sun Jul 10 17:22:35 UTC 2016 - psimons@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package ghc-hslua
#
# 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
@ -23,14 +23,13 @@ Version: 0.4.1
Release: 0
Summary: A Lua language interpreter embedding in Haskell
License: MIT
Group: System/Libraries
Url: https://hackage.haskell.org/package/%{pkg_name}
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-rpm-macros
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: lua51-devel
%if %{with tests}
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-QuickCheck-devel
@ -39,8 +38,6 @@ BuildRequires: ghc-hspec-devel
BuildRequires: ghc-quickcheck-instances-devel
BuildRequires: ghc-text-devel
%endif
# End cabal-rpm deps
BuildRequires: lua51-devel
%description
The Scripting.Lua module is a wrapper of Lua language interpreter as described
@ -53,12 +50,12 @@ it with system-wide Lua installation, use 'system-lua' flag.
%package devel
Summary: Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires: lua51-devel
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
Requires: lua51-devel
%description devel
This package provides the Haskell %{pkg_name} library development files.
@ -66,21 +63,15 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkg_name}-%{version}
%build
%define cabal_configure_options -fsystem-lua
%define cabal_configure_options -fsystem-lua --extra-include-dirs=$(pkg-config --variable=includedir lua)
%ghc_lib_build
%install
%ghc_lib_install
%check
%if %{with tests}
%{cabal} test
%endif
%cabal_test
%post devel
%ghc_pkg_recache
@ -89,11 +80,9 @@ This package provides the Haskell %{pkg_name} library development files.
%ghc_pkg_recache
%files -f %{name}.files
%defattr(-,root,root,-)
%doc COPYRIGHT
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%doc CHANGELOG.md README.md examples
%changelog