PR#12: fix versioning issue as per fedora packaging guidelines - rpms/gettext

rpms / gettext

#12 fix versioning issue as per fedora packaging guidelines

Merged 2 years ago by suanand. Opened 2 years ago by suanand.

Unknown source rawhide into rawhide

fix gettext snapshot versioning issue to make it canonical

Sundeep Anand • 2 years ago

b217c07

.gitignore

file modified

+1 -2

		`@@ -1,2 +1,1 @@`
		`- /gettext-0.*.tar.xz`
		`- /gettext-2022-02-28.tar.gz`
		`+ /gettext-0..tar.`

gettext.spec

file modified

+13 -11

		`@@ -1,12 +1,11 @@`
		`%bcond_with jar`
		`%bcond_with java`
		`- %global snapshot 2022-02-28`
		`+ %global snapshot 20220203`

		`Summary: GNU libraries and utilities for producing multi-lingual messages`
		`Name: gettext`
		`Version: 0.21`
		`- # Snapshot date not included in version and in release to avoid build errors.`
		`- Release: 11%{?dist}.0.20220228`
		`+ Release: 12%{?dist}.0.%{snapshot}`

		`# The following are licensed under LGPLv2+:`
		`# - libintl and its headers`
		`@@ -23,14 +22,14 @@`
		`# Everything else is GPLv3+`
		`License: GPLv3+ and LGPLv2+ and GFDL`
		`URL: https://www.gnu.org/software/gettext/`
		`- # Source tarball has been extracted from below URL.`
		`- # https://gitlab.com/gnu-gettext/ci-distcheck/-/jobs/artifacts/master/raw/gettext-snapshot.tar?job=check-optimized`
		`- Source: %{name}-%{snapshot}.tar.gz`
		`+ # Snapshot tarball has been generated by following upstream release steps.`
		`+ # https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blob;f=Admin/release-steps`
		`+ Source: %{name}-%{version}-%{snapshot}.tar.gz`
		`Source2: msghack.py`
		`Source3: msghack.1`

		`- Patch1: gettext-0.21-disable-libtextstyle.patch`
		`- Patch2: gettext-0.21-covscan.patch`
		`+ Patch1: %{name}-%{version}-disable-libtextstyle.patch`
		`+ Patch2: %{name}-%{version}-covscan.patch`

		`# for bootstrapping`
		`# BuildRequires: autoconf >= 2.62`
		`@@ -160,7 +159,7 @@`


		`%prep`
		`- %autosetup -n %{name}-%{snapshot} -S git`
		`+ %autosetup -S git`
		`# Refresh autotools files to latest versions`
		`# Should be removed after 0.21:`
		`autoreconf --force --install`
		`@@ -356,8 +355,8 @@`
		`%files libs`
		`%{_libdir}/libasprintf.so.0*`
		`%{_libdir}/libgettextpo.so.0*`
		`- %{_libdir}/libgettextlib-*.so`
		`- %{_libdir}/libgettextsrc-*.so`
		`+ %{_libdir}/libgettextlib-0.*.so`
		`+ %{_libdir}/libgettextsrc-0.*.so`
		`%if %{with jar}`
		`%{_datadir}/%{name}/libintl.jar`
		`%endif`
		`@@ -374,6 +373,9 @@`
		`%{_mandir}/man1/msghack.1*`

		`%changelog`
		`+ * Wed Mar 9 2022 Sundeep Anand <suanand@redhat.com> - 0.21-12`
		`+ - fix gettext snapshot versioning issue to make it canonical (#2061646)`
		`+`
		`* Thu Mar 3 2022 Sundeep Anand <suanand@redhat.com> - 0.21-11`
		`- Rebuild with gettext-snapshot-20220228 to fix ppc64le and tests (#2045414)`
		`Removed gettext-0.21-gnulib-perror-tests.patch as it is upstreamed.`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (gettext-2022-02-28.tar.gz) = abfce9e0aa0945ee3dc7fd559da2d475f7efefc3b1d322009fbadd33f1e5853dae749ebfde535b38c09bf00100d47b3709eb258870dbb9b43a7c228b8737c0a2`
		`+ SHA512 (gettext-0.21-20220203.tar.gz) = ffa90ef2fe7894504a35ee1cee8e45e4e500dd22a10e70e888a95e4aa80002fad063e9ecc5610b4617908ddef05b50e780115b1c26864bce16fea9d02a44665b`