Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

10 changed files with 167 additions and 32 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/popt-1.18.tar.gz
/popt-*.tar.*
/.build*.log
/*.rpm

View File

@ -1 +0,0 @@
0bf05488e151228fce9c0c9601162a9f432f69d9 SOURCES/popt-1.18.tar.gz

6
STAGE2-popt Normal file
View File

@ -0,0 +1,6 @@
mcd $BUILDDIR/popt
$SRC/popt-*/configure $TCONFIGARGS
make $J
make $J install

1
ci.fmf Normal file
View File

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

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/CI-Tier-1.functional}

View File

@ -0,0 +1,11 @@
summary: Internal CI-Tier-1 tests plan
discover:
- name: popt
how: fmf
filter: 'tag: CI-Tier-1'
url: https://pkgs.devel.redhat.com/git/tests/popt
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

21
popt-1.18-ltname.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up popt-1.18/tests/testit.sh.ltname popt-1.18/tests/testit.sh
--- popt-1.18/tests/testit.sh.ltname 2021-06-23 10:54:18.334525616 +0300
+++ popt-1.18/tests/testit.sh 2021-06-23 10:54:28.330677496 +0300
@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (n
run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
run test1 "test1 - 58" "\
-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
[-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
[-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
[-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING]
[--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
[-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
run test1 "test1 - 59" "\
-Usage: lt-test1 [OPTION...]
+Usage: test1 [OPTION...]
--arg1 First argument with a really long
description. After all, we have to test
argument help wrapping somehow, right?

View File

@ -1,12 +1,23 @@
Summary: C library for parsing command line parameters
Name: popt
Version: 1.18
Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: https://github.com/rpm-software-management/popt/
Source: http://ftp.rpm.org/popt/releases/popt-1.x/popt-%{version}.tar.gz
BuildRequires: gcc gettext
%global ver 1.19
#%%global snap rc1
%global srcver %{ver}%{?snap:-%{snap}}
%global sover 0
Summary: C library for parsing command line parameters
Name: popt
Version: %{ver}%{?snap:~%{snap}}
Release: 8%{?dist}
# COPYING: MIT text
# po/eo.po: LicenseRef-Fedora-Public-Domain
# po/fi.po: MIT AND LicenseRef-Fedora-Public-Domain
# po/lv.po: MIT AND LicenseRef-Fedora-Public-Domain
# popt.3: MIT ("the X consortium license, see the file COPYING")
License: MIT AND LicenseRef-Fedora-Public-Domain
URL: https://github.com/rpm-software-management/popt/
Source0: http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{srcver}.tar.gz
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: make
%description
Popt is a C library for parsing command line parameters. Popt was
@ -19,51 +30,48 @@ functions for parsing arbitrary strings into argv[] arrays using
shell-like rules.
%package devel
Summary: Development files for the popt library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig
Summary: Development files for the popt library
License: MIT
Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig
%description devel
The popt-devel package includes header files and libraries necessary
for developing programs which use the popt C library. It contains the
API documentation of the popt library, too.
%if 0%{!?_without_static:1}
%package static
Summary: Static library for parsing command line parameters
Group: Development/Libraries
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Summary: Static library for parsing command line parameters
License: MIT
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
The popt-static package includes static libraries of the popt library.
Install it if you need to link statically with libpopt.
%endif
%prep
%autosetup
%autosetup -n %{name}-%{srcver} -p1
%build
%configure
%configure %{?_without_static:--disable-static}
%make_build
%install
%make_install
# Multiple popt configurations are possible
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d
rm -f $RPM_BUILD_ROOT/%{_libdir}/libpopt.la
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d/
%find_lang %{name}
%check
make check
%ldconfig_scriptlets
make check || (cat tests/*.log; exit 1)
%files -f %{name}.lang
%license COPYING
%doc CHANGES
%{_sysconfdir}/popt.d
%{_libdir}/libpopt.so.*
%{_sysconfdir}/popt.d/
%{_libdir}/libpopt.so.%{sover}*
%files devel
%doc README
@ -72,14 +80,93 @@ make check
%{_includedir}/popt.h
%{_mandir}/man3/popt.3*
%if 0%{!?_without_static:1}
%files static
%{_libdir}/libpopt.a
%endif
%changelog
* Thu Jan 07 2021 Panu Matilainen <pmatilai@redhat.com> - 1.18-1
- Rebase to popt 1.18 (https://github.com/rpm-software-management/popt/releases/tag/popt-1.18-release)
- Update URLs to rebooted upstream
- Clean up ancient cruft from spec, use modern build macros
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.19-8
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.19-7
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Aug 23 2023 Petr Pisar <ppisar@redhat.com> - 1.19-4
- Correct a license tag to "MIT AND LicenseRef-Fedora-Public-Domain"
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Sep 16 2022 Robert Scheck <robert@fedoraproject.org> 1.19-1
- Upgrade to 1.19 (#2127400)
* Wed Aug 24 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-4
- Restore the memleak fix now that authselect should be fixed
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19~rc1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 28 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-2
- Temporarily revert a memleak fix due to authselect breakage (#2100287)
* Wed Jun 22 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-1
- Rebase to 1.19-rc1 (https://github.com/rpm-software-management/popt/releases/tag/popt-1.19-rc1)
- Remove manual .la cleanup, it's automatic nowadays
- Add a guard against accidental soname changes
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 23 2021 Panu Matilainen <pmatilai@redhat.com> - 1.18-5
- Fix test-suite expectation on rawhide
- Dump test-suite logs for post-mortem on failure
* Sat Mar 06 2021 Robert Scheck <robert@fedoraproject.org> 1.18-4
- Conditionalize static subpackage during build-time
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 24 2020 Panu Matilainen <pmatilai@redhat.com> - 1.18-1
- Update to popt 1.18 final (no changes from rc1)
* Fri May 29 2020 Panu Matilainen <pmatilai@redhat.com> - 1.18~rc1-1
- Rebase to popt 1.18-rc1
- Update URLs to the new upstream
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Oct 11 2018 Panu Matilainen <pmatilai@redhat.com> - 1.16-16
- Use modern build helper macros
- Drop support for pre-usrmove versions (Fedora < 17 and RHEL < 7)
- Erm, dont nuke build-root at beginning of %%install
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (popt-1.19.tar.gz) = 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466