ncurses 6.0 - patch 20171125

[ncurses.git] / Ada95 / package / AdaCurses.spec

diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec
index dc0dc589f923b77d89dc87658abcc7e2a91971b3..4e2354c94e1a2589034acea68be133f6699d45ae 100644 (file)
--- 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
 %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.15 2015/04/26 23:55:55 tom Exp $

 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}


@@ -20,10 +20,18 @@ In addition to a library, this package installs sample programs in
 "bin/AdaCurses" to avoid conflict with other packages.
 %prep
 
 "bin/AdaCurses" to avoid conflict with other packages.
 %prep
 

+%define debug_package %{nil}
+
+# http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering
+%filter_from_requires /libAdaCurses.so.1/d
+%filter_setup
+

 %setup -q -n %{AppProgram}-%{AppRelease}
 
 %build
 
 %setup -q -n %{AppProgram}-%{AppRelease}
 
 %build
 

+%define ada_libdir %{_prefix}/lib/ada/adalib
+

 INSTALL_PROGRAM='${INSTALL}' \
        ./configure \
                --target %{_target_platform} \
 INSTALL_PROGRAM='${INSTALL}' \
        ./configure \
                --target %{_target_platform} \


@@ -32,6 +40,8 @@ INSTALL_PROGRAM='${INSTALL}' \
                --libdir=%{_libdir} \
                --mandir=%{_mandir} \
                --datadir=%{_datadir} \
                --libdir=%{_libdir} \
                --mandir=%{_mandir} \
                --datadir=%{_datadir} \

+               --disable-rpath-link \
+               --with-shared \

                --with-ada-sharedlib
 
 make
                --with-ada-sharedlib
 
 make


@@ -43,6 +53,7 @@ make install               DESTDIR=$RPM_BUILD_ROOT
 
 ( cd samples &&
   make install.examples \
 
 ( cd samples &&
   make install.examples \

+       DESTDIR=$RPM_BUILD_ROOT \

        BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
 )
 
        BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
 )
 


@@ -54,13 +65,20 @@ make install               DESTDIR=$RPM_BUILD_ROOT
 %{_bindir}/adacurses*-config
 %{_bindir}/%{AppProgram}/*
 %{_libdir}/libAdaCurses.*
 %{_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*
 %{_mandir}/man1/adacurses*-config.1*

+%{_datadir}/%{AppProgram}/*

 %{_datadir}/ada/adainclude/terminal_interface*
 
 %changelog
 # each patch should add its ChangeLog entries here
 
 %{_datadir}/ada/adainclude/terminal_interface*
 
 %changelog
 # each patch should add its ChangeLog entries here
 

-* Fri Mar 25 2010 Thomas Dickey
+* Thu Mar 31 2011 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 2011 Thomas Dickey

 - initial version
 - initial version