diff options
Diffstat (limited to 'Ada95/package')
-rw-r--r-- | Ada95/package/AdaCurses-doc.spec | 33 | ||||
-rw-r--r-- | Ada95/package/AdaCurses.spec | 57 | ||||
-rw-r--r-- | Ada95/package/debian/compat | 2 | ||||
-rw-r--r-- | Ada95/package/debian/control | 4 | ||||
-rw-r--r-- | Ada95/package/debian/copyright | 17 | ||||
-rwxr-xr-x | Ada95/package/debian/rules | 12 | ||||
-rw-r--r-- | Ada95/package/debian/watch | 2 |
7 files changed, 92 insertions, 35 deletions
diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec index eb7e6b8fedb0..c5b68dd49b9e 100644 --- a/Ada95/package/AdaCurses-doc.spec +++ b/Ada95/package/AdaCurses-doc.spec @@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD %define AppPackage %{AppProgram}-doc -# $Id: AdaCurses-doc.spec,v 1.1 2011/03/26 19:22:39 tom Exp $ +# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ Name: %{AppPackage} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://invisible-island.net/%{AppProgram} +URL: ftp://ftp.invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey <dickey@invisible-island.net> @@ -18,16 +18,18 @@ This is the Ada95 binding documentation from the ncurses MAJOR.MINOR distribution, for patch-date YYYYMMDD. %prep +%define debug_package %{nil} + %setup -q -n %{AppProgram}-%{AppRelease} %build INSTALL_PROGRAM='${INSTALL}' \ - ./configure \ - --target %{_target_platform} \ - --prefix=%{_prefix} \ - --datadir=%{_datadir} \ - --with-ada-sharedlib +%configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ + --datadir=%{_datadir} \ + --with-ada-sharedlib %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -35,14 +37,25 @@ INSTALL_PROGRAM='${INSTALL}' \ (cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT ) %clean -[ "$RPM_BUILD_ROOT" != "/" ] && 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) -%{_datadir}/doc/AdaCurses +%{_datadir}/doc/%{AppProgram} %changelog # each patch should add its ChangeLog entries here -* Sat Mar 26 2010 Thomas Dickey +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + +* Sat Sep 07 2019 Thomas Dickey +- use AppProgram to replace "AdaCurses" globally + +* Sat Mar 26 2011 Thomas Dickey - initial version diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index c98e10470971..9b39110eb842 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -1,14 +1,14 @@ -Summary: AdaCurses - Ada95 binding for ncurses +Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.12 2011/04/01 00:08:32 tom Exp $ +# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://invisible-island.net/%{AppProgram} +URL: ftp://ftp.invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey <dickey@invisible-island.net> @@ -17,14 +17,25 @@ This is the Ada95 binding from the ncurses MAJOR.MINOR distribution, for patch-date YYYYMMDD. In addition to a library, this package installs sample programs in -"bin/AdaCurses" to avoid conflict with other packages. +"bin/%{AppProgram}" to avoid conflict with other packages. %prep +%define debug_package %{nil} + +%define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) + +%if %{need_filter} == 1 +# http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering +%filter_from_requires /lib%{AppProgram}.so.1/d +%filter_setup +%endif + %setup -q -n %{AppProgram}-%{AppRelease} %build %define ada_libdir %{_prefix}/lib/ada/adalib +%define ada_include %{_prefix}/share/ada/adainclude INSTALL_PROGRAM='${INSTALL}' \ ./configure \ @@ -32,6 +43,8 @@ INSTALL_PROGRAM='${INSTALL}' \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ + --with-ada-include=%{ada_include} \ + --with-ada-objects=%{ada_libdir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ --disable-rpath-link \ @@ -43,36 +56,52 @@ make %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT ( cd samples && make install.examples \ - DESTDIR=$RPM_BUILD_ROOT \ - BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} + DESTDIR=$RPM_BUILD_ROOT \ + BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} ) %clean -[ "$RPM_BUILD_ROOT" != "/" ] && 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) %{_bindir}/adacurses*-config %{_bindir}/%{AppProgram}/* -%{_libdir}/libAdaCurses.* -%{ada_libdir}/libAdaCurses.* -%{ada_libdir}/terminal_interface* +%{ada_libdir}/ +%if %{need_filter} == 1 +%{_libdir}/lib%{AppProgram}.* +%endif %{_mandir}/man1/adacurses*-config.1* %{_datadir}/%{AppProgram}/* -%{_datadir}/ada/adainclude/terminal_interface* +%{ada_include}/ %changelog # each patch should add its ChangeLog entries here -* Thu Mar 31 2010 Thomas Dickey +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + +* Sat Sep 14 2019 Thomas Dickey +- build-fixes for Fedora29, OpenSUSE + +* Sat Sep 07 2019 Thomas Dickey +- use AppProgram to replace "AdaCurses" globally +- amend install-paths to work with Fedora30 + +* 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 2010 Thomas Dickey +* Fri Mar 25 2011 Thomas Dickey - initial version diff --git a/Ada95/package/debian/compat b/Ada95/package/debian/compat index 7ed6ff82de6b..ec635144f600 100644 --- a/Ada95/package/debian/compat +++ b/Ada95/package/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/Ada95/package/debian/control b/Ada95/package/debian/control index 88af9706d0c0..030adb17a5d2 100644 --- a/Ada95/package/debian/control +++ b/Ada95/package/debian/control @@ -4,12 +4,12 @@ Section: misc Priority: optional Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5) -Homepage: http://invisible-island.net/adacurses/ +Homepage: https://invisible-island.net/adacurses/ Package: adacurses Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: AdaCurses - Ada95 binding for ncurses +Description: Ada95 binding for ncurses This package installs as "adacurses" to avoid conflict with other packages. This is the Ada95 binding from the ncurses distribution. . diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright index e681a6bd58af..d248d73b165e 100644 --- a/Ada95/package/debian/copyright +++ b/Ada95/package/debian/copyright @@ -1,9 +1,15 @@ -Upstream source http://invisible-island.net/ncurses/ncurses-examples.html +Upstream source https://invisible-island.net/ncurses/ncurses-examples.html Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- - Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. +Files: * +Copyright: 1998-2019,2020 Free Software Foundation, Inc. +Licence: X11 + +Files: aclocal.m4 package +Copyright: 2010-2019,2020 by Thomas E. Dickey +Licence: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -28,11 +34,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. -------------------------------------------------------------------------------- +------------------------------------------------------------------------------- Files: install-sh Copyright: 1994 X Consortium -Licence: other-BSD +Licence: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the @@ -67,3 +74,5 @@ Licence: other-BSD On Debian systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-2' + +-- vile: txtmode file-encoding=utf-8 diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index ad1a35101b10..708d3eb2d591 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -14,7 +14,9 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) TARGET_DIR = $(CURDIR)/debian/adacurses SAMPLE_DIR = $(TARGET_DIR)/usr/bin/AdaCurses -CFLAGS = +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL) +CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -30,13 +32,16 @@ configure: configure-stamp configure-stamp: dh_testdir - CFLAGS="$(CFLAGS)" ./configure \ + CFLAGS="$(CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --disable-rpath-link \ --with-shared \ - --with-ada-sharedlib + --with-ada-sharedlib \ + --without-pkg-config touch configure-stamp @@ -88,6 +93,7 @@ binary-arch: build install dh_compress dh_fixperms dh_installdeb + dh_makeshlibs dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch index 4794ae385276..1b870ba1946f 100644 --- a/Ada95/package/debian/watch +++ b/Ada95/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ +opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ debian uupdate |