ncurses 5.9 - patch 20150221

[ncurses.git] / package / mingw-ncurses.spec

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 74e30e5323fda18df39ccec62fa51845d7d7f395..3ff08a6d140857b19dffb15254de6b97a8de232b 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -2,11 +2,11 @@
 
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6

-Release: 5.9
-Version: 20131012
+Version: 5.9
+Release: 20150221

 License: X11
 Group: Development/Libraries
 License: X11
 Group: Development/Libraries

-Source: ncurses-%{release}-%{version}.tgz
+Source: ncurses-%{version}-%{release}.tgz

 # URL: http://invisible-island.net/ncurses/
 
 BuildRequires:  mingw32-filesystem >= 95
 # URL: http://invisible-island.net/ncurses/
 
 BuildRequires:  mingw32-filesystem >= 95


@@ -74,7 +74,7 @@ This package is used for testing ABI 6 with cross-compiles to MinGW.
        --without-tests
 
 %define debug_package %{nil}
        --without-tests
 
 %define debug_package %{nil}

-%setup -q -n ncurses-%{release}-%{version}
+%setup -q -n ncurses-%{version}-%{release}

 
 %build
 mkdir BUILD-W32
 
 %build
 mkdir BUILD-W32


@@ -96,31 +96,47 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+

 pushd BUILD-W32
 pushd BUILD-W32

-%{mingw32_make} install
+%{mingw32_make} install.libs
+for name in $RPM_BUILD_ROOT%{mingw32_bindir}/*-config; \
+       do \
+               base=`basename $name`; \
+               ln -v $name $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-$base; \
+       done

 popd
 
 pushd BUILD-W64
 popd
 
 pushd BUILD-W64

-%{mingw64_make} install
+%{mingw64_make} install.libs
+for name in $RPM_BUILD_ROOT%{mingw64_bindir}/*-config; \
+       do \
+               base=`basename $name`; \
+               ln -v $name $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-$base; \
+       done

 popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%files
-%defattr(-,root,root,-)
-

 %files -n mingw32-ncurses6
 %files -n mingw32-ncurses6

+%defattr(-,root,root,-)
+%{_bindir}/%{mingw32_target}-*

 %{mingw32_bindir}/*
 %{mingw32_includedir}/*
 %{mingw32_libdir}/*
 
 %files -n mingw64-ncurses6
 %{mingw32_bindir}/*
 %{mingw32_includedir}/*
 %{mingw32_libdir}/*
 
 %files -n mingw64-ncurses6

+%defattr(-,root,root,-)
+%{_bindir}/%{mingw64_target}-*

 %{mingw64_bindir}/*
 %{mingw64_includedir}/*
 %{mingw64_libdir}/*
 
 %changelog
 
 %{mingw64_bindir}/*
 %{mingw64_includedir}/*
 %{mingw64_libdir}/*
 
 %changelog
 

+* Sat Sep 20 2014 Thomas E. Dickey
+- adjust install-rules for ncurses*-config
+

 * Sat Aug 03 2013 Thomas E. Dickey
 - initial version, using mingw-pdcurses package as a guide.
 * Sat Aug 03 2013 Thomas E. Dickey
 - initial version, using mingw-pdcurses package as a guide.