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

- fix ghc_strip_dynlinked when no dynlinked files

Browse Source 
- devel should provide doc also when not obsoleting
This commit is contained in:
Jens Petersen 2010-07-17 08:08:37 +00:00
parent 4e21230c7d
commit 601aa5ffc1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-rpm-macros.ghc
View File

@ -128,7 +128,7 @@ Group: Development/Libraries\
%{!-c:%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}}\ %{!-c:%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}}\
%{-c:Requires: %{-c*}}\ %{-c:Requires: %{-c*}}\
%{-o:Obsoletes: %{ghc_pkg_name}-doc < %{-o*}}\ %{-o:Obsoletes: %{ghc_pkg_name}-doc < %{-o*}}\
%{-o:Provides: %{ghc_pkg_name}-doc = %{version}-%{release}}\ Provides: %{ghc_pkg_name}-doc = %{version}-%{release}\
\ \
%description -n %{ghc_pkg_name}-devel\ %description -n %{ghc_pkg_name}-devel\
%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\ %{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
@ -172,7 +172,7 @@ This package contains the profiling library.\
# ghc_strip_dynlinked # ghc_strip_dynlinked
%ghc_strip_dynlinked\ %ghc_strip_dynlinked\
%if 0%{!?__debug_package:1}\ %if 0%{!?__debug_package:1}\
find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print | xargs strip\ find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
%endif %endif
# ghc_bin_build # ghc_bin_build

6
ghc-rpm-macros.spec
View File

@ -1,5 +1,5 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.8.0 Version: 0.8.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 0.8.1-1
- fix ghc_strip_dynlinked for no dynlinked files
- devel should provide doc also when not obsoleting
* Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 0.8.0-1 * Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 0.8.0-1
- merge -doc into -devel and provide -o obsoletes doc subpackage option - merge -doc into -devel and provide -o obsoletes doc subpackage option