PR#1: rebase to 4.2.0 - rpms/grip - src.fedoraproject.org

rpms / grip

#1 rebase to 4.2.0

Merged 3 years ago by adrian. Opened 3 years ago by sharkcz.

rpms/ sharkcz/grip rebase into master

Dan Horák • 3 years ago

17904f2

.gitignore

file modified

		`@@ -12,3 +12,4 @@`
		`/grip-4.0.0.tar.gz`
		`/grip-4.0.1.tar.gz`
		`/grip-4.1.1.tar.gz`
		`+ /grip-4.2.0.tar.gz`

grip.spec

file modified

+14 -8

		`@@ -1,7 +1,7 @@`
		`Summary: Front-end for CD rippers and Ogg Vorbis encoders`
		`Name: grip`
		`- Version: 4.1.1`
		`- Release: 2%{?dist}`
		`+ Version: 4.2.0`
		`+ Release: 1%{?dist}`
		`Epoch: 1`
		`License: GPLv2+`
		`Source0: http://downloads.sourceforge.net/grip/grip-%{version}.tar.gz`
		`@@ -12,10 +12,13 @@`
		`%if 0%{?fedora}`
		`Recommends: lame`
		`%endif`
		`+ BuildRequires: meson`
		`BuildRequires: gcc gcc-c++`
		`- BuildRequires: cdparanoia-devel`
		`- BuildRequires: libgnomeui-devel curl-devel`
		`- BuildRequires: gettext id3lib-devel`
		`+ BuildRequires: curl-devel`
		`+ BuildRequires: gettext`
		`+ BuildRequires: id3lib-devel`
		`+ BuildRequires: pkgconfig(cdparanoia-3)`
		`+ BuildRequires: pkgconfig(gtk+-2.0)`
		`BuildRequires: desktop-file-utils`

		`%description`
		`@@ -37,11 +40,11 @@`
		`sed -i 's/Content-Type: text\/plain; charset=koi8-r\\n/Content-Type: text\/plain; charset=utf-8\\n/' ru.po`
		`popd`

		`- %configure`
		`- %make_build`
		`+ %meson`
		`+ %meson_build`

		`%install`
		`- make DESTDIR=$RPM_BUILD_ROOT install`
		`+ %meson_install`

		`cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF`
		`StartupWMClass=Grip`
		`@@ -72,6 +75,9 @@`
		`%{_mandir}/man1/*`

		`%changelog`
		`+ * Mon Oct 26 2020 Dan Horák <dan[at]danny.cz> - 1:4.2.0-1`
		`+ - Updated to 4.2.0 (#1856585)`
		`+`
		`* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.1.1-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (grip-4.1.1.tar.gz) = c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267`
		`+ SHA512 (grip-4.2.0.tar.gz) = 26cb32064019da1d1683c44caa3c52ae513cec5b1fb435930e8e4c62433a70f14145d92f2215bf54a5bface96945d3e5e879302e2824029650d2a34218528e94`

sharkcz commented 3 years ago

This is to
- rebase grip to the latest 4.2.0 (#1856585)
- switch to meson to build
- drop the dependency on the ancient gnome libs (autoconf can't do that yet)

It relies on https://src.fedoraproject.org/rpms/cdparanoia/pull-request/3 to add the pkgconfig file to cdparanoia. The use of --auto-features=enable in %meson needs it.