ghc_without_shared cleanup: create base package when ghc_without_shared
This commit is contained in:
parent
cd4926bbba
commit
7417c70757
|
@ -72,7 +72,7 @@ done\
|
||||||
|
|
||||||
%ghc_add_basepkg_file()\
|
%ghc_add_basepkg_file()\
|
||||||
%define basepkg ghc-%{pkg_name}\
|
%define basepkg ghc-%{pkg_name}\
|
||||||
echo "%*" >> %{basepkg}%{?ghc_without_shared:-devel}.files
|
echo "%*" >> %{basepkg}.files
|
||||||
|
|
||||||
# compiler version
|
# compiler version
|
||||||
%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
|
%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
|
||||||
|
@ -92,15 +92,13 @@ 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} && 0%{!?-m:1}\
|
%if 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
|
||||||
|
|
||||||
%ghc_shared_files\
|
%ghc_shared_files\
|
||||||
%if %{undefined ghc_without_shared}\
|
|
||||||
%files -n %{basepkg} -f %{basepkg}.files\
|
%files -n %{basepkg} -f %{basepkg}.files\
|
||||||
%{?base_doc_files:%doc %base_doc_files}\
|
%{?base_doc_files:%doc %base_doc_files}\
|
||||||
%endif\
|
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_lib_package [-c cdepslist] [-h pkgdepslist]
|
# ghc_lib_package [-c cdepslist] [-h pkgdepslist]
|
||||||
|
@ -148,16 +146,11 @@ This package provides the shared library.\
|
||||||
%ghc_lib_package\
|
%ghc_lib_package\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
|
|
||||||
|
|
||||||
# (deprecated) for docs post and postun
|
# (deprecated) for docs post and postun
|
||||||
%ghc_reindex_haddock :
|
%ghc_reindex_haddock :
|
||||||
|
|
||||||
%ghc_devel_files\
|
%ghc_devel_files\
|
||||||
%files -n %{basepkg}-devel -f %{basepkg}-devel.files\
|
%files -n %{basepkg}-devel -f %{basepkg}-devel.files\
|
||||||
%if %{defined ghc_without_shared}\
|
|
||||||
%{?base_doc_files:%doc %base_doc_files}\
|
|
||||||
%endif\
|
|
||||||
%{?devel_doc_files:%doc %devel_doc_files}\
|
%{?devel_doc_files:%doc %devel_doc_files}\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
@ -225,12 +218,6 @@ This package contains the development files.
|
||||||
%ghc_devel_files\
|
%ghc_devel_files\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_strip_dynlinked
|
|
||||||
%ghc_strip_dynlinked\
|
|
||||||
%if %{undefined __debug_package}\
|
|
||||||
find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# ghc_bin_build
|
# ghc_bin_build
|
||||||
%ghc_bin_build\
|
%ghc_bin_build\
|
||||||
%global debug_package %{nil}\
|
%global debug_package %{nil}\
|
||||||
|
@ -252,6 +239,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
|
||||||
%endif\
|
%endif\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
# ghc_strip_dynlinked
|
||||||
|
%ghc_strip_dynlinked\
|
||||||
|
%if %{undefined __debug_package}\
|
||||||
|
find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
|
||||||
|
%endif
|
||||||
|
|
||||||
# install bin package
|
# install bin package
|
||||||
%ghc_bin_install()\
|
%ghc_bin_install()\
|
||||||
%global _use_internal_dependency_generator 0\
|
%global _use_internal_dependency_generator 0\
|
||||||
|
@ -288,6 +281,8 @@ done\
|
||||||
%endif\
|
%endif\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
|
||||||
|
|
||||||
# - without_hscolour, without_testsuite, and ghc_bootstrapping
|
# - without_hscolour, without_testsuite, and ghc_bootstrapping
|
||||||
# need to be set locally in the spec file
|
# need to be set locally in the spec file
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
#%%global without_hscolour 1
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.15.13
|
Version: 0.15.14
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: RPM macros for building packages for GHC
|
||||||
|
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
URL: https://fedoraproject.org/wiki/Packaging:Haskell
|
URL: https://fedoraproject.org/wiki/Packaging:Haskell
|
||||||
|
@ -74,6 +74,10 @@ EOF
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 0.15.14-1
|
||||||
|
- create lib base package also when ghc_without_shared is set (#983137)
|
||||||
|
and other ghc_without_shared cleanup
|
||||||
|
|
||||||
* Sat Jul 6 2013 Jens Petersen <petersen@redhat.com> - 0.15.13-1
|
* Sat Jul 6 2013 Jens Petersen <petersen@redhat.com> - 0.15.13-1
|
||||||
- restore docdir autopackaging for f17 and el6
|
- restore docdir autopackaging for f17 and el6
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue