X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fpackage%2FAdaCurses.spec;h=c98e104709717ed0650842dde9f8d1f76cd8b53c;hp=dc0dc589f923b77d89dc87658abcc7e2a91971b3;hb=d91d170b303a5e8acb8c3e1327f6d881974fecdc;hpb=362db2575aed6b2c7a8d3928b39af51544502876

diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec
index dc0dc589..c98e1047 100644
--- a/Ada95/package/AdaCurses.spec
+++ b/Ada95/package/AdaCurses.spec
@@ -2,7 +2,7 @@ Summary: AdaCurses - Ada95 binding for ncurses
 %define AppProgram AdaCurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.5 2011/03/26 20:41:44 tom Exp $
+# $Id: AdaCurses.spec,v 1.12 2011/04/01 00:08:32 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
@@ -24,6 +24,8 @@ In addition to a library, this package installs sample programs in
 
 %build
 
+%define ada_libdir %{_prefix}/lib/ada/adalib
+
 INSTALL_PROGRAM='${INSTALL}' \
 	./configure \
 		--target %{_target_platform} \
@@ -32,6 +34,8 @@ INSTALL_PROGRAM='${INSTALL}' \
 		--libdir=%{_libdir} \
 		--mandir=%{_mandir} \
 		--datadir=%{_datadir} \
+		--disable-rpath-link \
+		--with-shared \
 		--with-ada-sharedlib
 
 make
@@ -43,6 +47,7 @@ make install               DESTDIR=$RPM_BUILD_ROOT
 
 ( cd samples &&
   make install.examples \
+  	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
 )
 
@@ -54,13 +59,20 @@ make install               DESTDIR=$RPM_BUILD_ROOT
 %{_bindir}/adacurses*-config
 %{_bindir}/%{AppProgram}/*
 %{_libdir}/libAdaCurses.*
-%{_libdir}/ada/adalib/libAdaCurses.*
-%{_libdir}/ada/adalib/terminal_interface*
+%{ada_libdir}/libAdaCurses.*
+%{ada_libdir}/terminal_interface*
 %{_mandir}/man1/adacurses*-config.1*
+%{_datadir}/%{AppProgram}/*
 %{_datadir}/ada/adainclude/terminal_interface*
 
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Thu Mar 31 2010 Thomas Dickey
+- use --with-shared option for consistency with --with-ada-sharelib
+- ensure that MY_DATADIR is set when installing examples
+- add ada_libdir symbol to handle special case where libdir is /usr/lib64
+- use --disable-rpath-link to link sample programs without rpath
+
 * Fri Mar 25 2010 Thomas Dickey
 - initial version