X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fpackage%2Fmingw-ncurses-examples.spec;h=f26e652face4158928012d2e7311301e5583e69e;hp=7eba9c5b6f5c44b2d1ec5277649582473f219562;hb=6a586fefa9985809fdfbc96d2dcb838a13e4e4d2;hpb=52584567033cacc32b66dc5f9c4f4ff216ac4cd9

diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec
index 7eba9c5b..f26e652f 100644
--- a/test/package/mingw-ncurses-examples.spec
+++ b/test/package/mingw-ncurses-examples.spec
@@ -1,15 +1,17 @@
+Summary: ncurses-examples - example/test programs from ncurses
 %?mingw_package_header
 
 %define AppProgram ncurses-examples
-# $Id: mingw-ncurses-examples.spec,v 1.1 2013/10/19 22:04:58 tom Exp $
-Summary: shared libraries for terminal handling
+%define AppVersion MAJOR.MINOR
+%define AppRelease YYYYMMDD
+# $Id: mingw-ncurses-examples.spec,v 1.7 2018/01/04 02:31:57 tom Exp $
 Name: mingw32-ncurses6-examples
-Release: 5.9
-Version: 20131019
+Version: %{AppVersion}
+Release: %{AppRelease}
 License: X11
 Group: Development/Libraries
-Source: ncurses-examples-%{version}.tgz
-# URL: http://invisible-island.net/ncurses/
+Source: ncurses-examples-%{release}.tgz
+# URL: https://invisible-island.net/ncurses/
 
 BuildRequires:  mingw32-ncurses6
 
@@ -51,21 +53,26 @@ 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-%{version}
+%setup -q -n ncurses-examples-%{release}
 
 %build
 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
 
@@ -73,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
 
@@ -92,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