From 97fb85a8c083b2e5dc214b969c1bec091e0dd200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:14:00 +0000 Subject: [PATCH 01/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index f953a5b..530251b 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 3.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2:3.36.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Mar 07 2020 Kalev Lember - 2:3.36.0-1 - Update to 3.36.0 From c373399a502e39d63f96e778fb58129f0d4c136c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 17 Aug 2020 13:50:51 +0200 Subject: [PATCH 02/60] Update to 3.37.90 --- sources | 2 +- yelp.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 11c39a5..5cc9535 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-3.36.0.tar.xz) = 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8 +SHA512 (yelp-3.37.90.tar.xz) = 80fe0fbab9cfccc2c3988a4e60f16ce36a2e4bd9b7d6fedf413a8d5dd17ae100678cafbcb43a3ba43e304166a492c500e7929a93ac970b3c0d882c0d84e25659 diff --git a/yelp.spec b/yelp.spec index 530251b..03c35d0 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,14 +2,14 @@ Name: yelp Epoch: 2 -Version: 3.36.0 -Release: 2%{?dist} +Version: 3.37.90 +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp #VCS: git:git://git.gnome.org/yelp -Source: https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Aug 17 2020 Kalev Lember - 2:3.37.90-1 +- Update to 3.37.90 + * Wed Jul 29 2020 Fedora Release Engineering - 2:3.36.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 62f643aa2d15583d4e818a0e817a1e5f06433268 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 18 Aug 2020 13:09:02 +0100 Subject: [PATCH 03/60] Use make_build macro https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- yelp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yelp.spec b/yelp.spec index 03c35d0..d812015 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 3.37.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -64,7 +64,7 @@ the libraries in the yelp-libs package. # libtool doesn't make this easy, so we do it the hard way sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool -make %{?_smp_mflags} V=1 +%make_build %install %make_install @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Tue Aug 18 2020 David King - 2:3.37.90-2 +- Use make_build macro + * Mon Aug 17 2020 Kalev Lember - 2:3.37.90-1 - Update to 3.37.90 From 2bf4afd89a28986d167a168895c8c42581c7b8e4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 13 Sep 2020 00:21:26 +0200 Subject: [PATCH 04/60] Update to 3.38.0 --- sources | 2 +- yelp.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5cc9535..2bcbb5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-3.37.90.tar.xz) = 80fe0fbab9cfccc2c3988a4e60f16ce36a2e4bd9b7d6fedf413a8d5dd17ae100678cafbcb43a3ba43e304166a492c500e7929a93ac970b3c0d882c0d84e25659 +SHA512 (yelp-3.38.0.tar.xz) = 82887139422724a28666b57437ce4f4fba6058abe41802d8e1a5e44e3dbc7794ce3a6f44840fce4c1c0bde28abcbed1f52a2e58b43a587539529b0969dca355f diff --git a/yelp.spec b/yelp.spec index d812015..6087321 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,14 +2,14 @@ Name: yelp Epoch: 2 -Version: 3.37.90 -Release: 2%{?dist} +Version: 3.38.0 +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp #VCS: git:git://git.gnome.org/yelp -Source: https://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Sep 12 2020 Kalev Lember - 2:3.38.0-1 +- Update to 3.38.0 + * Tue Aug 18 2020 David King - 2:3.37.90-2 - Use make_build macro From 224e45e11c942b2dcf67978f6e274f5ab97b7b9a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 5 Oct 2020 22:15:13 +0200 Subject: [PATCH 05/60] Update to 3.38.1 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2bcbb5e..81510c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-3.38.0.tar.xz) = 82887139422724a28666b57437ce4f4fba6058abe41802d8e1a5e44e3dbc7794ce3a6f44840fce4c1c0bde28abcbed1f52a2e58b43a587539529b0969dca355f +SHA512 (yelp-3.38.1.tar.xz) = 9466510fb0723c65ba6c5eef3cf57a02b070785e86d22cbc950eeb6ccc0a1a4bed3e5a7ec5698613865979d755b4d69bbd7bba1d749b38cd1ee859c4ccc8842a diff --git a/yelp.spec b/yelp.spec index 6087321..16bfbd7 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 3.38.0 +Version: 3.38.1 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Oct 5 2020 Kalev Lember - 2:3.38.1-1 +- Update to 3.38.1 + * Sat Sep 12 2020 Kalev Lember - 2:3.38.0-1 - Update to 3.38.0 From fb4369bd6779d7d649f242c911337c579fffce9b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 25 Nov 2020 10:58:32 +0100 Subject: [PATCH 06/60] Update to 3.38.2 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 81510c9..ace3323 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-3.38.1.tar.xz) = 9466510fb0723c65ba6c5eef3cf57a02b070785e86d22cbc950eeb6ccc0a1a4bed3e5a7ec5698613865979d755b4d69bbd7bba1d749b38cd1ee859c4ccc8842a +SHA512 (yelp-3.38.2.tar.xz) = 5762ddb9b2f29afa5a91317815edc321997efca749f9f69d1134de0ea3e97fa43297639c15abf8e33a9ad8741a9837e0c16e941e5f68108ab3974db856f68987 diff --git a/yelp.spec b/yelp.spec index 16bfbd7..a59d685 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 3.38.1 +Version: 3.38.2 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -103,6 +103,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Wed Nov 25 2020 Kalev Lember - 2:3.38.2-1 +- Update to 3.38.2 + * Mon Oct 5 2020 Kalev Lember - 2:3.38.1-1 - Update to 3.38.1 From 0f5248723b4f8dc45291a6e51b7f5656d41dd22a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:46:29 +0000 Subject: [PATCH 07/60] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- yelp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yelp.spec b/yelp.spec index a59d685..6d76559 100644 --- a/yelp.spec +++ b/yelp.spec @@ -14,6 +14,7 @@ Source: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(liblzma) From 8596ffe3a423c77ea213e10fbc7a7c124968aae5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:32:54 +0000 Subject: [PATCH 08/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 6d76559..e59a329 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 3.38.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -104,6 +104,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2:3.38.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 25 2020 Kalev Lember - 2:3.38.2-1 - Update to 3.38.2 From 1305c65af081606671a6b0cfd88804a6a056db54 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 18 Feb 2021 17:24:02 +0100 Subject: [PATCH 09/60] Remove changelog trimming It's done by default now. --- yelp.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/yelp.spec b/yelp.spec index e59a329..75ed7b6 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,5 +1,3 @@ -%global _changelog_trimtime %(date +%s -d "1 year ago") - Name: yelp Epoch: 2 Version: 3.38.2 From 0058c71b001a83cc89702f1f6c74d35a22c544fe Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 18 Feb 2021 17:26:25 +0100 Subject: [PATCH 10/60] Update to 40.beta --- sources | 2 +- yelp.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index ace3323..600d6fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-3.38.2.tar.xz) = 5762ddb9b2f29afa5a91317815edc321997efca749f9f69d1134de0ea3e97fa43297639c15abf8e33a9ad8741a9837e0c16e941e5f68108ab3974db856f68987 +SHA512 (yelp-40.beta.tar.xz) = 80d1f2e6d2266cd80c3ad860b21ec256801f34476b746207d6e90f30a9c689cdf8a3eaf38b929f4535638e56a03359489014bdc0b7aa7d38259f6b63ebb2af4b diff --git a/yelp.spec b/yelp.spec index 75ed7b6..c150e35 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,13 +1,14 @@ +%global tarball_version %%(echo %{version} | tr '~' '.') + Name: yelp Epoch: 2 -Version: 3.38.2 -Release: 2%{?dist} +Version: 40~beta +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp -#VCS: git:git://git.gnome.org/yelp -Source: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch @@ -53,8 +54,7 @@ the libraries in the yelp-libs package. %prep -%setup -q -%patch1 -p1 +%autosetup -p1 -n %{name}-%{tarball_version} %build %configure --disable-static @@ -102,6 +102,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Thu Feb 18 2021 Kalev Lember - 2:40~beta-1 +- Update to 40.beta + * Thu Jan 28 2021 Fedora Release Engineering - 2:3.38.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9d3209b59834090f682d4cb2f758a3583ff4aad8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 18 Feb 2021 17:26:27 +0100 Subject: [PATCH 11/60] Fix whitespace --- yelp.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yelp.spec b/yelp.spec index c150e35..60f775f 100644 --- a/yelp.spec +++ b/yelp.spec @@ -13,8 +13,8 @@ Source: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_v # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch +BuildRequires: gcc BuildRequires: make -BuildRequires: gcc BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libxml-2.0) @@ -31,7 +31,6 @@ BuildRequires: itstool Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: yelp-xsl - %description Yelp is the help browser for the GNOME desktop. It is designed to help you browse all the documentation on your system in @@ -52,7 +51,6 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} This package contains header files and documentation for the libraries in the yelp-libs package. - %prep %autosetup -p1 -n %{name}-%{tarball_version} From 88ec50607a60cc1e8b8f4f8afa5b4365a79556f6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 28 Feb 2021 15:40:05 +0100 Subject: [PATCH 12/60] Drop libtool as-needed hack as as-needed is in default LDFLAGS now --- yelp.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/yelp.spec b/yelp.spec index 60f775f..0b7988d 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 40~beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -56,11 +56,6 @@ the libraries in the yelp-libs package. %build %configure --disable-static - -# drop unneeded direct library deps with --as-needed -# libtool doesn't make this easy, so we do it the hard way -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - %make_build %install @@ -100,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sun Feb 28 2021 Kalev Lember - 2:40~beta-2 +- Drop libtool as-needed hack as as-needed is in default LDFLAGS now + * Thu Feb 18 2021 Kalev Lember - 2:40~beta-1 - Update to 40.beta From 7e17560871741a43618abe5c585590ca46248ca1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 28 Feb 2021 15:40:53 +0100 Subject: [PATCH 13/60] Remove unneeded ldconfig_scriptlets macro call --- yelp.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yelp.spec b/yelp.spec index 0b7988d..e8de9bb 100644 --- a/yelp.spec +++ b/yelp.spec @@ -68,8 +68,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop -%ldconfig_scriptlets libs - %files -f %{name}.lang %doc AUTHORS NEWS README %license COPYING @@ -97,6 +95,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog * Sun Feb 28 2021 Kalev Lember - 2:40~beta-2 - Drop libtool as-needed hack as as-needed is in default LDFLAGS now +- Remove unneeded ldconfig_scriptlets macro call * Thu Feb 18 2021 Kalev Lember - 2:40~beta-1 - Update to 40.beta From 21215b19b981ca39e0dac5ecbf47c7749fb18b50 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 28 Feb 2021 15:41:46 +0100 Subject: [PATCH 14/60] Tighten soname globs This can avoid unexpected soname bumps. --- yelp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index e8de9bb..164b63b 100644 --- a/yelp.spec +++ b/yelp.spec @@ -81,7 +81,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml %files libs -%{_libdir}/libyelp.so.* +%{_libdir}/libyelp.so.0* %dir %{_libdir}/yelp %dir %{_libdir}/yelp/web-extensions %{_libdir}/yelp/web-extensions/libyelpwebextension.so @@ -96,6 +96,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop * Sun Feb 28 2021 Kalev Lember - 2:40~beta-2 - Drop libtool as-needed hack as as-needed is in default LDFLAGS now - Remove unneeded ldconfig_scriptlets macro call +- Tighten soname globs * Thu Feb 18 2021 Kalev Lember - 2:40~beta-1 - Update to 40.beta From 8277d540be2833b6416ae308820fbfc5624f613c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 22 Mar 2021 18:16:57 +0100 Subject: [PATCH 15/60] Update to 40.0 --- sources | 2 +- yelp.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 600d6fa..df6be90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-40.beta.tar.xz) = 80d1f2e6d2266cd80c3ad860b21ec256801f34476b746207d6e90f30a9c689cdf8a3eaf38b929f4535638e56a03359489014bdc0b7aa7d38259f6b63ebb2af4b +SHA512 (yelp-40.0.tar.xz) = efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590 diff --git a/yelp.spec b/yelp.spec index 164b63b..4de48ed 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,8 +2,8 @@ Name: yelp Epoch: 2 -Version: 40~beta -Release: 2%{?dist} +Version: 40.0 +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Mar 22 2021 Kalev Lember - 2:40.0-1 +- Update to 40.0 + * Sun Feb 28 2021 Kalev Lember - 2:40~beta-2 - Drop libtool as-needed hack as as-needed is in default LDFLAGS now - Remove unneeded ldconfig_scriptlets macro call From 6e708107a2b84fc6e48ebacf56c3f873c17c5010 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 21 Jun 2021 14:08:02 +0200 Subject: [PATCH 16/60] Update to 40.2 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index df6be90..e48963a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-40.0.tar.xz) = efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590 +SHA512 (yelp-40.2.tar.xz) = adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c diff --git a/yelp.spec b/yelp.spec index 4de48ed..e74db4d 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 40.0 +Version: 40.2 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Jun 21 2021 Kalev Lember - 2:40.2-1 +- Update to 40.2 + * Mon Mar 22 2021 Kalev Lember - 2:40.0-1 - Update to 40.0 From 2a7509a63f299fab04ac066a0d0dfacd17999e3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:08:00 +0000 Subject: [PATCH 17/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index e74db4d..1ac9596 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 40.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2:40.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 21 2021 Kalev Lember - 2:40.2-1 - Update to 40.2 From 0f450372316f84e69758b8051a86ebfeb6cf5ac9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 3 Aug 2021 12:19:57 +0200 Subject: [PATCH 18/60] Update to 40.3 --- sources | 2 +- yelp.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e48963a..eecf740 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-40.2.tar.xz) = adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c +SHA512 (yelp-40.3.tar.xz) = d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28 diff --git a/yelp.spec b/yelp.spec index 1ac9596..426cb22 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,8 +2,8 @@ Name: yelp Epoch: 2 -Version: 40.2 -Release: 2%{?dist} +Version: 40.3 +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Tue Aug 03 2021 Kalev Lember - 2:40.3-1 +- Update to 40.3 + * Fri Jul 23 2021 Fedora Release Engineering - 2:40.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f1bf1bec530cacefb8b7f6fa8395f953700f90ae Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 23 Aug 2021 19:07:25 +0200 Subject: [PATCH 19/60] Update to 41.beta --- sources | 2 +- yelp.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index eecf740..d83c2d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-40.3.tar.xz) = d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28 +SHA512 (yelp-41.beta.tar.xz) = 42d1d51f488344a8cae81313a141f339e8fd82e407193b708724b7c603370626846448bdb4f0d3251e2732fab1e2ea4a0bd5b0d09713c7c98905eba3e8c3e6f9 diff --git a/yelp.spec b/yelp.spec index 426cb22..9810c3c 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,13 +2,13 @@ Name: yelp Epoch: 2 -Version: 40.3 +Version: 41~beta Release: 1%{?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}/40/%{name}-%{tarball_version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/41/%{name}-%{tarball_version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch @@ -55,7 +55,7 @@ the libraries in the yelp-libs package. %autosetup -p1 -n %{name}-%{tarball_version} %build -%configure --disable-static +%configure --disable-static --with-webkit2gtk-4-0 %make_build %install @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Aug 23 2021 Kalev Lember - 2:41~beta-1 +- Update to 41.beta + * Tue Aug 03 2021 Kalev Lember - 2:40.3-1 - Update to 40.3 From 44d492141507aede61035f48d595400e07c009a1 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 30 Aug 2021 08:49:02 +0100 Subject: [PATCH 20/60] Update to 41.beta2 (#1997839) --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d83c2d6..9ccd645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-41.beta.tar.xz) = 42d1d51f488344a8cae81313a141f339e8fd82e407193b708724b7c603370626846448bdb4f0d3251e2732fab1e2ea4a0bd5b0d09713c7c98905eba3e8c3e6f9 +SHA512 (yelp-41.beta2.tar.xz) = e7a3b6388ea4b07003799fe683ea6c14e361130416c71031c5348c389b5600a2b476f6f0940b458735f4a116ed248508fcb3d205afe04d55f3c81c90532f31b3 diff --git a/yelp.spec b/yelp.spec index 9810c3c..9eb3ca7 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 41~beta +Version: 41~beta2 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Aug 30 2021 David King - 2:41~beta2-1 +- Update to 41.beta2 (#1997839) + * Mon Aug 23 2021 Kalev Lember - 2:41~beta-1 - Update to 41.beta From 6171b714f0b197d58011e1e13adf27358d3adbf5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 20 Sep 2021 11:21:17 +0200 Subject: [PATCH 21/60] Update to 41.0 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9ccd645..4aab42e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-41.beta2.tar.xz) = e7a3b6388ea4b07003799fe683ea6c14e361130416c71031c5348c389b5600a2b476f6f0940b458735f4a116ed248508fcb3d205afe04d55f3c81c90532f31b3 +SHA512 (yelp-41.0.tar.xz) = 89292304d2fb43bd0f432e01058a34ba075d5fd1243857fd5fcebd106e3cf4dc452b630af652caf980b03b894423520e98bfad176e0855f77869d854ce753fbc diff --git a/yelp.spec b/yelp.spec index 9eb3ca7..2065a53 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 41~beta2 +Version: 41.0 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Sep 20 2021 Kalev Lember - 2:41.0-1 +- Update to 41.0 + * Mon Aug 30 2021 David King - 2:41~beta2-1 - Update to 41.beta2 (#1997839) From 6e03a60654b6059d78e30e425c299d253204e4b6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 26 Sep 2021 00:13:59 +0200 Subject: [PATCH 22/60] Update to 41.1 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4aab42e..1cb0e74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-41.0.tar.xz) = 89292304d2fb43bd0f432e01058a34ba075d5fd1243857fd5fcebd106e3cf4dc452b630af652caf980b03b894423520e98bfad176e0855f77869d854ce753fbc +SHA512 (yelp-41.1.tar.xz) = 5a4e156e6154e1e8648b7b653eba69932479bf7029d700cacdd969b0bb61c44b199e717c64254e233b39c4a6af5163016979d790a2cd24d6f94c56ab986c03b0 diff --git a/yelp.spec b/yelp.spec index 2065a53..39ab593 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 41.0 +Version: 41.1 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Sep 25 2021 Kalev Lember - 2:41.1-1 +- Update to 41.1 + * Mon Sep 20 2021 Kalev Lember - 2:41.0-1 - Update to 41.0 From f886222786ed8ee792c451047ebd2ac809fe5f2b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Dec 2021 15:12:00 +0100 Subject: [PATCH 23/60] Update to 41.2 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1cb0e74..9c170c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-41.1.tar.xz) = 5a4e156e6154e1e8648b7b653eba69932479bf7029d700cacdd969b0bb61c44b199e717c64254e233b39c4a6af5163016979d790a2cd24d6f94c56ab986c03b0 +SHA512 (yelp-41.2.tar.xz) = 171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf diff --git a/yelp.spec b/yelp.spec index 39ab593..45c76b3 100644 --- a/yelp.spec +++ b/yelp.spec @@ -2,7 +2,7 @@ Name: yelp Epoch: 2 -Version: 41.1 +Version: 41.2 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Tue Dec 07 2021 Kalev Lember - 2:41.2-1 +- Update to 41.2 + * Sat Sep 25 2021 Kalev Lember - 2:41.1-1 - Update to 41.1 From 3c557688378c9105ddcdcc7c8e6c967f8f5d4fbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:41:29 +0000 Subject: [PATCH 24/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 45c76b3..eee2793 100644 --- a/yelp.spec +++ b/yelp.spec @@ -3,7 +3,7 @@ Name: yelp Epoch: 2 Version: 41.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2:41.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 07 2021 Kalev Lember - 2:41.2-1 - Update to 41.2 From ee179fcbf1918c104c4e239c1384ec6b01595d88 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 14 Feb 2022 09:29:38 +0000 Subject: [PATCH 25/60] Update to 42.beta --- yelp.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/yelp.spec b/yelp.spec index eee2793..31a02fb 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,21 +1,22 @@ +%global libhandy_version 1.5.0 + %global tarball_version %%(echo %{version} | tr '~' '.') Name: yelp Epoch: 2 -Version: 41.2 -Release: 2%{?dist} +Version: 42~beta +Release: 1%{?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}/41/%{name}-%{tarball_version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch -BuildRequires: gcc -BuildRequires: make BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libexslt) @@ -25,9 +26,12 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(yelp-xsl) BuildRequires: desktop-file-utils BuildRequires: bzip2-devel +BuildRequires: gcc BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: itstool +BuildRequires: make +Requires: libhandy%{?_isa} >= %{libhandy_version} Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: yelp-xsl @@ -48,8 +52,7 @@ Summary: Development files for yelp-libs Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel -This package contains header files and documentation for -the libraries in the yelp-libs package. +This package contains header files for the libraries in the yelp-libs package. %prep %autosetup -p1 -n %{name}-%{tarball_version} @@ -89,10 +92,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %files devel %{_libdir}/libyelp.so %{_includedir}/libyelp -%{_datadir}/gtk-doc %changelog +* Mon Feb 14 2022 David King - 2:42~beta-1 +- Update to 42.beta + * Sat Jan 22 2022 Fedora Release Engineering - 2:41.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3f3165c290077f58503547fdb0b8da3a0aebf057 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 14 Feb 2022 09:34:26 +0000 Subject: [PATCH 26/60] Update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 9c170c7..a4ad4a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-41.2.tar.xz) = 171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf +SHA512 (yelp-42.beta.tar.xz) = 2d15b6b20f76dc3a5bbf9707f8e5924ce34ee95f9343ef564ab13e86c36c28c58dedf0f70e0746d2875fbcf375e8a05a35a904b0aebb897e76163b7c0ce27e7e From 8a2e866f75100c1a2f38c15020e0f79495800b5d Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 19 Mar 2022 17:57:13 +0000 Subject: [PATCH 27/60] Update to 42.0 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a4ad4a6..f200d39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-42.beta.tar.xz) = 2d15b6b20f76dc3a5bbf9707f8e5924ce34ee95f9343ef564ab13e86c36c28c58dedf0f70e0746d2875fbcf375e8a05a35a904b0aebb897e76163b7c0ce27e7e +SHA512 (yelp-42.0.tar.xz) = 3e2ce7436145d290eb67f39935f8351cafa316c1fc96e41fa316deb4e5f29582b1b224f308e4e22bf2590755286f8a927c5bc988633e14f7d10f0de2d62f962c diff --git a/yelp.spec b/yelp.spec index 31a02fb..3e5acbd 100644 --- a/yelp.spec +++ b/yelp.spec @@ -4,7 +4,7 @@ Name: yelp Epoch: 2 -Version: 42~beta +Version: 42.0 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -95,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Mar 19 2022 David King - 2:42.0-1 +- Update to 42.0 + * Mon Feb 14 2022 David King - 2:42~beta-1 - Update to 42.beta From 1a0bc595ac5ba3366e157ee7734f29c3e7b7a2f2 Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 26 Mar 2022 21:20:51 +0000 Subject: [PATCH 28/60] Update to 42.1 --- sources | 2 +- yelp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f200d39..40df95e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-42.0.tar.xz) = 3e2ce7436145d290eb67f39935f8351cafa316c1fc96e41fa316deb4e5f29582b1b224f308e4e22bf2590755286f8a927c5bc988633e14f7d10f0de2d62f962c +SHA512 (yelp-42.1.tar.xz) = 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db diff --git a/yelp.spec b/yelp.spec index 3e5acbd..57abc0d 100644 --- a/yelp.spec +++ b/yelp.spec @@ -4,7 +4,7 @@ Name: yelp Epoch: 2 -Version: 42.0 +Version: 42.1 Release: 1%{?dist} Summary: Help browser for the GNOME desktop @@ -95,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Mar 26 2022 David King - 2:42.1-1 +- Update to 42.1 + * Sat Mar 19 2022 David King - 2:42.0-1 - Update to 42.0 From 9b92f37963cdc960490b41e37bd5d0c284f0cccb Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 8 Apr 2022 10:57:19 -0700 Subject: [PATCH 29/60] Add dep on libunwind --- yelp.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 57abc0d..75583bc 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,11 +1,12 @@ %global libhandy_version 1.5.0 +%global libunwind_version 1.6.2 %global tarball_version %%(echo %{version} | tr '~' '.') Name: yelp Epoch: 2 Version: 42.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -32,6 +33,7 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: make Requires: libhandy%{?_isa} >= %{libhandy_version} +Requires: libunwind%{?_isa} >= %{libunwind_version} Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: yelp-xsl @@ -95,6 +97,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Fri Apr 08 2022 Kevin Fenzi - 2:42.1-2 +- Add dep on libunwind + * Sat Mar 26 2022 David King - 2:42.1-1 - Update to 42.1 From 824e66e5e491ea55dbfa9ab7b0643095cbd7e127 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 8 Apr 2022 11:10:53 -0700 Subject: [PATCH 30/60] Also BuildRequire libunwind Signed-off-by: Kevin Fenzi --- yelp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yelp.spec b/yelp.spec index 75583bc..9f1afae 100644 --- a/yelp.spec +++ b/yelp.spec @@ -25,6 +25,7 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(yelp-xsl) +BuildRequires: libunwind BuildRequires: desktop-file-utils BuildRequires: bzip2-devel BuildRequires: gcc From 0c6bc990a65825f4eb2948a0a155236e422e2194 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 19 Jul 2022 16:09:03 +0200 Subject: [PATCH 31/60] Switch to WebKitGTK API 4.1 (using libsoup3) --- yelp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yelp.spec b/yelp.spec index 9f1afae..1fb32a1 100644 --- a/yelp.spec +++ b/yelp.spec @@ -6,7 +6,7 @@ Name: yelp Epoch: 2 Version: 42.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(webkit2gtk-4.1) BuildRequires: pkgconfig(yelp-xsl) BuildRequires: libunwind BuildRequires: desktop-file-utils @@ -61,7 +61,7 @@ This package contains header files for the libraries in the yelp-libs package. %autosetup -p1 -n %{name}-%{tarball_version} %build -%configure --disable-static --with-webkit2gtk-4-0 +%configure --disable-static %make_build %install @@ -98,6 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Tue Jul 19 2022 Milan Crha - 2:42.1-3 +- Switch to WebKitGTK API 4.1 (using libsoup3) + * Fri Apr 08 2022 Kevin Fenzi - 2:42.1-2 - Add dep on libunwind From cdacfd13aacb5cb8468ea2a6b4ee56067b8b11cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:44:19 +0000 Subject: [PATCH 32/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 1fb32a1..1b3bb3a 100644 --- a/yelp.spec +++ b/yelp.spec @@ -6,7 +6,7 @@ Name: yelp Epoch: 2 Version: 42.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -98,6 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2:42.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Milan Crha - 2:42.1-3 - Switch to WebKitGTK API 4.1 (using libsoup3) From 6d982cdfa922cd9cfdf21cbbf2beecd52aed3730 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 19 Sep 2022 23:19:51 +0200 Subject: [PATCH 33/60] Update to 42.2 --- sources | 2 +- yelp.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 40df95e..7f416fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-42.1.tar.xz) = 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db +SHA512 (yelp-42.2.tar.xz) = 7fd8da347b3cdb9b24a31eebe14c4964c5e41956caa2b79e70d6ea0c829d94f8428bbd96a2472c02d56673ca0ed1c75f7c6f874a59c4eea0b1440918a99969f4 diff --git a/yelp.spec b/yelp.spec index 1b3bb3a..b60021e 100644 --- a/yelp.spec +++ b/yelp.spec @@ -5,8 +5,8 @@ Name: yelp Epoch: 2 -Version: 42.1 -Release: 4%{?dist} +Version: 42.2 +Release: 1%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -75,7 +75,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %files -f %{name}.lang -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README.md %license COPYING %{_bindir}/* %{_datadir}/applications/yelp.desktop @@ -98,6 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Mon Sep 19 2022 Kalev Lember - 2:42.2-1 +- Update to 42.2 + * Sat Jul 23 2022 Fedora Release Engineering - 2:42.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 16a083f914046928e73041b6ce6ebbccb3b44362 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:04:35 +0000 Subject: [PATCH 34/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index b60021e..75529c6 100644 --- a/yelp.spec +++ b/yelp.spec @@ -6,7 +6,7 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -98,6 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2:42.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Sep 19 2022 Kalev Lember - 2:42.2-1 - Update to 42.2 From 49b82ebcd6543088d00ba0cc7b8808b4958e6511 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:29:56 +0000 Subject: [PATCH 35/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 75529c6..83e779e 100644 --- a/yelp.spec +++ b/yelp.spec @@ -6,7 +6,7 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -98,6 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2:42.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2:42.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 03f93173647515c82584ebb570245e0176d8d12f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 11 Aug 2023 12:42:42 -0400 Subject: [PATCH 36/60] Drop unused libunwind dependencies These were added 08 April 2022 to fix issues with rawhide composes at the time, but yelp has no such dependency at either build nor runtime. Parts of GStreamer and Mesa do use libunwind, so it was possibly transitive. --- yelp.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yelp.spec b/yelp.spec index 83e779e..25df8b2 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,12 +1,11 @@ %global libhandy_version 1.5.0 -%global libunwind_version 1.6.2 %global tarball_version %%(echo %{version} | tr '~' '.') Name: yelp Epoch: 2 Version: 42.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -25,7 +24,6 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.1) BuildRequires: pkgconfig(yelp-xsl) -BuildRequires: libunwind BuildRequires: desktop-file-utils BuildRequires: bzip2-devel BuildRequires: gcc @@ -34,7 +32,6 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: make Requires: libhandy%{?_isa} >= %{libhandy_version} -Requires: libunwind%{?_isa} >= %{libunwind_version} Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: yelp-xsl @@ -98,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Fri Aug 11 2023 Yaakov Selkowitz - 2:42.2-4 +- Drop unused libunwind dependencies + * Sat Jul 22 2023 Fedora Release Engineering - 2:42.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4f435be116c06435c51681ed7d86c3bdfbfc269c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:45:40 +0000 Subject: [PATCH 37/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 25df8b2..0b70fb5 100644 --- a/yelp.spec +++ b/yelp.spec @@ -5,7 +5,7 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -95,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2:42.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 11 2023 Yaakov Selkowitz - 2:42.2-4 - Drop unused libunwind dependencies From 479e2ba578898daff7d8f2e2bee151260a8ef799 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:41:08 +0000 Subject: [PATCH 38/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index 0b70fb5..427989b 100644 --- a/yelp.spec +++ b/yelp.spec @@ -5,7 +5,7 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ @@ -95,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2:42.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2:42.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 89bca12d4cfd6e77435131079ee1f6d2bdba6883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 23:00:26 +0200 Subject: [PATCH 39/60] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- yelp.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yelp.spec b/yelp.spec index 427989b..ca2ea92 100644 --- a/yelp.spec +++ b/yelp.spec @@ -5,10 +5,11 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Help browser for the GNOME desktop -License: LGPLv2+ and ASL 2.0 and GPLv2+ +# Automatically converted from old format: LGPLv2+ and ASL 2.0 and GPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ AND Apache-2.0 AND GPL-2.0-or-later URL: https://wiki.gnome.org/Apps/Yelp Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz @@ -95,6 +96,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Wed Sep 04 2024 Miroslav Suchý - 2:42.2-7 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2:42.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1fc4efa67e9fc9141c302e1e35931199de14a33f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:32:59 +0000 Subject: [PATCH 40/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yelp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yelp.spec b/yelp.spec index ca2ea92..ad22988 100644 --- a/yelp.spec +++ b/yelp.spec @@ -5,7 +5,7 @@ Name: yelp Epoch: 2 Version: 42.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Help browser for the GNOME desktop # Automatically converted from old format: LGPLv2+ and ASL 2.0 and GPLv2+ - review is highly recommended. @@ -96,6 +96,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2:42.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 2:42.2-7 - convert license to SPDX From 8ab3826b971f5fef2d8da095d2191995a688bc15 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 9 May 2025 09:03:26 +0200 Subject: [PATCH 41/60] Fix CVE-2025-3155 - arbitrary file-read --- yelp-CVE-2025-3155.patch | 118 +++++++++++++++++++++++++++++++++++++++ yelp.spec | 7 ++- 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 yelp-CVE-2025-3155.patch diff --git a/yelp-CVE-2025-3155.patch b/yelp-CVE-2025-3155.patch new file mode 100644 index 0000000..1c10b61 --- /dev/null +++ b/yelp-CVE-2025-3155.patch @@ -0,0 +1,118 @@ +From 7ecd58dc0ca7bf9d0acb00bf04194a0cb6e8b724 Mon Sep 17 00:00:00 2001 +From: Shaun McCance +Date: Fri, 18 Apr 2025 11:33:01 -0400 +Subject: [PATCH] Initial fix for CVE-2025-3155 from parrot409 + +https://gitlab.gnome.org/GNOME/yelp/-/issues/221 +--- + data/xslt/mal2html.xsl.in | 5 +++++ + data/xslt/man2html.xsl.in | 2 +- + data/xslt/yelp-common.xsl.in | 7 +++++++ + libyelp/yelp-transform.c | 19 +++++++++++++++++++ + libyelp/yelp-view.c | 2 +- + 5 files changed, 33 insertions(+), 2 deletions(-) + +diff --git a/data/xslt/mal2html.xsl.in b/data/xslt/mal2html.xsl.in +index 9e44b734..0a74da55 100644 +--- a/data/xslt/mal2html.xsl.in ++++ b/data/xslt/mal2html.xsl.in +@@ -19,6 +19,11 @@ + + + ++ ++ ++ ++ ++ + + + +diff --git a/data/xslt/man2html.xsl.in b/data/xslt/man2html.xsl.in +index 676ce3eb..56bc1f5c 100644 +--- a/data/xslt/man2html.xsl.in ++++ b/data/xslt/man2html.xsl.in +@@ -131,7 +131,7 @@ + the correct styling and a single character which we measure the + width of and update each sheet as required. + --> +-