ncurses 6.0 - patch 20180106

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

diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec
index fdc2a69fac7c1742db9efcc53da8b875acbc9b0a..f26e652face4158928012d2e7311301e5583e69e 100644 (file)
--- a/test/package/mingw-ncurses-examples.spec
+++ b/test/package/mingw-ncurses-examples.spec
@@ -4,14 +4,14 @@ Summary: ncurses-examples - example/test programs from ncurses
 %define AppProgram ncurses-examples
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
-# $Id: mingw-ncurses-examples.spec,v 1.3 2013/10/26 23:30:21 tom Exp $
+# $Id: mingw-ncurses-examples.spec,v 1.7 2018/01/04 02:31:57 tom Exp $
 Name: mingw32-ncurses6-examples
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: X11
 Group: Development/Libraries
 Source: ncurses-examples-%{release}.tgz
-# URL: http://invisible-island.net/ncurses/
+# URL: https://invisible-island.net/ncurses/
 
 BuildRequires:  mingw32-ncurses6
 
@@ -53,10 +53,14 @@ This package is used for testing ABI 6 with cross-compiles to MinGW.
 %global mingw32_bindir %{mingw32_exec_prefix}/bin/%{AppProgram} 
 %global mingw64_bindir %{mingw64_exec_prefix}/bin/%{AppProgram} 
 
+%global mingw32_datadir %{mingw32_datadir}/%{AppProgram} 
+%global mingw64_datadir %{mingw64_datadir}/%{AppProgram} 
+
 %define CFG_OPTS \\\
-       --disable-echo \\\
-       --enable-warnings \\\
-       --verbose
+        --enable-echo \\\
+        --enable-warnings \\\
+        --verbose \\\
+        --with-screen=ncursesw6
 
 %define debug_package %{nil}
 %setup -q -n ncurses-examples-%{release}
@@ -66,8 +70,9 @@ mkdir BUILD-W32
 pushd BUILD-W32
 CFLAGS="%{CC_NORMAL}" \
 CC=%{mingw32_cc} \
-%mingw32_configure %{CFG_OPTS}
-cp config.status /tmp/ming32-config.status
+NCURSES_CONFIG_SUFFIX=dev \
+%mingw32_configure %{CFG_OPTS} \
+        --datadir=%{mingw32_datadir}
 make
 popd
 
@@ -75,8 +80,8 @@ mkdir BUILD-W64
 pushd BUILD-W64
 CFLAGS="%{CC_NORMAL}" \
 CC=%{mingw64_cc} \
-%mingw64_configure %{CFG_OPTS}
-cp config.status /tmp/ming64-config.status
+%mingw64_configure %{CFG_OPTS} \
+        --datadir=%{mingw32_datadir}
 make
 popd
 
@@ -94,14 +99,15 @@ popd
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
 %defattr(-,root,root,-)
 
 %files -n mingw32-ncurses6-examples
 %{mingw32_bindir}/*
+%{mingw32_datadir}/*
 
 %files -n mingw64-ncurses6-examples
 %{mingw64_bindir}/*
+%{mingw64_datadir}/*
 
 %changelog