rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix new requires, build on all archs and make hscolour conditional on arch

Browse Source 
- ghc-srpm-macros subpackage noarch
- set Url field when generating subpackages
This commit is contained in:
Jens Petersen 2014-04-30 12:44:15 +09:00
parent eaa615f948
commit 48199c851a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghc-rpm-macros.ghc-extra
View File

@ -11,6 +11,7 @@
Summary: Haskell %{pkgname} library\ Summary: Haskell %{pkgname} library\
%{?1:Version: %{pkgver}}\ %{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\ %{-l:License: %{-l*}}\
Url: http://hackage.haskell.org/package/%{pkgname}\
%{?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")}\
\ \
%description -n %{basepkg}\ %description -n %{basepkg}\

21
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.2.6 Version: 1.2.7
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -25,13 +25,14 @@ Source4: cabal-tweak-dep-ver
Source5: cabal-tweak-flag Source5: cabal-tweak-flag
Source6: ghc-rpm-macros.ghc-extra Source6: ghc-rpm-macros.ghc-extra
Source7: ghc-rpm-macros.ghc-srpm Source7: ghc-rpm-macros.ghc-srpm
# ver-rel for unversioned docdir Requires: ghc-srpm-macros = %{version}-%{release}
Requires: redhat-rpm-config >= 9.1.0-50.fc20 # macros.ghc-srpm moved out from redhat-rpm-config-21
Requires: redhat-rpm-config > 20-1.fc21
%if %{undefined without_hscolour} %if %{undefined without_hscolour}
BuildRequires: redhat-rpm-config %ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x
ExclusiveArch: %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x
Requires: hscolour Requires: hscolour
%endif %endif
%endif
# for execstack # for execstack
Requires: prelink Requires: prelink
@ -52,7 +53,8 @@ for example in ghc and haskell-platform.
%package -n ghc-srpm-macros %package -n ghc-srpm-macros
Summary: RPM macros for building Haskell source packages Summary: RPM macros for building Haskell source packages
Requires: %{name} = %{version}-%{release} BuildArch: noarch
%description -n ghc-srpm-macros %description -n ghc-srpm-macros
Macros used when generating source Haskell rpm packages. Macros used when generating source Haskell rpm packages.
@ -106,6 +108,13 @@ EOF
%changelog %changelog
* Wed Apr 30 2014 Jens Petersen <petersen@redhat.com> - 1.2.7-1
- ghc-rpm-macros requires ghc-srpm-macros
- ghc-srpm-macros does not require ghc-rpm-macros
- drop ExclusiveArch and make hscolour requires arch conditional
- make ghc-srpm-macros subpackage noarch
- set Url field when generating subpackages
* Mon Apr 28 2014 Jens Petersen <petersen@redhat.com> - 1.2.6-1 * Mon Apr 28 2014 Jens Petersen <petersen@redhat.com> - 1.2.6-1
- move macros.ghc-srpm from redhat-rpm-config to new ghc-srpm-macros subpackage: - move macros.ghc-srpm from redhat-rpm-config to new ghc-srpm-macros subpackage:
defines ghc_arches_with_ghci and drops no longer used ghc_arches (#1089102) defines ghc_arches_with_ghci and drops no longer used ghc_arches (#1089102)