minor backport: licensedir, macros.ghc-os and cabal-tweak-drop-dep
This commit is contained in:
parent
5422ec3f6d
commit
c9e900862d
|
@ -0,0 +1,30 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e +x
|
||||
|
||||
USAGE="Usage: $0 dep"
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "$USAGE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DEP=$1
|
||||
|
||||
CABALFILE=$(ls *.cabal)
|
||||
|
||||
if [ $(echo $CABALFILE | wc -w) -ne 1 ]; then
|
||||
echo "There needs to be one .cabal file in the current dir!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f $CABALFILE.orig ]; then
|
||||
BACKUP=.orig
|
||||
fi
|
||||
|
||||
if grep "$DEP" $CABALFILE | sed -e "s/$DEP//" | grep -q -e "[A-Za-z]"; then
|
||||
echo "$0: deleting whole $DEP lines not safe - try more precise pattern"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i$BACKUP -e "/$DEP/d" $CABALFILE
|
|
@ -1,22 +1,22 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%global macros_dir %{_rpmconfigdir}/macros.d
|
||||
%else
|
||||
%global macros_dir %{_sysconfdir}/rpm
|
||||
%endif
|
||||
|
||||
# uncomment to bootstrap without hscolour
|
||||
#%%global without_hscolour 1
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 1.0.10
|
||||
Version: 1.0.11
|
||||
Release: 1%{?dist}
|
||||
Summary: RPM macros for building packages for GHC
|
||||
Summary: RPM macros for building Haskell packages for GHC
|
||||
|
||||
License: GPLv3+
|
||||
URL: https://fedoraproject.org/wiki/Packaging:Haskell
|
||||
|
||||
# This is a Fedora maintained package, originally made for
|
||||
# the distribution. Hence the source is currently only available
|
||||
# from this package. But it could be hosted on fedorahosted.org
|
||||
# for example if other rpm distros would prefer that.
|
||||
URL: https://github.com/fedora-haskell/ghc-rpm-macros
|
||||
# Currently source is only in git but tarballs could be made if it helps
|
||||
Source0: macros.ghc
|
||||
Source1: COPYING
|
||||
Source2: AUTHORS
|
||||
|
@ -26,6 +26,8 @@ Source5: cabal-tweak-flag
|
|||
Source6: macros.ghc-extra
|
||||
Source7: ghc_bin.attr
|
||||
Source8: ghc_lib.attr
|
||||
Source9: macros.ghc-os
|
||||
Source11: cabal-tweak-drop-dep
|
||||
Requires: redhat-rpm-config
|
||||
# for ghc_version
|
||||
Requires: ghc-compiler
|
||||
|
@ -66,6 +68,7 @@ echo no build stage needed
|
|||
%install
|
||||
install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc
|
||||
install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra
|
||||
install -p -D -m 0644 %{SOURCE9} %{buildroot}/%{macros_dir}/macros.ghc-os
|
||||
|
||||
install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
||||
install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
|
||||
|
@ -73,6 +76,7 @@ install -p -D -m 0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_l
|
|||
|
||||
install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
|
||||
install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
|
||||
install -p -D -m 0755 %{SOURCE11} %{buildroot}/%{_bindir}/cabal-tweak-drop-dep
|
||||
|
||||
# turn off shared libs and dynamic linking on secondary archs
|
||||
%ifnarch %{ix86} x86_64
|
||||
|
@ -86,12 +90,15 @@ EOF
|
|||
|
||||
|
||||
%files
|
||||
%doc COPYING AUTHORS
|
||||
%license COPYING
|
||||
%doc AUTHORS
|
||||
%{macros_dir}/macros.ghc
|
||||
%{macros_dir}/macros.ghc-os
|
||||
%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
|
||||
%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr
|
||||
%{_prefix}/lib/rpm/ghc-deps.sh
|
||||
%{_bindir}/cabal-tweak-dep-ver
|
||||
%{_bindir}/cabal-tweak-drop-dep
|
||||
%{_bindir}/cabal-tweak-flag
|
||||
|
||||
|
||||
|
@ -100,6 +107,11 @@ EOF
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 1.0.11-1
|
||||
- update url
|
||||
- add macros.ghc-os and cabal-tweak-drop-dep
|
||||
- install licenses (Cabal docdir) in licenses dir
|
||||
|
||||
* Thu Dec 1 2016 Jens Petersen <petersen@redhat.com> - 1.0.10-1
|
||||
- workaround unversioned _pkgdocdir in RHEL 7.3 (see #1392354)
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ fi
|
|||
# configure
|
||||
%cabal_configure\
|
||||
%ghc_check_bootstrap\
|
||||
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options
|
||||
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options
|
||||
|
||||
# install
|
||||
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
||||
|
@ -54,6 +54,8 @@ fi
|
|||
# top library dir
|
||||
%ghclibdir %{_libdir}/ghc-%{ghc_version}
|
||||
|
||||
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
|
||||
|
||||
# ghc_gen_filelists [name] [version]
|
||||
%ghc_gen_filelists()\
|
||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
# OS specific settings
|
||||
|
||||
%_ghcdocdir %{_ghclicensedir}/%{name}-%{version}
|
Loading…
Reference in New Issue