From 048b3329843aec3075fcce22f8116a95fc4ed4c1 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 23 Jun 2023 18:47:34 +0530 Subject: [PATCH 01/10] Migrate to SPDX license expression --- convmv.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/convmv.spec b/convmv.spec index ca3939c..2e3552b 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,9 +1,9 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 11%{?dist} +Release: 12%{?dist} -License: GPLv2 or GPLv3 +License: GPL-2.0-only or GPL-3.0-only URL: http://j3e.de/linux/convmv Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz Patch0: convmv-2.0-preserve-timestamps.patch @@ -26,7 +26,7 @@ of filenames, e.g. from Latin1 to UTF-8. %prep %setup -q -%patch0 -p1 -b .preserve-timestamps +%patch 0 -p1 -b .preserve-timestamps tar -xf testsuite.tar %build @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Fri Jun 23 2023 Parag Nemade - 2.05-12 +- Migrate to SPDX license expression + * Thu Jan 19 2023 Fedora Release Engineering - 2.05-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d40eb6465d32908f2ca9e7044988d76e8dd9176a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:21:24 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index 2e3552b..6041e53 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL-2.0-only or GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.05-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 23 2023 Parag Nemade - 2.05-12 - Migrate to SPDX license expression From f6cd152dd3fed6ed44a7c869b66d72886ac1452f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:09:24 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index 6041e53..b2e9c58 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-only or GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.05-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.05-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d455d9035783087c506c6da744e3c1ccad0c5b81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:02:48 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index b2e9c58..88ab201 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-only or GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.05-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.05-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2dab80c494e90dbd883308f4a0fa92607c9f0d57 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 27 May 2024 13:21:13 +0530 Subject: [PATCH 05/10] Correct the SPDX license expression --- convmv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/convmv.spec b/convmv.spec index 88ab201..c406f85 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,9 +1,9 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 15%{?dist} +Release: 16%{?dist} -License: GPL-2.0-only or GPL-3.0-only +License: GPL-2.0-only OR GPL-3.0-only URL: http://j3e.de/linux/convmv Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz Patch0: convmv-2.0-preserve-timestamps.patch @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Mon May 27 2024 Parag Nemade - 2.05-16 +- Correct the SPDX license expression + * Wed Jan 24 2024 Fedora Release Engineering - 2.05-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b5217e2eee9b95355be9a519d4d552315b5ae3c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:58:02 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index c406f85..4bf66ee 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-only OR GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.05-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon May 27 2024 Parag Nemade - 2.05-16 - Correct the SPDX license expression From 6342c4523cebed356c168bfe9e630a00b290b046 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Wed, 28 Aug 2024 21:21:21 +0530 Subject: [PATCH 07/10] Add tmt testcase for CI --- .fmf/version | 1 + plans/convmv.fmf | 5 +++++ tests/main.fmf | 8 ++++++++ tests/runtests.sh | 37 +++++++++++++++++++++++++++++++++++++ tests/smoke/runtest.sh | 3 --- tests/tests.yml | 17 ----------------- 6 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/convmv.fmf create mode 100644 tests/main.fmf create mode 100755 tests/runtests.sh delete mode 100644 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/convmv.fmf b/plans/convmv.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/convmv.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..d27d659 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,8 @@ +test: ./runtests.sh +duration: 10m +framework: beakerlib +require: + - convmv + - perl + - make + - rpm-build diff --git a/tests/runtests.sh b/tests/runtests.sh new file mode 100755 index 0000000..7277ee4 --- /dev/null +++ b/tests/runtests.sh @@ -0,0 +1,37 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +NAME=convmv + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm ${NAME} + rlShowPackageVersion ${NAME} + rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "${NAME}" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/${NAME}-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}" + else + rlRun -t -l "pushd BUILD/${NAME}-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun "make V=1 test" + rlRun "retval=$?" + rlRun "echo $retval" + rlRun "popd" 0 + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd + diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100644 index ecd41b5..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd ../source -make V=1 test diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index cc62a54..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-source - -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - smoke - required_packages: - - perl - - make From f3b616cf411d472f3ad1047ec1aee45713d5cdd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:29:35 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index 4bf66ee..d59374c 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.05 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL-2.0-only OR GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.05-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 2.05-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From baadccfe87ef13a0dd62f6d4b63c426aa4166245 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 24 Mar 2025 09:23:46 +0530 Subject: [PATCH 09/10] Update to 2.06 version (#2348686) --- .gitignore | 1 + convmv.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 50c650c..c743385 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ convmv-1.14.tar.gz /convmv-2.0.tar.gz /convmv-2.01.tar.gz /convmv-2.05.tar.gz +/convmv-2.06.tar.gz diff --git a/convmv.spec b/convmv.spec index d59374c..1a44d13 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv -Version: 2.05 -Release: 18%{?dist} +Version: 2.06 +Release: 1%{?dist} License: GPL-2.0-only OR GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Mon Mar 24 2025 Parag Nemade - 2.06-1 +- Update to 2.06 version (#2348686) + * Thu Jan 16 2025 Fedora Release Engineering - 2.05-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 4756c98..7038889 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (convmv-2.05.tar.gz) = 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125 +SHA512 (convmv-2.06.tar.gz) = a93acb0aa019ec468ec263947c3e0158c51b1b24885e77f62861555c8e80aaa6867eb42045040d09c83488460db0d2edea7327a5354afded2ab02caf7f54204d From 9cc2c185b773d8ca7a8eb2f79dba1a7cb99f5d77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:39:16 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- convmv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/convmv.spec b/convmv.spec index 1a44d13..3873c7f 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv Version: 2.06 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-only OR GPL-3.0-only URL: http://j3e.de/linux/convmv @@ -45,6 +45,9 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.06-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 24 2025 Parag Nemade - 2.06-1 - Update to 2.06 version (#2348686)