ncurses 6.2 - patch 20200321

[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..5758c29097a5f24901853a8bd24d47383039dca2 100644 (file)
--- a/test/package/mingw-ncurses-examples.spec
+++ b/test/package/mingw-ncurses-examples.spec
@@ -1,17 +1,17 @@
 Summary: ncurses-examples - example/test programs from ncurses
 %?mingw_package_header
 
 Summary: ncurses-examples - example/test programs from ncurses
 %?mingw_package_header
 

-%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 $
+%global AppProgram ncurses-examples
+%global AppVersion MAJOR.MINOR
+%global AppRelease YYYYMMDD
+# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $

 Name: mingw32-ncurses6-examples
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: X11
 Group: Development/Libraries
 Source: ncurses-examples-%{release}.tgz
 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
 
 
 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_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 \\\
 %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}
 
 %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} \
 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
 
 make
 popd
 


@@ -75,8 +80,8 @@ mkdir BUILD-W64
 pushd BUILD-W64
 CFLAGS="%{CC_NORMAL}" \
 CC=%{mingw64_cc} \
 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
 
 make
 popd
 


@@ -92,18 +97,27 @@ pushd BUILD-W64
 popd
 
 %clean
 popd
 
 %clean

-rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+  echo OK
+else
+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0

 
 

-%files

 %defattr(-,root,root,-)
 
 %files -n mingw32-ncurses6-examples
 %{mingw32_bindir}/*
 %defattr(-,root,root,-)
 
 %files -n mingw32-ncurses6-examples
 %{mingw32_bindir}/*

+%{mingw32_datadir}/*

 
 %files -n mingw64-ncurses6-examples
 %{mingw64_bindir}/*
 
 %files -n mingw64-ncurses6-examples
 %{mingw64_bindir}/*

+%{mingw64_datadir}/*

 
 %changelog
 
 
 %changelog
 

+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+

 * Sat Oct 19 2013 Thomas E. Dickey
 - initial version
 * Sat Oct 19 2013 Thomas E. Dickey
 - initial version