diff --git a/.gitignore b/.gitignore index 3836ffd..52788b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz +/utf8-string-0.3.8.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 6e7697e..dfc32ec 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -3,14 +3,13 @@ %global pkg_name utf8-string Name: ghc-%{pkg_name} -Version: 0.3.7 -Release: 10%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -Patch0: utf8-string-0.3.7-bytestring-in-base-flag.patch +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 BuildRequires: ghc-rpm-macros @@ -26,18 +25,18 @@ UTF8 without truncation. %package devel Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -This package provides the Haskell utf8-string library development files. +This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%patch0 -p1 -b .orig %build @@ -64,6 +63,9 @@ This package provides the Haskell utf8-string library development files. %changelog +* Fri Jan 23 2015 Jens Petersen - 0.3.8-1 +- update to 0.3.8 + * Sat Aug 16 2014 Fedora Release Engineering - 0.3.7-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 9c8cf85..4bbfc37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50e5c395713e716e0e4a56da73f87ccd utf8-string-0.3.7.tar.gz +674d0052e88e6b2030915e30cf06b171 utf8-string-0.3.8.tar.gz diff --git a/utf8-string-0.3.7-bytestring-in-base-flag.patch b/utf8-string-0.3.7-bytestring-in-base-flag.patch deleted file mode 100644 index d5ed8b3..0000000 --- a/utf8-string-0.3.7-bytestring-in-base-flag.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- utf8-string-0.3.7/utf8-string.cabal~ 2011-08-25 21:26:51.000000000 +0900 -+++ utf8-string-0.3.7/utf8-string.cabal 2012-11-18 02:01:06.366515676 +0900 -@@ -15,6 +15,7 @@ - cabal-version: >= 1.2 - - flag bytestring-in-base -+ default: False - - library - Ghc-options: -W -O2