diff --git a/.gitignore b/.gitignore index 92a8743..d27fe97 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ darcs-2.4.4.tar.gz /darcs-2.13.0.tar.gz /darcs-2.14.0.tar.gz /darcs-2.14.1.tar.gz +/graphviz-2999.20.0.2.tar.gz +/wl-pprint-text-1.2.0.0.tar.gz diff --git a/darcs.spec b/darcs.spec index 8f32b8a..342f32d 100644 --- a/darcs.spec +++ b/darcs.spec @@ -5,10 +5,10 @@ %global pkgver %{pkg_name}-%{version} %global dataordlist data-ordlist-0.4.7.0 -%global graphviz graphviz-2999.19.0.0 +%global graphviz graphviz-2999.20.0.2 %global regexapplicative regex-applicative-0.3.3 %global regexcompattdfa regex-compat-tdfa-0.95.1.4 -%global wlpprinttext wl-pprint-text-1.1.1.0 +%global wlpprinttext wl-pprint-text-1.2.0.0 %global subpkgs %{dataordlist} %{wlpprinttext} %{graphviz} %{regexapplicative} %{regexcompattdfa} %bcond_with tests @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 2.14.1 # can only be reset when all subpkgs bumped -Release: 19%{?dist} +Release: 20%{?dist} Summary: Distributed Advanced Revision Control System License: GPLv2+ @@ -153,6 +153,7 @@ This package provides the Haskell %{name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -160,10 +161,6 @@ This package provides the Haskell %{name} library development files. cabal-tweak-flag threaded False %endif -( -cd %{graphviz} -cabal-tweak-dep-ver fgl '< 5.6' '< 5.7' -) %build # allow dist/build/darcs/darcs to generate manpage @@ -175,8 +172,10 @@ export LD_LIBRARY_PATH=$PWD/dist/build %install +# Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install install -Dpm 644 contrib/darcs_completion %{buildroot}%{_datadir}/bash-completion/darcs @@ -197,7 +196,7 @@ install -Dpm 644 contrib/darcs_completion %{buildroot}%{_datadir}/bash-completio %files # Begin cabal-rpm files: %license COPYING -%doc README.md +%doc CHANGELOG README.md %{_bindir}/%{name} # End cabal-rpm files %doc contrib/_darcs.zsh @@ -216,6 +215,11 @@ install -Dpm 644 contrib/darcs_completion %{buildroot}%{_datadir}/bash-completio %changelog +* Mon Feb 25 2019 Jens Petersen - 2.14.1-20 +- graphviz-2999.20.0.2 +- wl-pprint-text-1.2.0.0 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 2.14.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 23527e3..2baf304 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (darcs-2.14.1.tar.gz) = 8daea7bdbe8ed5bc67ef2c44918b431a8fc6b2703068200fba338b9c051b4bafed0a1ec9dcec5a58b1530ce4a4231e3c4ecc00bd509cde9ef95d895719e89346 -SHA512 (wl-pprint-text-1.1.1.0.tar.gz) = 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd SHA512 (data-ordlist-0.4.7.0.tar.gz) = a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b SHA512 (regex-compat-tdfa-0.95.1.4.tar.gz) = 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14 SHA512 (regex-applicative-0.3.3.tar.gz) = 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8 -SHA512 (graphviz-2999.19.0.0.tar.gz) = 0b49c197ce048f49e7db780168cda6026fec52bde1edd81f8fa41b15a1c89e9b2af2a99cf7892f8b81718d31bd21d207c4b3826cd9e24d29363beb97db99229c +SHA512 (graphviz-2999.20.0.2.tar.gz) = bbe3811c542289deae546bf2ef8c2a0b0438c04e8ad1f78a4ef06a4352f164f50ef4213af6bea025fa912ea89a934ca18ccd44d61282e8638e57c988bc84ae5d +SHA512 (wl-pprint-text-1.2.0.0.tar.gz) = d81e059deeba5bb23e82a6aa3a88ddcfb2b3b40c9c9591b1e5784040b9fa01626276f5c4761b3acd33d06c75066d38868de70586fc3ae830e20260ea00e425ae