update to 2.12.0

- subpackage new deps: data-ordlist, graphviz, regex-applicative,
  regex-compat-tdfa, sandi, wl-pprint-text
- drop static and common package
This commit is contained in:
Jens Petersen 2016-09-05 18:11:52 +09:00
parent 946367b8ea
commit ee5593939f
3 changed files with 108 additions and 113 deletions

7
.gitignore vendored
View File

@ -12,3 +12,10 @@ darcs-2.4.4.tar.gz
/darcs-2.8.3.tar.gz
/darcs-2.8.4.tar.gz
/darcs-2.8.5.tar.gz
/darcs-2.12.0.tar.gz
/sandi-0.3.6.tar.gz
/wl-pprint-text-1.1.0.4.tar.gz
/regex-applicative-0.3.3.tar.gz
/regex-compat-tdfa-0.95.1.4.tar.gz
/graphviz-2999.18.1.2.tar.gz
/data-ordlist-0.4.7.0.tar.gz

View File

@ -1,66 +1,115 @@
# generated by cabal-rpm-0.10.1
# https://fedoraproject.org/wiki/Packaging:Haskell
# https://ghc.haskell.org/trac/ghc/ticket/10029#comment:4
%ifnarch armv7hl
%bcond_without html
%endif
%bcond_without static
# for a darcs-beta test release
#%%define beta 1
%global pkg_name darcs%{?beta:-beta}
%global pkgver %{pkg_name}-%{version}
%global dataordlist data-ordlist-0.4.7.0
%global graphviz graphviz-2999.18.1.2
%global regexapplicative regex-applicative-0.3.3
%global regexcompattdfa regex-compat-tdfa-0.95.1.4
%global sandi sandi-0.3.6
%global wlpprinttext wl-pprint-text-1.1.0.4
%global deps %{dataordlist} %{wlpprinttext} %{graphviz} %{regexapplicative} %{regexcompattdfa} %{sandi}
# override pkg_name to allow for darcs-beta
Name: darcs
Version: 2.8.5
Release: 5%{?dist}
Version: 2.12.0
Release: 1%{?dist}
Summary: Distributed Advanced Revision Control System
License: GPLv2+
URL: http://hackage.haskell.org/package/%{name}
# pkg_name to allow for darcs-beta
Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
Source0: http://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: http://hackage.haskell.org/package/%{dataordlist}/%{dataordlist}.tar.gz
Source2: http://hackage.haskell.org/package/%{graphviz}/%{graphviz}.tar.gz
Source3: http://hackage.haskell.org/package/%{regexapplicative}/%{regexapplicative}.tar.gz
Source4: http://hackage.haskell.org/package/%{regexcompattdfa}/%{regexcompattdfa}.tar.gz
Source5: http://hackage.haskell.org/package/%{sandi}/%{sandi}.tar.gz
Source6: http://hackage.haskell.org/package/%{wlpprinttext}/%{wlpprinttext}.tar.gz
Patch1: darcs-flags-default.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-rpm-macros-extra
# Begin cabal-rpm deps:
BuildRequires: chrpath
BuildRequires: ghc-HTTP-devel
BuildRequires: ghc-array-devel
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-base16-bytestring-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptohash-devel
#BuildRequires: ghc-data-ordlist-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-extensible-exceptions-devel
BuildRequires: ghc-fgl-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hashed-storage-devel
#BuildRequires: ghc-graphviz-devel
BuildRequires: ghc-colour-devel
BuildRequires: ghc-polyparse-devel
BuildRequires: ghc-temporary-devel
#BuildRequires: ghc-wl-pprint-text-devel
BuildRequires: ghc-hashable-devel
BuildRequires: ghc-haskeline-devel
BuildRequires: ghc-html-devel
BuildRequires: ghc-mmap-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-time-devel
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
BuildRequires: ghc-regex-compat-devel
#BuildRequires: ghc-regex-applicative-devel
#BuildRequires: ghc-regex-compat-tdfa-devel
#BuildRequires: ghc-sandi-devel
BuildRequires: ghc-conduit-devel
BuildRequires: ghc-stringsearch-devel
BuildRequires: ghc-tar-devel
BuildRequires: ghc-terminfo-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-compat-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-vector-devel
BuildRequires: ghc-zip-archive-devel
BuildRequires: ghc-zlib-devel
BuildRequires: libcurl-devel%{?_isa}
%if %{with tests}
BuildRequires: ghc-FindBin-devel
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-cmdargs-devel
BuildRequires: ghc-shelly-devel
BuildRequires: ghc-split-devel
BuildRequires: ghc-test-framework-devel
BuildRequires: ghc-test-framework-hunit-devel
BuildRequires: ghc-test-framework-quickcheck2-devel
%endif
# End cabal-rpm deps
BuildRequires: bash-completion
%if %{with html}
BuildRequires: latex2html
%endif
Obsoletes: darcs-server < 2.2.1-6
%if %{with static}
Requires: %{name}-common = %{version}-%{release}
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
%endif
# Fedora 25
Obsoletes: darcs-common < %{version}-%{release}
Obsoletes: darcs-static < %{version}-%{release}
%description
Darcs is a distributed, interactive, smart revision control system.
@ -72,31 +121,9 @@ Originally developed by physicist David Roundy,
darcs is based on a unique algebra of patches.
%if %{with static}
%package common
Summary: Common files for %{name}
%description common
This provides the common files for %{name}.
%package static
Summary: Static Haskell build
Requires: %{name}-common = %{version}-%{release}
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
%description static
This provides a build with Haskell libraries statically linked.
%endif
%package -n ghc-%{name}
Summary: Haskell %{name} library
Obsoletes: ghc-darcs%{!?beta:-beta} < %{version}-%{release}
%if %{with static}
Requires: %{name}-common = %{version}-%{release}
%endif
%description -n ghc-%{name}
This package provides the Haskell %{name} shared library.
@ -118,25 +145,31 @@ Obsoletes: ghc-darcs%{!?beta:-beta}-devel < %{version}-%{release}
This package provides the Haskell %{name} library development files.
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{dataordlist}
%ghc_lib_subpackage %{graphviz}
%ghc_lib_subpackage %{regexapplicative}
%ghc_lib_subpackage %{regexcompattdfa}
%ghc_lib_subpackage %{sandi}
%ghc_lib_subpackage %{wlpprinttext}
%endif
%global version %{main_version}
%prep
# make it easier to build darcs-beta
%setup -q -n %{pkg_name}-%{version}
%patch1 -p1 -b .orig
cabal-tweak-flag network-uri False
cabal-tweak-flag force-char8-encoding True
%setup -q -c -n %{pkg_name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6
#%%patch1 -p1 -b .orig
%ifnarch %{ix86} x86_64 ppc
cabal-tweak-flag threaded False
%endif
%build
%if %{with static}
%define ghc_without_dynamic 1
%ghc_bin_build
mv dist/build/%{name}/%{name}{,.static}
%undefine ghc_without_dynamic
%endif
%ghc_lib_build
%ghc_libs_build %{deps} %{pkgver}
%if %{with html}
make html
@ -144,14 +177,9 @@ make html
%install
%ghc_lib_install
%if %{with static}
mv %{buildroot}%{_bindir}/%{name}{,.dynamic}
install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir}
touch %{buildroot}%{_bindir}/%{name}
rm %{buildroot}%{_pkgdocdir}/COPYING
%endif
%ghc_libs_install %{deps} %{pkgver}
cd %{pkgver}
bashcompdir=$(pkg-config --variable=completionsdir bash-completion || :)
if [ "$bashcompdir" ]; then
install -Dpm 644 contrib/darcs_completion $RPM_BUILD_ROOT$bashcompdir/darcs
@ -162,45 +190,11 @@ else
echo %{_sysconfdir}/bash_completion.d > %{name}.files
fi
%if %{with static}
# avoid rpm ghost keeping pre-alternatives binary around
%pre
if [ $1 -gt 1 ] ; then
if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then
rm %{_bindir}/%{name}
fi
fi
%ghc_fix_dynamic_rpath %{pkg_name}
%post
%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \
%{name} %{_bindir}/%{name}.dynamic 70
%postun
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.dynamic
fi
# avoid rpm ghost keeping pre-alternatives binary around
%pre static
if [ $1 -gt 1 ] ; then
if [ -f %{_bindir}/%{name} -a ! -L %{_bindir}/%{name} ]; then
rm %{_bindir}/%{name}
fi
fi
%post static
%{_sbindir}/update-alternatives --install %{_bindir}/%{name} \
%{name} %{_bindir}/%{name}.static 30
%postun static
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}.static
fi
%endif
%check
%cabal_test
%post -n ghc-%{name}-devel
@ -212,31 +206,12 @@ fi
%files -f %{name}.files
%{!?_licensedir:%global license %%doc}
%doc contrib/_darcs.zsh
%if %{with static}
%ghost %{_bindir}/%{name}
%{_bindir}/%{name}.dynamic
%else
%license COPYING
%doc NEWS
%license %{pkgver}/COPYING
%doc %{pkgver}/contrib/_darcs.zsh
%{_bindir}/darcs
%endif
%attr(0644,-,-) %{_mandir}/man1/darcs.1*
%if %{with html}
%doc doc/manual
%endif
%if %{with static}
%files common
%license COPYING
%doc NEWS
%files static
%ghost %{_bindir}/%{name}
%{_bindir}/%{name}.static
%doc %{pkgver}/doc/manual
%endif
@ -244,9 +219,16 @@ fi
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%doc %{pkgver}/CHANGELOG %{pkgver}/README.md
%changelog
* Tue Sep 6 2016 Jens Petersen <petersen@redhat.com> - 2.12.0-1
- update to 2.12.0
- subpackage new deps: data-ordlist, graphviz, regex-applicative,
regex-compat-tdfa, sandi, wl-pprint-text
- drop static and common package
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1 +1,7 @@
b440e9be53100bf660279ad7c0debf77 darcs-2.8.5.tar.gz
a6d0e9a8c8735de2b0d0ebd6c90ceb82 sandi-0.3.6.tar.gz
fd2acb06faa2f1cec8e4b9c941d6d613 wl-pprint-text-1.1.0.4.tar.gz
2743ebb412c8e7bfee34f0c9400209e5 regex-applicative-0.3.3.tar.gz
a0474ceb61330257a53cb9956f8d6edb regex-compat-tdfa-0.95.1.4.tar.gz
cc1a222b9b83b25622aff2bf22ce8c71 graphviz-2999.18.1.2.tar.gz
6a19e92d43a30ac7410b176c4072a5ec data-ordlist-0.4.7.0.tar.gz
c46f4ad16f944f34377e066775adf1be darcs-2.12.0.tar.gz