Compare commits

...

No commits in common. "imports/c10s/dialog-1.3-52.20240101.el10" and "c8" have entirely different histories.

14 changed files with 68 additions and 300 deletions

1
.dialog.metadata Normal file
View File

@ -0,0 +1 @@
ee0b829be362ae531932f9d2719df177f7c13508 SOURCES/dialog-1.3-20171209.tgz

View File

@ -1 +0,0 @@
1

3
.gitignore vendored
View File

@ -1,2 +1 @@
/dialog-1.3-20240101.tgz
/dialog-1.3-20240101.tgz.asc
SOURCES/dialog-1.3-20171209.tgz

View File

@ -0,0 +1,23 @@
diff -up dialog-1.1-20110707/dialog-config.in.incdir dialog-1.1-20110707/dialog-config.in
--- dialog-1.1-20110707/dialog-config.in.incdir 2011-01-06 10:38:03.000000000 +0100
+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:00:02.692038027 +0200
@@ -35,6 +35,7 @@ bindir="@bindir@"
libdir="@libdir@"
datadir="@datadir@"
mandir="@mandir@"
+includedir="@includedir@"
THIS="@PACKAGE@"
@@ -67,10 +68,7 @@ while test $# -gt 0; do
;;
# compile/link
--cflags)
- INCS=
- if test "${prefix}/include" != /usr/include ; then
- INCS="-I${prefix}/include"
- fi
+ INCS="-I$includedir"
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
ENDECHO

12
SOURCES/dialog-libs.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up dialog-1.3-20170131/makefile.in.libs dialog-1.3-20170131/makefile.in
--- dialog-1.3-20170131/makefile.in.libs 2017-02-01 13:24:22.300746602 +0100
+++ dialog-1.3-20170131/makefile.in 2017-02-01 13:25:22.200905261 +0100
@@ -203,7 +203,7 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS)
clean \
distclean \

View File

@ -0,0 +1,21 @@
diff -up dialog-1.2-20121230/dialog-config.in.multilib dialog-1.2-20121230/dialog-config.in
--- dialog-1.2-20121230/dialog-config.in.multilib 2013-03-18 15:43:10.639021412 +0100
+++ dialog-1.2-20121230/dialog-config.in 2013-03-18 15:44:08.519065774 +0100
@@ -33,7 +33,7 @@ exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
bindir="@bindir@"
-libdir="@libdir@"
+libdir=
datadir="@datadir@"
mandir="@mandir@"
includedir="@includedir@"
@@ -76,7 +76,7 @@ ENDECHO
;;
--libs)
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- -L${exec_prefix}/lib -l${THIS} @LIBS@
+ -l${THIS}
ENDECHO
;;
# identification

View File

