diff --git a/build-and-update-all-branches b/build-and-update-all-branches index d0539cf..0e587b7 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -1,14 +1,13 @@ #! /bin/sh -# Prepare rawhide branch, review the list of branches below and then execute this +# Prepare master branch, review the list of branches below and then execute this # script. -main=main -branches="$main epel8 epel9 epel10.0 epel10 f41 f42" +branches='master el6 epel7 epel8 f31 f32 f33' exit_handler () { - git checkout $main + git checkout master } trap exit_handler EXIT @@ -20,18 +19,18 @@ koji hello tasks= for branch in $branches; do - if test $branch != $main; then + if test $branch != master; then git checkout "$branch" - git merge $main + git merge master fi git push tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`" done -if test -n "$tasks"; then - koji watch-task $tasks -fi +koji watch-task $tasks -set -- $branches -git checkout $1 -fedpkg update +for branch in $branches; do + test $branch != master || continue + git checkout $branch + fedpkg update +done diff --git a/pspg.spec b/pspg.spec index 44abe22..7a2686f 100644 --- a/pspg.spec +++ b/pspg.spec @@ -1,12 +1,10 @@ Summary: A unix pager optimized for psql Name: pspg -Version: 5.8.11 -Release: 2%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Version: 3.1.4 +Release: 1%{?dist} +License: BSD URL: https://github.com/okbob/%{name} Source: https://github.com/okbob/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: make BuildRequires: ncurses-devel readline-devel BuildRequires: gcc @@ -40,146 +38,6 @@ columns, and lot of color themes are included. %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 5.8.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue May 13 2025 Pavel Raiskup - 5.8.11-1 -- https://github.com/okbob/pspg/releases/tag/5.8.11 -- https://github.com/okbob/pspg/releases/tag/5.8.10 - -* Sun Apr 27 2025 Pavel Raiskup - 5.8.9-1 -- https://github.com/okbob/pspg/releases/tag/5.8.9 -- https://github.com/okbob/pspg/releases/tag/5.8.8 - -* Sat Jan 18 2025 Fedora Release Engineering - 5.8.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Sep 27 2024 Pavel Raiskup - 5.8.7-1 -- https://github.com/okbob/pspg/releases/tag/5.8.2 -- https://github.com/okbob/pspg/releases/tag/5.8.3 -- https://github.com/okbob/pspg/releases/tag/5.8.4 -- https://github.com/okbob/pspg/releases/tag/5.8.6 -- https://github.com/okbob/pspg/releases/tag/5.8.7 - -* Wed Sep 04 2024 Miroslav Suchý - 5.8.1-5 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 5.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 5.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Nov 20 2023 Pavel Raiskup - 5.8.1-1 -- https://github.com/okbob/pspg/releases/tag/5.8.1 - -* Thu Aug 10 2023 Pavel Raiskup - 5.8.0-1 -- https://github.com/okbob/pspg/releases/tag/5.8.0 - -* Fri Jul 21 2023 Fedora Release Engineering - 5.7.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 19 2023 Pavel Raiskup - 5.7.8-1 -- https://github.com/okbob/pspg/releases/tag/5.7.8 - -* Fri Jun 09 2023 Pavel Raiskup - 5.7.7-1 -- https://github.com/okbob/pspg/releases/tag/5.7.7 - -* Wed Apr 26 2023 Pavel Raiskup - 5.7.6-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.7.6 - -* Mon Apr 17 2023 Pavel Raiskup - 5.7.5-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.7.5 - https://github.com/okbob/pspg/releases/tag/5.7.4 - https://github.com/okbob/pspg/releases/tag/5.7.3 - -* Thu Feb 02 2023 Pavel Raiskup - 5.7.2-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.7.2 - https://github.com/okbob/pspg/releases/tag/5.7.1 - https://github.com/okbob/pspg/releases/tag/5.7.0 - https://github.com/okbob/pspg/releases/tag/5.6.4 - https://github.com/okbob/pspg/releases/tag/5.6.2 - https://github.com/okbob/pspg/releases/tag/5.6.0 - -* Fri Jan 20 2023 Fedora Release Engineering - 5.5.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Nov 26 2022 Pavel Raiskup - 5.5.13-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.13 - https://github.com/okbob/pspg/releases/tag/5.5.12 - https://github.com/okbob/pspg/releases/tag/5.5.11 - https://github.com/okbob/pspg/releases/tag/5.5.10 - https://github.com/okbob/pspg/releases/tag/5.5.9 - https://github.com/okbob/pspg/releases/tag/5.5.8 - https://github.com/okbob/pspg/releases/tag/5.5.7 - -* Wed Sep 07 2022 Pavel Raiskup - 5.5.6-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.6 - -* Fri Jul 22 2022 Fedora Release Engineering - 5.5.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jul 07 2022 Pavel Raiskup - 5.5.5-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.4 - https://github.com/okbob/pspg/releases/tag/5.5.5 - -* Fri Jan 21 2022 Fedora Release Engineering - 5.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Pavel Raiskup - 5.5.3-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.3 - -* Mon Dec 13 2021 Pavel Raiskup - 5.5.2-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.2 - -* Sat Dec 04 2021 Pavel Raiskup - 5.5.1-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.1 - -* Wed Nov 03 2021 Pavel Raiskup - 5.5.0-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.5.0 - -* Sun Oct 10 2021 Pavel Raiskup - 5.4.0-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.4.0 - -* Thu Aug 05 2021 Pavel Raiskup - 5.3.2-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.3.2 - -* Fri Jul 23 2021 Fedora Release Engineering - 5.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 16 2021 Pavel Raiskup - 5.0.4-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/5.0.4 - -* Fri Jun 11 2021 Pavel Raiskup - 5.0.3-1 -- new upstream release - -* Sun Mar 21 2021 Pavel Raiskup - 4.4.0-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/4.4.0 - -* Mon Mar 08 2021 Pavel Raiskup - 4.3.1-1 -- new upstream release, per release notes: - https://github.com/okbob/pspg/releases/tag/4.3.1 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Fri Sep 25 2020 Pavel Raiskup - 3.1.4-1 - new upstream release, per release notes: https://github.com/okbob/pspg/releases/tag/3.1.4 diff --git a/sources b/sources index 315f0f2..6f6dcbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pspg-5.8.11.tar.gz) = 0f1bbe8a2e5c9eafaedf5b48d12ea0ac3dd68f52969efac4c3bbd29dfe7de0324ed5546e54c9a176ab344c985bbcea4d0c59afb1f2229c23d036aef3a0dcb346 +SHA512 (pspg-3.1.4.tar.gz) = e6c3cd085d683c3048ed85395bd0675c738b7370cf5676b6119538113fea6e318d70e0001eb15fb21414de214d4f82ff6c32f0ce74591219c0025fb2e6277190