Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7090e358c3 | ||
|
217c410238 | ||
|
f59c10bc9f | ||
|
575d1a366a | ||
|
99dc3d6e4c | ||
|
fec42b2c88 |
34
cabal-tweak-dep-ver
Executable file
34
cabal-tweak-dep-ver
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e +x
|
||||||
|
|
||||||
|
USAGE="Usage: $0 dep old new"
|
||||||
|
|
||||||
|
if [ $# -ne 3 ]; then
|
||||||
|
echo "$USAGE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
DEP=$1
|
||||||
|
OLD=$(echo $2 | sed -e "s/*/\\\\*/g" -e "s/\./\\\\./g")
|
||||||
|
NEW=$3
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
BREAK=[^[:alnum:]-]
|
||||||
|
|
||||||
|
if ! grep -q "$BREAK$DEP$BREAK[^,]*$OLD" $CABALFILE; then
|
||||||
|
echo "$CABALFILE does not match: $DEP $OLD"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f $CABALFILE.orig ]; then
|
||||||
|
BACKUP=.orig
|
||||||
|
fi
|
||||||
|
|
||||||
|
sed -i$BACKUP -e "s/\($BREAK$DEP$BREAK[^,]*\)$OLD/\1$NEW/g" $CABALFILE
|
@ -16,7 +16,7 @@ GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
|
|||||||
if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
|
if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then
|
||||||
GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
|
GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
|
||||||
else
|
else
|
||||||
GHC_PKG=/usr/bin/ghc-pkg
|
GHC_PKG="/usr/bin/ghc-pkg"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case $MODE in
|
case $MODE in
|
||||||
@ -70,8 +70,11 @@ for i in $files; do
|
|||||||
elif [ "$MODE" = "--requires" ]; then
|
elif [ "$MODE" = "--requires" ]; then
|
||||||
if file $i | grep -q 'executable, .* dynamically linked'; then
|
if file $i | grep -q 'executable, .* dynamically linked'; then
|
||||||
BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
|
BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
|
||||||
|
if [ -d "$PKGCONFDIR" ]; then
|
||||||
|
PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR"
|
||||||
|
fi
|
||||||
for p in ${BIN_DEPS}; do
|
for p in ${BIN_DEPS}; do
|
||||||
HASH=$(${GHC_PKG} --global field $p id | sed -e "s/^id: \+//")
|
HASH=$(${GHC_PKG} --global $PACKAGE_CONF_OPT field $p id | sed -e "s/^id: \+//")
|
||||||
echo $HASH | sed -e "s/\(.*\)-\(.*\)/ghc(\1) = \2/"
|
echo $HASH | sed -e "s/\(.*\)-\(.*\)/ghc(\1) = \2/"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -21,7 +21,7 @@ fi
|
|||||||
# configure
|
# configure
|
||||||
%cabal_configure\
|
%cabal_configure\
|
||||||
%ghc_check_bootstrap\
|
%ghc_check_bootstrap\
|
||||||
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_shared:--enable-shared} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options}
|
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
|
||||||
|
|
||||||
# install
|
# install
|
||||||
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
%cabal_install %cabal copy --destdir=%{buildroot} -v
|
||||||
@ -48,17 +48,17 @@ echo "%dir %{pkgdir}" >> %{basepkg}.files\
|
|||||||
echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
|
echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
|
||||||
fi\
|
fi\
|
||||||
%endif\
|
%endif\
|
||||||
%if 0%{!?1:1} && %{defined ghc_without_shared}\
|
%if %{defined ghc_without_shared}\
|
||||||
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
|
if [ "%{name}" = "%{basepkg}" -o -n "%{?1}" ]; then\
|
||||||
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
if [ -d "%{buildroot}%{_docdir}/%{basepkg}-%{pkgver}" ]; then\
|
||||||
mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
|
mv %{buildroot}%{_docdir}/%{basepkg}-%{pkgver} %{buildroot}%{_docdir}/%{basepkg}-devel-%{pkgver}\
|
||||||
%if %{undefined ghc_exclude_docdir}\
|
%if %{undefined ghc_exclude_docdir}\
|
||||||
echo "%{_docdir}/%{name}-devel-%{version}" >> %{basepkg}-devel.files\
|
echo "%{_docdir}/%{basepkg}-devel-%{version}" >> %{basepkg}-devel.files\
|
||||||
%endif\
|
%endif\
|
||||||
fi\
|
fi\
|
||||||
fi\
|
fi\
|
||||||
%endif\
|
%endif\
|
||||||
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
|
%if %{undefined ghc_exclude_docdir}\
|
||||||
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
|
||||||
echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
|
||||||
elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
|
elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
|
||||||
@ -73,7 +73,11 @@ fi\
|
|||||||
if [ -d "%{buildroot}%{docdir}" ]; then\
|
if [ -d "%{buildroot}%{docdir}" ]; then\
|
||||||
echo "%{docdir}" >> %{basepkg}-devel.files\
|
echo "%{docdir}" >> %{basepkg}-devel.files\
|
||||||
fi\
|
fi\
|
||||||
sed -i -e "s!%{buildroot}!!g" %{!?ghc_without_shared:%{basepkg}.files} %{basepkg}-devel.files\
|
for i in %{!?ghc_without_shared:%{basepkg}.files} %{basepkg}-devel.files; do\
|
||||||
|
if [ -f "$i" ]; then\
|
||||||
|
sed -i -e "s!%{buildroot}!!g" $i\
|
||||||
|
fi\
|
||||||
|
done\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
%ghc_add_basepkg_file()\
|
%ghc_add_basepkg_file()\
|
||||||
@ -98,7 +102,7 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
|
|||||||
%ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\
|
%ghc_devel_requires 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}\
|
||||||
%if %{undefined ghc_without_shared}\
|
%if %{undefined ghc_without_shared} && 0%{!?-m:1}\
|
||||||
Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
|
Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -131,7 +135,7 @@ Group: System Environment/Libraries\
|
|||||||
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
|
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
|
||||||
|
|
||||||
# ghc_description [name] [version]
|
# ghc_description [name] [version]
|
||||||
%ghc_description\
|
%ghc_description()\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define basepkg ghc-%{pkgname}\
|
%define basepkg ghc-%{pkgname}\
|
||||||
%description -n %{basepkg}\
|
%description -n %{basepkg}\
|
||||||
@ -140,8 +144,8 @@ Group: System Environment/Libraries\
|
|||||||
This package provides the shared library.\
|
This package provides the shared library.\
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# ghc_binlib_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version]
|
# ghc_lib_subpackage [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version]
|
||||||
%ghc_binlib_package(c:h:l:x)\
|
%ghc_lib_subpackage(c:h:l:x)\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define pkgver %{?2}%{!?2:%{version}}\
|
%define pkgver %{?2}%{!?2:%{version}}\
|
||||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||||
@ -175,8 +179,9 @@ This package provides the shared library.\
|
|||||||
%ghc_devel_files\
|
%ghc_devel_files\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version]
|
# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version]
|
||||||
%ghc_devel_package(c:h:l:)\
|
# -m : meta-package
|
||||||
|
%ghc_devel_package(c:h:l:m)\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define pkgver %{?2}%{!?2:%{version}}\
|
%define pkgver %{?2}%{!?2:%{version}}\
|
||||||
%define basepkg ghc-%{pkgname}\
|
%define basepkg ghc-%{pkgname}\
|
||||||
@ -194,10 +199,12 @@ Group: Development/Libraries\
|
|||||||
Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\
|
Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\
|
||||||
Provides: %{basepkg}-doc = %{pkgver}-%{release}\
|
Provides: %{basepkg}-doc = %{pkgver}-%{release}\
|
||||||
Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\
|
Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\
|
||||||
|
%if %{undefined without_prof}\
|
||||||
Provides: %{basepkg}-prof = %{pkgver}-%{release}\
|
Provides: %{basepkg}-prof = %{pkgver}-%{release}\
|
||||||
|
%endif
|
||||||
|
|
||||||
# ghc_devel_description
|
# ghc_devel_description
|
||||||
%ghc_devel_description\
|
%ghc_devel_description()\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define basepkg ghc-%{pkgname}\
|
%define basepkg ghc-%{pkgname}\
|
||||||
%description -n %{basepkg}-devel\
|
%description -n %{basepkg}-devel\
|
||||||
@ -206,7 +213,7 @@ Provides: %{basepkg}-prof = %{pkgver}-%{release}\
|
|||||||
This package contains the development files.
|
This package contains the development files.
|
||||||
|
|
||||||
# ghc_devel_post_postun
|
# ghc_devel_post_postun
|
||||||
%ghc_devel_post_postun\
|
%ghc_devel_post_postun()\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define basepkg ghc-%{pkgname}\
|
%define basepkg ghc-%{pkgname}\
|
||||||
%post -n %{basepkg}-devel\
|
%post -n %{basepkg}-devel\
|
||||||
@ -240,38 +247,36 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
|
|||||||
%cabal_configure\
|
%cabal_configure\
|
||||||
%cabal build
|
%cabal build
|
||||||
|
|
||||||
|
# ghc_lib_build_without_haddock [name] [version]
|
||||||
|
%ghc_lib_build_without_haddock()\
|
||||||
|
%global debug_package %{nil}\
|
||||||
|
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{!?ghc_with_lib_for_ghci:--disable-library-for-ghci}\
|
||||||
|
%cabal build\
|
||||||
|
%{nil}
|
||||||
|
|
||||||
# ghc_lib_build [name] [version]
|
# ghc_lib_build [name] [version]
|
||||||
%ghc_lib_build()\
|
%ghc_lib_build()\
|
||||||
%global debug_package %{nil}\
|
%ghc_lib_build_without_haddock\
|
||||||
%{?1:cd %1-%2}\
|
|
||||||
%cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\
|
|
||||||
%cabal build\
|
|
||||||
%if %{undefined without_haddock}\
|
%if %{undefined without_haddock}\
|
||||||
%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\
|
%cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\
|
||||||
%endif\
|
%endif\
|
||||||
%{?1:cd -}\
|
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# install bin package
|
# install bin package
|
||||||
%ghc_bin_install\
|
%ghc_bin_install()\
|
||||||
%if %{undefined ghc_bootstrapping}\
|
|
||||||
%global _use_internal_dependency_generator 0\
|
%global _use_internal_dependency_generator 0\
|
||||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
||||||
%endif\
|
|
||||||
%cabal_install\
|
%cabal_install\
|
||||||
%ghc_strip_dynlinked
|
%{!?1:%ghc_strip_dynlinked}\
|
||||||
|
%{nil}
|
||||||
|
|
||||||
# ghc_lib_install [name] [version]
|
# ghc_lib_install [name] [version]
|
||||||
%ghc_lib_install()\
|
%ghc_lib_install()\
|
||||||
%if %{undefined ghc_bootstrapping}\
|
|
||||||
%global _use_internal_dependency_generator 0\
|
%global _use_internal_dependency_generator 0\
|
||||||
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
|
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
|
||||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
||||||
%endif\
|
|
||||||
%{?1:cd %1-%2}\
|
|
||||||
%cabal_install\
|
%cabal_install\
|
||||||
%cabal_pkg_conf\
|
%cabal_pkg_conf\
|
||||||
%{?1:cd -}\
|
|
||||||
%ghc_gen_filelists\
|
%ghc_gen_filelists\
|
||||||
%{!?1:%ghc_strip_dynlinked}\
|
%{!?1:%ghc_strip_dynlinked}\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
@ -2,8 +2,11 @@
|
|||||||
|
|
||||||
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
||||||
|
|
||||||
|
# uncomment to bootstrap without hscolour
|
||||||
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.15.5
|
Version: 0.15.9
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -11,14 +14,21 @@ Group: Development/Libraries
|
|||||||
License: GPLv3
|
License: GPLv3
|
||||||
URL: https://fedoraproject.org/wiki/Haskell_SIG
|
URL: https://fedoraproject.org/wiki/Haskell_SIG
|
||||||
|
|
||||||
# This is a Fedora maintained package which is specific to
|
# This is a Fedora maintained package, originally made for
|
||||||
# our distribution. Thus the source is only available from
|
# the distribution. Hence the source is currently only available
|
||||||
# within this srpm.
|
# from this package. But it could be hosted on fedorahosted.org
|
||||||
|
# for example if other rpm distros would prefer that.
|
||||||
Source0: ghc-rpm-macros.ghc
|
Source0: ghc-rpm-macros.ghc
|
||||||
Source1: COPYING
|
Source1: COPYING
|
||||||
Source2: AUTHORS
|
Source2: AUTHORS
|
||||||
Source3: ghc-deps.sh
|
Source3: ghc-deps.sh
|
||||||
|
Source4: cabal-tweak-dep-ver
|
||||||
Requires: redhat-rpm-config
|
Requires: redhat-rpm-config
|
||||||
|
%if %{undefined without_hscolour}
|
||||||
|
BuildRequires: redhat-rpm-config
|
||||||
|
ExclusiveArch: %{ghc_arches}
|
||||||
|
Requires: hscolour
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A set of macros for building GHC packages following the Haskell Guidelines
|
A set of macros for building GHC packages following the Haskell Guidelines
|
||||||
@ -40,6 +50,8 @@ install -p -D -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{macros_file}
|
|||||||
|
|
||||||
install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
|
||||||
|
|
||||||
|
install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
|
||||||
|
|
||||||
# this is why this package is now arch-dependent:
|
# this is why this package is now arch-dependent:
|
||||||
# turn off shared libs and dynamic linking on secondary archs
|
# turn off shared libs and dynamic linking on secondary archs
|
||||||
%ifnarch %{ix86} x86_64
|
%ifnarch %{ix86} x86_64
|
||||||
@ -56,9 +68,49 @@ EOF
|
|||||||
%doc COPYING AUTHORS
|
%doc COPYING AUTHORS
|
||||||
%config(noreplace) %{macros_file}
|
%config(noreplace) %{macros_file}
|
||||||
%{_prefix}/lib/rpm/ghc-deps.sh
|
%{_prefix}/lib/rpm/ghc-deps.sh
|
||||||
|
%{_bindir}/cabal-tweak-dep-ver
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 25 2012 Jens Petersen <petersen@redhat.com>
|
||||||
|
- BR redhat-rpm-config instead of ghc-rpm-macros
|
||||||
|
- no longer set without_hscolour in macros.ghc for bootstrapping
|
||||||
|
|
||||||
|
* Tue Oct 9 2012 Jens Petersen <petersen@redhat.com> - 0.15.9-1
|
||||||
|
- "cabal haddock" needs --html option with --hoogle to output html
|
||||||
|
|
||||||
|
* Thu Sep 20 2012 Jens Petersen <petersen@redhat.com> - 0.15.8-1
|
||||||
|
- ghc-rpm-macros now requires hscolour so packages no longer need to BR it
|
||||||
|
- this can be disabled for bootstrapping by setting without_hscolour
|
||||||
|
- make haddock build hoogle files
|
||||||
|
- ghc_lib_build no longer builds redundant ghci .o library files
|
||||||
|
|
||||||
|
* Wed Jul 11 2012 Jens Petersen <petersen@redhat.com> - 0.15.7-1
|
||||||
|
- let ghc_bin_install take an arg to disable implicit stripping for subpackages
|
||||||
|
- fix doc handling of subpackages for ghc_without_shared
|
||||||
|
- without ghc_exclude_docdir include doc dir also for subpackages
|
||||||
|
- rename ghc_binlib_package to ghc_lib_subpackage
|
||||||
|
- add ghc_lib_build_without_haddock
|
||||||
|
- no longer drop into package dirs when subpackaging with ghc_lib_build and
|
||||||
|
ghc_lib_install
|
||||||
|
|
||||||
|
* Fri Jun 22 2012 Jens Petersen <petersen@redhat.com> - 0.15.6.1-1
|
||||||
|
- cabal-tweak-dep-ver: be careful only to match complete dep name and
|
||||||
|
do not match beyond ","
|
||||||
|
|
||||||
|
* Fri Jun 22 2012 Jens Petersen <petersen@redhat.com> - 0.15.6-1
|
||||||
|
- cabal-tweak-dep-ver: new script to tweak depends version bounds in .cabal
|
||||||
|
from ghc-rpm-macros-0.95.5
|
||||||
|
- ghc-dep.sh: only use buildroot package.conf.d if it exists
|
||||||
|
- ghc-deps.sh: look in buildroot package.conf.d for program deps
|
||||||
|
- add a meta-package option to ghc_devel_package and use in ghc_devel_requires
|
||||||
|
- allow ghc_description, ghc_devel_description, ghc_devel_post_postun
|
||||||
|
to take args
|
||||||
|
- support meta packages like haskell-platform without base lib files
|
||||||
|
- add shell variable cabal_configure_extra_options to cabal_configure for
|
||||||
|
local configuration
|
||||||
|
- do not provide prof when without_prof set
|
||||||
|
|
||||||
* Thu Feb 23 2012 Jens Petersen <petersen@redhat.com> - 0.15.5-1
|
* Thu Feb 23 2012 Jens Petersen <petersen@redhat.com> - 0.15.5-1
|
||||||
- fix handling of devel docdir for non-shared builds
|
- fix handling of devel docdir for non-shared builds
|
||||||
- simplify ghc_bootstrap
|
- simplify ghc_bootstrap
|
||||||
|
Loading…
Reference in New Issue
Block a user