aboutsummaryrefslogtreecommitdiff
path: root/test/package
diff options
context:
space:
mode:
Diffstat (limited to 'test/package')
-rw-r--r--test/package/debian-mingw/compat2
-rw-r--r--test/package/debian-mingw/control2
-rw-r--r--test/package/debian-mingw/copyright10
-rwxr-xr-xtest/package/debian-mingw/rules2
-rw-r--r--test/package/debian-mingw64/compat2
-rw-r--r--test/package/debian-mingw64/control2
-rw-r--r--test/package/debian-mingw64/copyright10
-rwxr-xr-xtest/package/debian-mingw64/rules2
-rw-r--r--test/package/debian/compat2
-rw-r--r--test/package/debian/control2
-rw-r--r--test/package/debian/copyright10
-rwxr-xr-xtest/package/debian/rules15
-rw-r--r--test/package/mingw-ncurses-examples.spec35
-rw-r--r--test/package/ncurses-examples.spec41
14 files changed, 69 insertions, 68 deletions
diff --git a/test/package/debian-mingw/compat b/test/package/debian-mingw/compat
index f599e28b8ab0..48082f72f087 100644
--- a/test/package/debian-mingw/compat
+++ b/test/package/debian-mingw/compat
@@ -1 +1 @@
-10
+12
diff --git a/test/package/debian-mingw/control b/test/package/debian-mingw/control
index 64bd01b1832d..116103d2018f 100644
--- a/test/package/debian-mingw/control
+++ b/test/package/debian-mingw/control
@@ -2,7 +2,7 @@ Source: ncurses-examples
Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
Section: misc
Priority: optional
-Standards-Version: 3.8.4
+Standards-Version: 4.6.1.0
Build-Depends: debhelper (>= 5)
Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright
index a805a1f67dd2..7546e1cc1f71 100644
--- a/test/package/debian-mingw/copyright
+++ b/test/package/debian-mingw/copyright
@@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
-------------------------------------------------------------------------------
Files: *
-Copyright: 2017-2020,2021 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
Copyright: 1998-2016,2017 Free Software Foundation, Inc.
-Licence: X11
+License: X11
Files: aclocal.m4 package
-Copyright: 2003-2020,2021 by Thomas E. Dickey
-Licence: X11
+Copyright: 2003-2023,2024 by Thomas E. Dickey
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
@@ -39,7 +39,7 @@ Licence: X11
-------------------------------------------------------------------------------
Files: install-sh
Copyright: 1994 X Consortium
-Licence: X11
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules
index e61cf71a3fa3..152cd3c77f95 100755
--- a/test/package/debian-mingw/rules
+++ b/test/package/debian-mingw/rules
@@ -70,7 +70,7 @@ install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(MINGW_TMP)
diff --git a/test/package/debian-mingw64/compat b/test/package/debian-mingw64/compat
index f599e28b8ab0..48082f72f087 100644
--- a/test/package/debian-mingw64/compat
+++ b/test/package/debian-mingw64/compat
@@ -1 +1 @@
-10
+12
diff --git a/test/package/debian-mingw64/control b/test/package/debian-mingw64/control
index c22f262a8bf9..df942b7553e4 100644
--- a/test/package/debian-mingw64/control
+++ b/test/package/debian-mingw64/control
@@ -2,7 +2,7 @@ Source: ncurses-examples
Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
Section: misc
Priority: optional
-Standards-Version: 3.8.4
+Standards-Version: 4.6.1.0
Build-Depends: debhelper (>= 5)
Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright
index a805a1f67dd2..7546e1cc1f71 100644
--- a/test/package/debian-mingw64/copyright
+++ b/test/package/debian-mingw64/copyright
@@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
-------------------------------------------------------------------------------
Files: *
-Copyright: 2017-2020,2021 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
Copyright: 1998-2016,2017 Free Software Foundation, Inc.
-Licence: X11
+License: X11
Files: aclocal.m4 package
-Copyright: 2003-2020,2021 by Thomas E. Dickey
-Licence: X11
+Copyright: 2003-2023,2024 by Thomas E. Dickey
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
@@ -39,7 +39,7 @@ Licence: X11
-------------------------------------------------------------------------------
Files: install-sh
Copyright: 1994 X Consortium
-Licence: X11
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules
index 7db9c5acef1a..02175a66ee5b 100755
--- a/test/package/debian-mingw64/rules
+++ b/test/package/debian-mingw64/rules
@@ -70,7 +70,7 @@ install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(MINGW_TMP)
diff --git a/test/package/debian/compat b/test/package/debian/compat
index f599e28b8ab0..48082f72f087 100644
--- a/test/package/debian/compat
+++ b/test/package/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/test/package/debian/control b/test/package/debian/control
index d7647b3fdb8b..89de1b8c5cab 100644
--- a/test/package/debian/control
+++ b/test/package/debian/control
@@ -2,7 +2,7 @@ Source: ncurses-examples
Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
Section: misc
Priority: optional
-Standards-Version: 3.8.4
+Standards-Version: 4.6.1.0
Build-Depends: debhelper (>= 5)
Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
diff --git a/test/package/debian/copyright b/test/package/debian/copyright
index c6873e2c5833..7546e1cc1f71 100644
--- a/test/package/debian/copyright
+++ b/test/package/debian/copyright
@@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
-------------------------------------------------------------------------------
Files: *
-Copyright: 2017-2020,2021 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
Copyright: 1998-2016,2017 Free Software Foundation, Inc.
-Licence: X11
+License: X11
Files: aclocal.m4 package
-Copyright: 2003-2019,2020 by Thomas E. Dickey
-Licence: X11
+Copyright: 2003-2023,2024 by Thomas E. Dickey
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
@@ -39,7 +39,7 @@ Licence: X11
-------------------------------------------------------------------------------
Files: install-sh
Copyright: 1994 X Consortium
-Licence: X11
+License: X11
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/test/package/debian/rules b/test/package/debian/rules
index 4e6d570ecc88..2cc34f7305ef 100755
--- a/test/package/debian/rules
+++ b/test/package/debian/rules
@@ -74,8 +74,7 @@ config-$(NCURSES_PKG)-stamp:
mkdir -p t/ncurses6
cd t/ncurses6; $(configure) \
- --bindir=\$${prefix}/bin/$(NCURSES_PKG) \
- --datadir=\$${prefix}/share/$(NCURSES_PKG) \
+ --datadir=\$${datarootdir}/$(NCURSES_PKG) \
--with-screen=ncursesw6
touch $@
@@ -87,8 +86,7 @@ config-$(NCURSEST_PKG)-stamp:
mkdir -p t/ncursest6
cd t/ncursest6; $(configure) \
- --bindir=\$${prefix}/bin/$(NCURSEST_PKG) \
- --datadir=\$${prefix}/share/$(NCURSEST_PKG) \
+ --datadir=\$${datarootdir}/$(NCURSEST_PKG) \
--with-screen=ncursestw6
touch $@
@@ -113,7 +111,9 @@ install-$(NCURSES_PKG)-stamp: build-$(NCURSES_PKG)-stamp
dh_installdirs $(verbose)
dh_prep $(verbose) -p$(NCURSES_PKG)
- $(MAKE) -C t/ncurses6 install DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG)
+ $(MAKE) -C t/ncurses6 install \
+ PACKAGE=$(NCURSES_PKG) \
+ DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG)
touch $@
@@ -123,7 +123,9 @@ install-$(NCURSEST_PKG)-stamp: build-$(NCURSEST_PKG)-stamp
dh_installdirs $(verbose)
dh_prep $(verbose) -p$(NCURSEST_PKG)
- $(MAKE) -C t/ncursest6 install DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG)
+ $(MAKE) -C t/ncursest6 install \
+ PACKAGE=$(NCURSEST_PKG) \
+ DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG)
touch $@
@@ -151,6 +153,7 @@ ifneq ($(PACKAGES.arch),)
rm -f $(PACKAGES.arch:%=install-%-stamp)
dh_testdir
dh_testroot
+ dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%)
dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) NEWS
dh_strip $(verbose) $(PACKAGES.arch:%=-p%)
dh_compress $(verbose) $(PACKAGES.arch:%=-p%)
diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec
index 5758c29097a5..bfadd10e850b 100644
--- a/test/package/mingw-ncurses-examples.spec
+++ b/test/package/mingw-ncurses-examples.spec
@@ -4,14 +4,14 @@ Summary: ncurses-examples - example/test programs from ncurses
%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 $
+# $Id: mingw-ncurses-examples.spec,v 1.11 2023/02/25 23:10:34 tom Exp $
Name: mingw32-ncurses6-examples
Version: %{AppVersion}
Release: %{AppRelease}
License: X11
Group: Development/Libraries
-Source: ncurses-examples-%{release}.tgz
-# URL: https://invisible-island.net/ncurses/
+URL: https://invisible-island.net/ncurses/%{AppProgram}.html
+Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz
BuildRequires: mingw32-ncurses6
@@ -50,11 +50,14 @@ This package is used for testing ABI 6 with cross-compiles to MinGW.
%prep
# override location of bindir, e.g., to avoid conflict with pdcurses
-%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}
+%global mingw32_datadir %{mingw32_datadir}/%{AppProgram}
+%global mingw64_datadir %{mingw64_datadir}/%{AppProgram}
+
+%global mingw32_libexec %{mingw32_libexecdir}/%{AppProgram}
+%global mingw64_libexec %{mingw64_libexecdir}/%{AppProgram}
%define CFG_OPTS \\\
--enable-echo \\\
@@ -96,26 +99,24 @@ pushd BUILD-W64
%{mingw64_make} install DESTDIR=$RPM_BUILD_ROOT
popd
-%clean
-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
-
-%defattr(-,root,root,-)
-
%files -n mingw32-ncurses6-examples
+%defattr(-,root,root,-)
%{mingw32_bindir}/*
%{mingw32_datadir}/*
+%{mingw32_libexec}/*
%files -n mingw64-ncurses6-examples
+%defattr(-,root,root,-)
%{mingw64_bindir}/*
%{mingw64_datadir}/*
+%{mingw64_libexec}/*
%changelog
+* Sat Feb 25 2023 Thomas Dickey
+- use libexecdir for programs rather than subdir of bindir
+- amend URLs per rpmlint
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.
diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec
index d2b5a84e7e8b..8f1a3cbe52d1 100644
--- a/test/package/ncurses-examples.spec
+++ b/test/package/ncurses-examples.spec
@@ -3,15 +3,14 @@ Summary: example/test programs from ncurses
%global AltProgram ncursest-examples
%global AppVersion MAJOR.MINOR
%global AppRelease YYYYMMDD
-# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $
+# $Id: ncurses-examples.spec,v 1.22 2023/02/25 23:10:49 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: %{AppRelease}
License: MIT
Group: Applications/Development
-URL: ftp://ftp.invisible-island.net/%{AppProgram}
-Source0: %{AppProgram}-%{AppRelease}.tgz
-Packager: Thomas Dickey <dickey@invisible-island.net>
+URL: https://invisible-island.net/ncurses/%{AppProgram}.html
+Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz
%description
These are the example/test programs from the ncurses MAJOR.MINOR distribution,
@@ -50,8 +49,7 @@ CONFIGURE_TOP=%{my_srcdir} \
%configure \
--target %{_target_platform} \
--prefix=%{_prefix} \
- --bindir=%{_bindir}/%{AppProgram} \
- --datadir=%{_datadir}/%{AppProgram} \
+ --datadir=%{_datarootdir}/%{AppProgram} \
--with-screen=ncursesw6dev \
--disable-rpath-hack
@@ -66,8 +64,7 @@ CONFIGURE_TOP=%{my_srcdir} \
%configure \
--target %{_target_platform} \
--prefix=%{_prefix} \
- --bindir=%{_bindir}/%{AltProgram} \
- --datadir=%{_datadir}/%{AltProgram} \
+ --datadir=%{_datarootdir}/%{AltProgram} \
--with-screen=ncursestw6dev \
--disable-rpath-hack
@@ -78,34 +75,34 @@ popd
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
pushd BUILD-%{AppProgram}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install PACKAGE=%{AppProgram} DESTDIR=$RPM_BUILD_ROOT
popd
pushd BUILD-%{AltProgram}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install PACKAGE=%{AltProgram} DESTDIR=$RPM_BUILD_ROOT
popd
-%clean
-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 -n %{AppProgram}
%defattr(-,root,root)
-%{_bindir}/%{AppProgram}/*
-%{_datadir}/%{AppProgram}/*
+%{_bindir}/%{AppProgram}
+%{_libexecdir}/%{AppProgram}/*
+%{_datarootdir}/%{AppProgram}/*
%files -n %{AltProgram}
%defattr(-,root,root)
-%{_bindir}/%{AltProgram}/*
-%{_datadir}/%{AltProgram}/*
+%{_bindir}/%{AltProgram}
+%{_libexecdir}/%{AltProgram}/*
+%{_datarootdir}/%{AltProgram}/*
%changelog
# each patch should add its ChangeLog entries here
+* Sat Feb 25 2023 Thomas Dickey
+- amend URLs per rpmlint
+
+* Sat Dec 18 2021 Thomas Dickey
+- use libexecdir for programs rather than subdir of bindir
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-31 14:53:23 +0000