[ghc-terminfo] add license to ghc_files; drop linker script workaround

Jens Petersen petersen at fedoraproject.org
Fri Mar 23 05:19:13 UTC 2012


commit 20f54d1e0df904e2a52becec161bd25c19afbb03
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Mar 23 14:19:07 2012 +0900

    add license to ghc_files; drop linker script workaround

 ghc-terminfo.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ghc-terminfo.spec b/ghc-terminfo.spec
index 1e2ea9a..1d4029d 100644
--- a/ghc-terminfo.spec
+++ b/ghc-terminfo.spec
@@ -13,7 +13,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -43,8 +43,8 @@ BuildRequires:  ghc-extensible-exceptions-prof
 %install
 %ghc_lib_install
 
-# workaround libdir/libncursesw.so linker script breaking linking library for ghc < 7.2
-sed -i -e "s/extra-libraries: ncursesw/extra-libraries: tinfo/" -e "s!ld-options:!ld-options: /%{_lib}/libncursesw.so.5!" $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{pkg_name}-%{version}.conf
+## workaround libdir/libncursesw.so linker script breaking linking library for ghc < 7.2
+#sed -i -e "s/extra-libraries: ncursesw/extra-libraries: tinfo/" -e "s!ld-options:!ld-options: /%{_lib}/libncursesw.so.5!" $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{pkg_name}-%{version}.conf
 
 %ghc_devel_package
 Requires:  ncurses-devel%{?_isa}
@@ -55,10 +55,14 @@ Requires:  ncurses-devel%{?_isa}
 %ghc_devel_post_postun
 
 
-%ghc_files
+%ghc_files LICENSE
 
 
 %changelog
+* Fri Mar 23 2012 Jens Petersen <petersen at redhat.com> - 0.3.2.3-2
+- add license to ghc_files
+- no longer need the linker script workaround
+
 * Wed Jan  4 2012 Jens Petersen <petersen at redhat.com> - 0.3.2.3-1
 - update to 0.3.2.3 and cabal2spec-0.25.2
 


More information about the scm-commits mailing list