drop doc/prof obsoletes/provides for subpkgs; clear executable stack flag for exec's
- changes are to %ghc_lib_subpackage and %ghc_bin_install
This commit is contained in:
parent
f0c10c9f13
commit
1b79de9a6f
@ -110,6 +110,9 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
|
|||||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
|
||||||
%cabal_install\
|
%cabal_install\
|
||||||
%{!?1:%ghc_strip_dynlinked}\
|
%{!?1:%ghc_strip_dynlinked}\
|
||||||
|
%if %{undefined ghc_executable_stack}\
|
||||||
|
execstack -c %{_buildroot}%{_bindir}/*\
|
||||||
|
%endif\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_lib_install [name] [version]
|
# ghc_lib_install [name] [version]
|
||||||
|
@ -26,13 +26,6 @@ Requires: ghc-%{pkgname}%{?_isa} = %{pkgver}-%{release}\
|
|||||||
%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\
|
%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\
|
||||||
%{-c:Requires: %{-c*}}\
|
%{-c:Requires: %{-c*}}\
|
||||||
%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\
|
%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\
|
||||||
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\
|
|
||||||
Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\
|
|
||||||
Provides: %{basepkg}-doc = %{pkgver}-%{release}\
|
|
||||||
Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\
|
|
||||||
%if %{undefined without_prof}\
|
|
||||||
Provides: %{basepkg}-prof = %{pkgver}-%{release}\
|
|
||||||
%endif\
|
|
||||||
\
|
\
|
||||||
%description -n %{basepkg}-devel\
|
%description -n %{basepkg}-devel\
|
||||||
This package provides the Haskell %{pkgname} library development files.\
|
This package provides the Haskell %{pkgname} library development files.\
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#%%global without_hscolour 1
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.0.1
|
Version: 1.0.2
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RPM macros for building packages for GHC
|
Summary: RPM macros for building packages for GHC
|
||||||
|
|
||||||
@ -30,6 +30,8 @@ BuildRequires: redhat-rpm-config
|
|||||||
ExclusiveArch: %{ghc_arches}
|
ExclusiveArch: %{ghc_arches}
|
||||||
Requires: hscolour
|
Requires: hscolour
|
||||||
%endif
|
%endif
|
||||||
|
# for execstack
|
||||||
|
Requires: prelink
|
||||||
|
|
||||||
%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
|
||||||
@ -87,6 +89,10 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 9 2013 Jens Petersen <petersen@redhat.com> - 1.0.2-1
|
||||||
|
- drop doc and prof obsoletes and provides from ghc_lib_subpackage
|
||||||
|
- clear executable stack flag when installing package executables (#973512)
|
||||||
|
|
||||||
* Thu Jun 20 2013 Jens Petersen <petersen@redhat.com> - 1.0.1-1
|
* Thu Jun 20 2013 Jens Petersen <petersen@redhat.com> - 1.0.1-1
|
||||||
- only configure with --global if not subpackaging libs
|
- only configure with --global if not subpackaging libs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user