X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=package%2Fncurses.spec;h=0efc4ca91ef2d0a37201ebf9462225a424f982bd;hp=fb3d411848216b176bb3c1ef384b2f1053d529db;hb=aabb3a65ee5d88949abe529b5131adedb9cfab84;hpb=ad0373780c377b7abe50c77fc9a36092972dc872;ds=sidebyside

diff --git a/package/ncurses.spec b/package/ncurses.spec
index fb3d4118..0efc4ca9 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 5.9
-Release: 20150221
+Release: 20150523
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
@@ -10,11 +10,13 @@ Source: ncurses-%{version}-%{release}.tgz
 %define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
 %define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
 
+%global MY_ABI 6
+
 # save value before redefining
 %global sys_libdir %{_libdir}
 
-# redefine...
-%global _prefix /usr/local/ncurses6
+# was redefined...
+#global _prefix /usr/local/ncurses#{MY_ABI}
 
 %global MY_PKG %{sys_libdir}/pkgconfig
 %define MYDATA /usr/local/ncurses/share/terminfo
@@ -23,7 +25,7 @@ Source: ncurses-%{version}-%{release}.tgz
 The ncurses library routines are a terminal-independent method of
 updating character screens with reasonable optimization.
 
-This package is used for testing ABI 6.
+This package is used for testing ABI %{MY_ABI}.
 
 %prep
 
@@ -55,8 +57,10 @@ RPATH_LIST=../lib:%{_prefix}/lib \
 	--enable-rpath \
 	--enable-sp-funcs \
 	--enable-warnings \
+	--enable-wgetch-events \
 	--enable-widec \
 	--verbose \
+	--program-suffix=%{MY_ABI} \
 	--with-chtype=uint32_t \
 	--with-mmask_t=uint32_t \
 	--with-develop \
@@ -65,7 +69,7 @@ RPATH_LIST=../lib:%{_prefix}/lib \
 	--with-ticlib \
 	--with-trace \
 	--with-cxx-shared \
-	--with-pc-suffix=6 \
+	--with-extra-suffix=%{MY_ABI} \
 	--with-pkg-config-libdir=%{MY_PKG} \
 	--with-versioned-syms \
 	--with-xterm-kbs=DEL \
@@ -80,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install.libs install.progs
 rm -f test/ncurses
-( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses6 )
+( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sun Apr 26 2015 Thomas E. Dickey
+- move package to /usr
+
+* Sun Apr 12 2015 Thomas E. Dickey
+- factor-out MY_ABI
+
 * Sat Mar 09 2013 Thomas E. Dickey
 - add --with-cxx-shared option to demonstrate c++ binding as shared library