diff --git a/yelp-42.1.tar.xz b/yelp-42.1.tar.xz deleted file mode 100644 index 2ae894c06308ac8d0053d03820e016019189fa93..0000000000000000000000000000000000000000 Binary files a/yelp-42.1.tar.xz and /dev/null differ diff --git a/yelp-42.2.tar.xz b/yelp-42.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..13ee1df487b5d4817e79b5e35cbac3153f62da21 Binary files /dev/null and b/yelp-42.2.tar.xz differ diff --git a/yelp.spec b/yelp.spec index e95e9f745a02e9a3c005c3da8a46c52648afe083..7aa5093dab2944dc34974b4e7eb632212e3c9bce 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,28 +1,29 @@ -%define anolis_release 2 +%define anolis_release 1 %global libhandy_version 1.5.0 -%global tarball_version %%(echo %{version} | tr '~' '.') - Name: yelp Epoch: 2 -Version: 42.1 +Version: 42.2 Release: %{anolis_release}%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp -Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.67.4 +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.3 +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +BuildRequires: pkgconfig(libexslt) >= 0.8.1 BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} -BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libexslt) -BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(liblzma) >= 4.9 +BuildRequires: pkgconfig(libxml-2.0) >= 2.6.5 +BuildRequires: pkgconfig(libxslt) >= 1.1.4 BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(webkit2gtk-4.0) -BuildRequires: pkgconfig(yelp-xsl) -BuildRequires: desktop-file-utils +BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.19.2 +BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= 2.7.2 +BuildRequires: pkgconfig(yelp-xsl) >= 41.0 BuildRequires: bzip2-devel BuildRequires: gcc BuildRequires: gettext-devel @@ -61,7 +62,7 @@ Requires: %{name}-libs = %{epoch}:%{version}-%{release} This package contains header files for the libraries in the yelp-libs package. %prep -%autosetup -p1 -n %{name}-%{tarball_version} +%autosetup -p1 -n %{name}-%{version} %build %configure --disable-static --with-webkit2gtk-4-0 @@ -70,15 +71,10 @@ This package contains header files for the libraries in the yelp-libs package. %install %make_install -find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete - %find_lang %{name} %generate_compatibility_deps -%check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop - %files -f %{name}.lang %license COPYING %{_bindir}/* @@ -92,7 +88,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml %files doc -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README.md %files libs %dir %{abidir} @@ -109,6 +105,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Tue Dec 6 2022 Funda Wang - 42.2-1 +- New version 42.2 + * Wed Nov 02 2022 mgb01105731 - 42.1-2 - optimise spec file & add doc package