update to 0.3.3.1

allowing prof for all archs
This commit is contained in:
Jens Petersen 2017-12-05 13:51:55 +09:00
parent d81427a345
commit 8f30472cf0
4 changed files with 16 additions and 33 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/skylighting-0.1.1.5.tar.gz /skylighting-0.1.1.5.tar.gz
/skylighting-0.3.3.1.tar.gz

View File

@ -1,4 +1,4 @@
# generated by cabal-rpm-0.11.2 # generated by cabal-rpm-0.12
# https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name skylighting %global pkg_name skylighting
@ -6,27 +6,21 @@
%bcond_with tests %bcond_with tests
# prof fails on armv7hl and s390x
# prof takes 9-10 hours on aarch64
%ifarch aarch64 armv7hl s390x
%global without_prof 1
%endif
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 0.1.1.5 Version: 0.3.3.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: Syntax highlighting library Summary: Syntax highlighting library
License: GPLv2+ License: GPLv2+
Url: https://hackage.haskell.org/package/%{pkg_name} Url: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# use regex-pcre instead of regex-pcre-builtin
Patch0: skylighting-regex-pcre.patch
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
BuildRequires: ghc-aeson-devel BuildRequires: ghc-aeson-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-html-devel
BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-case-insensitive-devel
@ -61,9 +55,12 @@ be the successor to highlighting-kate.
%package devel %package devel
Summary: Haskell %{pkg_name} library development files Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release} Provides: %{name}-static = %{version}-%{release}
Provides: %{name}-doc = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version} Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version}
%endif
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -72,7 +69,7 @@ This package provides the Haskell %{pkg_name} library development files.
%prep %prep
%setup -q -n %{pkgver} %setup -q -n %{pkgver}
%patch0 -p1 -b .orig cabal-tweak-flag system-pcre True
%build %build
@ -104,6 +101,11 @@ This package provides the Haskell %{pkg_name} library development files.
%changelog %changelog
* Tue Dec 5 2017 Jens Petersen <petersen@redhat.com> - 0.3.3.1-1
- update to 0.3.3.1
- reenable prof everywhere
- use system-pcre flag
* Mon Nov 13 2017 Jens Petersen <petersen@redhat.com> - 0.1.1.5-3 * Mon Nov 13 2017 Jens Petersen <petersen@redhat.com> - 0.1.1.5-3
- add comment for the regex-pcre patch - add comment for the regex-pcre patch

View File

@ -1,20 +0,0 @@
--- skylighting-0.1.1.5/skylighting.cabal~ 2017-02-03 22:33:39.000000000 +0900
+++ skylighting-0.1.1.5/skylighting.cabal 2017-11-08 18:31:58.633939694 +0900
@@ -228,7 +228,7 @@
mtl,
text,
bytestring,
- regex-pcre-builtin,
+ regex-pcre,
directory,
filepath,
aeson,
@@ -260,7 +260,7 @@
filepath,
bytestring,
text,
- regex-pcre-builtin,
+ regex-pcre,
safe,
hxt,
utf8-string,

View File

@ -1 +1 @@
SHA512 (skylighting-0.1.1.5.tar.gz) = 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef SHA512 (skylighting-0.3.3.1.tar.gz) = 02833e3dd81ad8e17444ae91b5d91e4873b5616f780fb0405375f2be1958fef14561540318a0e4667502936f1de356990dcbb7a190e1b9480a6e063df38607ab