diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index c743385..9963715 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ convmv-1.14.tar.gz /convmv-1.15.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 3873c7f..338cf6d 100644 --- a/convmv.spec +++ b/convmv.spec @@ -1,24 +1,15 @@ Summary: Convert filename encodings Name: convmv -Version: 2.06 -Release: 2%{?dist} +Version: 2.0 +Release: 4%{?dist} -License: GPL-2.0-only OR GPL-3.0-only +License: GPLv2 or GPLv3 URL: http://j3e.de/linux/convmv Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz Patch0: convmv-2.0-preserve-timestamps.patch BuildArch: noarch -BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(bytes) -BuildRequires: perl(Cwd) -BuildRequires: perl(Encode) -BuildRequires: perl(File::Basename) -BuildRequires: perl(File::Compare) -BuildRequires: perl(File::Find) BuildRequires: perl(Getopt::Long) -BuildRequires: perl(Unicode::Normalize) -BuildRequires: perl(utf8) %description This package contains the tool convmv with which you can convert the encodings @@ -26,7 +17,7 @@ of filenames, e.g. from Latin1 to UTF-8. %prep %setup -q -%patch 0 -p1 -b .preserve-timestamps +%patch0 -p1 -b .preserve-timestamps tar -xf testsuite.tar %build @@ -45,78 +36,6 @@ 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* Wed Jul 20 2022 Fedora Release Engineering - 2.05-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 2.05-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.05-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.05-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Mar 31 2020 Jitka Plesnikova - 2.05-6 -- Specify all perl dependencies - -* Tue Jan 28 2020 Fedora Release Engineering - 2.05-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 2.05-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.05-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.05-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 27 2018 Parag Nemade - 2.05-1 -- Update to 2.05 version (#1467456) - -* Wed Feb 07 2018 Fedora Release Engineering - 2.01-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.01-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 06 2017 Nils Philippsen - 2.01-1 -- version 2.01 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Tue Feb 23 2016 Parag Nemade - 2.0-4 - Resolves:rh#1307401: FTBFS in rawhide - Added %%license tag diff --git a/plans/convmv.fmf b/plans/convmv.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/convmv.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 7038889..ae3bb20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (convmv-2.06.tar.gz) = a93acb0aa019ec468ec263947c3e0158c51b1b24885e77f62861555c8e80aaa6867eb42045040d09c83488460db0d2edea7327a5354afded2ab02caf7f54204d +984a13dd5068c0c67356b87e4078d66e convmv-2.0.tar.gz diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index d27d659..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,8 +0,0 @@ -test: ./runtests.sh -duration: 10m -framework: beakerlib -require: - - convmv - - perl - - make - - rpm-build diff --git a/tests/runtests.sh b/tests/runtests.sh deleted file mode 100755 index 7277ee4..0000000 --- a/tests/runtests.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/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 -