@ -1,15 +1,14 @@
Summary: A utility for creating TTY dialog boxes
Name: dialog
%global dialogsubversion 20240101
%global dialogsubversion 20171209
Version: 1.3
Release: 52.%{dialogsubversion}%{?dist}
License: LGPL-2.1-only
Release: 13.%{dialogsubversion}%{?dist}
License: LGPLv2
Group: Applications/System
URL: https://invisible-island.net/dialog/dialog.html
Source0: https://invisible-mirror.net/archives/dialog/dialog-%{version}-%{dialogsubversion}.tgz
Source1: https://invisible-mirror.net/archives/dialog/dialog-%{version}-%{dialogsubversion}.tgz.asc
Source2: https://invisible-island.net/public/dickey@invisible-island.net-rsa3072.asc
BuildRequires: ncurses-devel gcc gettext findutils libtool gnupg2
BuildRequires: make
Source: ftp://ftp.invisible-island.net/dialog/dialog-%{version}-%{dialogsubversion}.tgz
BuildRequires: ncurses-devel gcc gettext findutils libtool
Patch1: dialog-incdir.patch
Patch2: dialog-multilib.patch
Patch3: dialog-libs.patch
@ -24,6 +23,7 @@ Install dialog if you would like to create TTY dialog boxes.
%package devel
Summary: Development files for building applications with the dialog library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} ncurses-devel
%description devel
@ -33,15 +33,14 @@ contains the files needed for developing applications, which use the
dialog library.
%prep
%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}
%setup -q -n dialog-%{version}-%{dialogsubversion}
%patch1 -p1 -b .incdir
%patch2 -p1 -b .multilib
%patch3 -p1 -b .libs
%build
%configure \
--enable-nls \
--enable-pc-files \
--with-libtool \
--with-libtool-opts="$(for opt in %{?_hardened_ldflags}; do \
echo -n -Xcompiler $opt ''; done)" \
@ -69,138 +68,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libdialog.{,l}a
%files -f %{name}.lang
%doc COPYING dialog.lsm README _samples/samples
%{_bindir}/dialog
%{_libdir}/libdialog.so.15*
%{_libdir}/libdialog.so.14*
%{_mandir}/man1/dialog.*
%files devel
%{_bindir}/dialog-config
%{_includedir}/dialog
%{_libdir}/libdialog.so
%{_libdir}/pkgconfig/dialog.pc
%{_mandir}/man3/dialog.*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3-52.20240101
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3-51.20240101
- Bump release for June 2024 mass rebuild
* Wed Jan 31 2024 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-50.20240101
- update to 1.3-20240101
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-49.20231002
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-48.20231002
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Oct 04 2023 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-47.20231002
- update to 1.3-20231002
- convert license tag to SPDX
- package pkgconfig file
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-46.20220526
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-45.20220526
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-44.20220526
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-43.20220526
- update to 1.3-20220526
* Thu Apr 21 2022 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-42.20220414
- update to 1.3-20220414
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-41.20220117
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 19 2022 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-40.20220117
- update to 1.3-20220117
* Tue Dec 14 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-39.20211214
- update to 1.3-20211214
* Mon Nov 08 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-38.20211107
- update to 1.3-20211107
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-37.20210621
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 07 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-36.20210621
- update to 1.3-20210621
* Mon Jun 07 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-35.20210530
- update to 1.3-20210530
* Mon May 17 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-34.20210509
- update to 1.3-20210509
* Thu Mar 25 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-33.20210324
- update to 1.3-20210324
* Mon Mar 22 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-32.20210319
- update to 1.3-20210319
* Mon Mar 08 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-31.20210306
- update to 1.3-20210306
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-30.20210117
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 18 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-29.20210117
- update to 1.3-20210117
* Fri Nov 27 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-28.20201126
- update to 1.3-20201126
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-27.20200327
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 31 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-26.20200327
- update to 1.3-20200327
* Mon Mar 09 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-25.20200228
- update to 1.3-20200228
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-24.20191210
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Dec 11 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-23.20191210
- update to 1.3-20191210
* Mon Nov 11 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-22.20191110
- update to 1.3-20191110
* Mon Aug 12 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-21.20190808
- update to 1.3-20190808
* Wed Aug 07 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-20.20190806
- update to 1.3-20190806
- verify upstream signatures
* Mon Jul 29 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-19.20190728
- update to 1.3-20190728
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-18.20190211
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 20 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-17.20190211
- update to 1.3-20190211
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-16.20180621
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-15.20180621
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 22 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-14.20180621
- update to 1.3-20180621
* Thu Mar 29 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-13.20171209
- update to 1.3-20171209
- fix build with multiple options in hardened ldflags (#1548400)

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,12 +0,0 @@
diff -up dialog-1.3-20200327/makefile.in.libs dialog-1.3-20200327/makefile.in
--- dialog-1.3-20200327/makefile.in.libs 2020-03-31 10:23:58.460871536 +0200
+++ dialog-1.3-20200327/makefile.in 2020-03-31 10:25:12.231861304 +0200
@@ -204,7 +204,7 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(PROG) : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS)
clean \
distclean \

View File

@ -1,46 +0,0 @@
diff -up dialog-1.3-20210306/dialog-config.in.multilib dialog-1.3-20210306/dialog-config.in
--- dialog-1.3-20210306/dialog-config.in.multilib 2021-03-06 00:48:36.000000000 +0100
+++ dialog-1.3-20210306/dialog-config.in 2021-03-08 13:21:27.329819594 +0100
@@ -53,14 +53,14 @@ while test $# -gt 0; do
eval bindir='"@bindir@"'
eval includedir='"@includedir@"'
- eval libdir='"@libdir@"'
+ eval libdir=''
eval datadir='"@datadir@"'
eval mandir='"@mandir@"'
[ -z "$includedir" ] && includedir="${prefix}/include"
- eval LDFLAGS='"@LDFLAGS@"'
- eval LIBS='"@LIBS@"'
+ eval LDFLAGS=''
+ eval LIBS=''
LIBS="-l${THIS} $LIBS"
# If the directory given by --libdir is not in the LDFLAGS+LIBS set,
@@ -74,12 +74,12 @@ while test $# -gt 0; do
break
fi
done
- if [ $found = no ]
+ if false
then
[ -n "$LFLAGS" ] && LDFLAGS=" $LFDLAGS"
LDFLAGS="-L${libdir}$LDFLAGS"
fi
- [ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
+ #[ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
# Ignore -L options which do not correspond to an actual directory,
# or which are standard library directories (i.e., the linker is
@@ -95,9 +95,6 @@ while test $# -gt 0; do
opt_lib=`echo "x$opt" | sed -e 's/^x-L//'`
[ -d "$opt_lib" ] || continue
case "$opt_lib" in
- @LD_SEARCHPATH@) # skip standard libdir
- continue
- ;;
*)
;;
esac

View File

@ -1,42 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
P46cd3aSov0rfNS/zg==
=cr15
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,25 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

View File

@ -1,36 +0,0 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/dialog.git
name: /plans/others/public

View File

@ -1,2 +0,0 @@
SHA512 (dialog-1.3-20240101.tgz) = 20ffec0a1d0ac51ea5ff1d3e6a23648edb410180bb9f2116056b22bd23dcd734db646e2028807aa9e10cc1fea1cfcc8f1329c2bb91fea443db4d828b26608f4f
SHA512 (dialog-1.3-20240101.tgz.asc) = c75eec1c2d2f5ed18bd55d6d6021e7f883b3a1e87ccb4638726909c29b5e2ea7ba3303aaa714dcafb0c6f0dfbb85f132b5a4e93394eb2a539f437c01c492d69a