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

move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config

Browse Source
This commit is contained in:
Jens Petersen 2011-05-28 12:19:35 +09:00
parent 1bc67af711
commit da128f954a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-rpm-macros.ghc
View File

@ -140,7 +140,7 @@ This package provides the shared library.\
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
%package -n %{basepkg}-devel\
Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
Summary: Development files for %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
Group: Development/Libraries\
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\

9
ghc-rpm-macros.spec
View File

@ -1,7 +1,7 @@
%global debug_package %{nil}
Name: ghc-rpm-macros
Version: 0.13
Version: 0.13.1
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@ -32,10 +32,8 @@ echo no build stage needed
%install
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
install -p -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
mkdir -p ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
install -p -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/macros.ghc
install -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
# this is why this package is now arch-dependent:
@ -58,6 +56,9 @@ EOF
%changelog
* Sat May 28 2011 Jens Petersen <petersen@redhat.com> - 0.13.1-1
- move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config
* Wed May 11 2011 Jens Petersen <petersen@redhat.com> - 0.13-1
- merge prof subpackages into devel to simplify packaging