From d1a70492207a65f71417f58f352ae86656d69c10 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 01/34] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xchm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xchm.spec b/xchm.spec index 9445eac..e6c8e23 100644 --- a/xchm.spec +++ b/xchm.spec @@ -7,6 +7,7 @@ Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop URL: http://xchm.sourceforge.net/ +BuildRequires: gcc BuildRequires: chmlib-devel BuildRequires: wxGTK-devel >= 2.8 BuildRequires: desktop-file-utils From 377e6570b89e2096a0fde3bc0cf17a764d076c4c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:53:47 -0500 Subject: [PATCH 02/34] Remove needless use of %defattr --- xchm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index e6c8e23..f0cc5d0 100644 --- a/xchm.spec +++ b/xchm.spec @@ -50,7 +50,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %find_lang %{name} %files -f %{name}.lang -%defattr(-, root, root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/xchm %{_datadir}/icons/hicolor/ From 899b7a9452c38da447418a15191388d3047d0d00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:09:09 +0000 Subject: [PATCH 03/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index f0cc5d0..3f9a1f0 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.23-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.23-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e85753194cdd55e898142bab094eecd200a3f033 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:57:08 +0200 Subject: [PATCH 04/34] Add missing BuildRequires on gcc-c++ make[2]: g++: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606729 Signed-off-by: Igor Gnatenko --- xchm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xchm.spec b/xchm.spec index 3f9a1f0..1242786 100644 --- a/xchm.spec +++ b/xchm.spec @@ -7,6 +7,7 @@ Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop URL: http://xchm.sourceforge.net/ +BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel BuildRequires: wxGTK-devel >= 2.8 From 74d71825d467ce189c6c100275eebb0d10851c99 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 22 Aug 2018 23:01:00 -0400 Subject: [PATCH 05/34] Rebuild with wxWidgets 3.0 --- wxwidgets-3.0.patch | 21 +++++++++++++++++++++ xchm.spec | 9 +++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 wxwidgets-3.0.patch diff --git a/wxwidgets-3.0.patch b/wxwidgets-3.0.patch new file mode 100644 index 0000000..d374e81 --- /dev/null +++ b/wxwidgets-3.0.patch @@ -0,0 +1,21 @@ +diff -up xchm-1.23/src/chmframe.cpp.wx3 xchm-1.23/src/chmframe.cpp +--- xchm-1.23/src/chmframe.cpp.wx3 2013-08-30 04:31:38.000000000 -0400 ++++ xchm-1.23/src/chmframe.cpp 2018-08-22 20:03:46.780851202 -0400 +@@ -265,7 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv + enu.EnumerateFacenames(); + _normalFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 ++#if wxCHECK_VERSION(2, 7, 0) + *_normalFonts = enu.GetFacenames(); + #else + *_normalFonts = *enu.GetFacenames(); +@@ -278,7 +278,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv + enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); + _fixedFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 ++#if wxCHECK_VERSION(2, 7, 0) + *_fixedFonts = enu.GetFacenames(); + #else + *_fixedFonts = *enu.GetFacenames(); diff --git a/xchm.spec b/xchm.spec index 1242786..d023269 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,16 +1,17 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: wxwidgets-3.0.patch URL: http://xchm.sourceforge.net/ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel -BuildRequires: wxGTK-devel >= 2.8 +BuildRequires: wxGTK3-devel BuildRequires: desktop-file-utils %description @@ -24,6 +25,7 @@ content or just the topics' titles. %prep %setup -q +%patch0 -p1 %build #export CFLAGS="-g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic" @@ -57,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Wed Aug 22 2018 Scott Talbert - 1.23-14 +- Rebuild with wxWidgets 3.0 + * Sat Jul 14 2018 Fedora Release Engineering - 1.23-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 10c4d5d54958da1e20b0f532b4a50e87492f8cd8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 06/34] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xchm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index d023269..78a0ae9 100644 --- a/xchm.spec +++ b/xchm.spec @@ -3,7 +3,6 @@ Name: xchm Version: 1.23 Release: 14%{?dist} License: GPLv2+ -Group: Applications/Publishing Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: wxwidgets-3.0.patch From 935e7f13432a075d9256681ab28fdf8e0005dfcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:11:18 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 78a0ae9..c7f3e91 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -58,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.23-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Aug 22 2018 Scott Talbert - 1.23-14 - Rebuild with wxWidgets 3.0 From b63d345bc2adbd50ea5ee49a55598f01d46e6a6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:57:07 +0000 Subject: [PATCH 08/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index c7f3e91..1088888 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -58,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.23-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.23-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7977885a8a5c4b2ea835f796d51f7d21d9445c9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:11:04 +0000 Subject: [PATCH 09/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 1088888..d4f44ec 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -58,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.23-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.23-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1c4344befad6ecaf4f26c7a4ffe9f687ec3d9382 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:31:03 +0000 Subject: [PATCH 10/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index d4f44ec..1981446 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -58,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.23-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.23-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e9b0da18f2c4da8d38bedb80078fda90e34e7d4e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:11:59 +0000 Subject: [PATCH 11/34] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xchm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xchm.spec b/xchm.spec index 1981446..97b080a 100644 --- a/xchm.spec +++ b/xchm.spec @@ -7,6 +7,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Source1: %{name}.desktop Patch0: wxwidgets-3.0.patch URL: http://xchm.sourceforge.net/ +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel From b12f0fc9e4282b9367c2ad02d746a35f882ac5df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:51:24 +0000 Subject: [PATCH 12/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 97b080a..3034992 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.23-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.23-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6925f283b1a22f6bbf695571304675b4092cbaf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:21:21 +0000 Subject: [PATCH 13/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 3034992..9334d9e 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.23-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.23-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 02109ccda135c889760c6fe00e9e2136bf24a6b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:53:02 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 9334d9e..90247fe 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.23-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.23-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 187ba52db022c03bc58fc8ff3612496ac003a38c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:52:28 +0000 Subject: [PATCH 15/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 90247fe..fcc0b61 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.23-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.23-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 06c7c89cf7bace4f1931f31c16706fe46eb4c3fa Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:16:46 -0400 Subject: [PATCH 16/34] Rebuild with wxWidgets 3.2 --- xchm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xchm.spec b/xchm.spec index fcc0b61..eb86aa6 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.23 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -11,7 +11,7 @@ BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: desktop-file-utils %description @@ -59,6 +59,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_datadir}/applications/* %changelog +* Thu Aug 04 2022 Scott Talbert - 1.23-23 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 1.23-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 73b95840c7beb45702d1de460fa69ffe5a6e0470 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 23 Nov 2022 00:31:58 -0500 Subject: [PATCH 17/34] Update to 1.33, modernize spec --- .gitignore | 1 + sources | 2 +- wxwidgets-3.0.patch | 21 ------------------ xchm.desktop | 14 ------------ xchm.spec | 53 +++++++++++++++++++-------------------------- 5 files changed, 24 insertions(+), 67 deletions(-) delete mode 100644 wxwidgets-3.0.patch delete mode 100644 xchm.desktop diff --git a/.gitignore b/.gitignore index 4c939a9..e2b92f8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xchm-1.17.tar.gz /xchm-1.21.tar.gz /xchm-1.22.tar.gz /xchm-1.23.tar.gz +/xchm-1.33.tar.gz diff --git a/sources b/sources index f145e21..3363460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -486d029bd81071a2d04e7181909b1602 xchm-1.23.tar.gz +SHA512 (xchm-1.33.tar.gz) = 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989 diff --git a/wxwidgets-3.0.patch b/wxwidgets-3.0.patch deleted file mode 100644 index d374e81..0000000 --- a/wxwidgets-3.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xchm-1.23/src/chmframe.cpp.wx3 xchm-1.23/src/chmframe.cpp ---- xchm-1.23/src/chmframe.cpp.wx3 2013-08-30 04:31:38.000000000 -0400 -+++ xchm-1.23/src/chmframe.cpp 2018-08-22 20:03:46.780851202 -0400 -@@ -265,7 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv - enu.EnumerateFacenames(); - _normalFonts = new wxArrayString; - --#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 -+#if wxCHECK_VERSION(2, 7, 0) - *_normalFonts = enu.GetFacenames(); - #else - *_normalFonts = *enu.GetFacenames(); -@@ -278,7 +278,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv - enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); - _fixedFonts = new wxArrayString; - --#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 -+#if wxCHECK_VERSION(2, 7, 0) - *_fixedFonts = enu.GetFacenames(); - #else - *_fixedFonts = *enu.GetFacenames(); diff --git a/xchm.desktop b/xchm.desktop deleted file mode 100644 index b14d3b0..0000000 --- a/xchm.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=xCHM -GenericName=chm file viewer -GenericName[it]=Visore di file chm -GenericName[fr]=Visualisation de fichiers chm -Comment=wxGTK based GUI front-end to chmlib -Comment[fr]=Une interface pour chmlib utilisant wxGTK -Exec=xchm -Icon=xchm -Terminal=false -Type=Application -MimeType=application/x-chm; -Categories=Utility; diff --git a/xchm.spec b/xchm.spec index eb86aa6..9e18e53 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,18 +1,18 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.23 -Release: 23%{?dist} +Version: 1.33 +Release: 1%{?dist} License: GPLv2+ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: wxwidgets-3.0.patch -URL: http://xchm.sourceforge.net/ -BuildRequires: make +URL: https://github.com/rzvncj/xCHM +Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz + +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel BuildRequires: wxGTK-devel BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib %description xCHM is a wxWidgets-based .chm viewer. xCHM can show the contents tree if @@ -24,41 +24,32 @@ found inside indexed .chm archives, and it can be customized to search in content or just the topics' titles. %prep -%setup -q -%patch0 -p1 +%autosetup %build -#export CFLAGS="-g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic" %configure --disable-dependency-tracking -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/ -desktop-file-install \ - %if 0%{?fedora} < 19 - --vendor fedora \ - %endif - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE1} -for resolution in 16 32 48 128; do - dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/ - mkdir -p $dir/apps $dir/mimetypes - install -p -m644 art/xchm-${resolution}.xpm $dir/apps/xchm.xpm - install -p -m644 art/xchmdoc-${resolution}.xpm $dir/mimetypes/application-x-chm.xpm - ln -s application-x-chm.xpm $dir/mimetypes/gnome-mime-application-x-chm.xpm -done -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps +%make_install +desktop-file-validate %{buildroot}%{_datadir}/applications/xchm.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appdata.xml %find_lang %{name} %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog README +%doc ChangeLog README +%license AUTHORS COPYING %{_bindir}/xchm -%{_datadir}/icons/hicolor/ -%{_datadir}/applications/* +%{_datadir}/applications/xchm.desktop +%{_datadir}/icons/hicolor/*/apps/xchm* +%{_datadir}/metainfo/xchm.appdata.xml +%{_mandir}/man1/xchm.1* %changelog +* Wed Nov 23 2022 Yaakov Selkowitz - 1.33-1 +- Update to 1.33 +- Modernize spec + * Thu Aug 04 2022 Scott Talbert - 1.23-23 - Rebuild with wxWidgets 3.2 From bd362f08459e2b6fe560b15b4af84d981c4fb4a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:14:05 +0000 Subject: [PATCH 18/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 9e18e53..932dca1 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/rzvncj/xCHM Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appd %{_mandir}/man1/xchm.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 23 2022 Yaakov Selkowitz - 1.33-1 - Update to 1.33 - Modernize spec From c1cc05bfe7741661700b474d58dbab7b8c02a5b3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sat, 4 Feb 2023 23:03:33 -0500 Subject: [PATCH 19/34] Update to 1.34 --- .gitignore | 8 +------- sources | 2 +- xchm.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index e2b92f8..0c41f68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -xchm-1.17.tar.gz -/xchm-1.19.tar.gz -/xchm-1.20.tar.gz -/xchm-1.21.tar.gz -/xchm-1.22.tar.gz -/xchm-1.23.tar.gz -/xchm-1.33.tar.gz +/xchm-*.tar.gz diff --git a/sources b/sources index 3363460..91c38ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.33.tar.gz) = 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989 +SHA512 (xchm-1.34.tar.gz) = c84ea8c84b4d3242e6251c428dd4762c34553c8980895e3185b4cb0408a050e0d028cbf27374b311b181a086db0a2647afdcf6d38477aab1daca0ae4923627ad diff --git a/xchm.spec b/xchm.spec index 932dca1..a391323 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,8 +1,8 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.33 -Release: 2%{?dist} -License: GPLv2+ +Version: 1.34 +Release: 1%{?dist} +License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appd %{_mandir}/man1/xchm.1* %changelog +* Sun Feb 05 2023 Yaakov Selkowitz - 1.34-1 +- Update to 1.34 + * Sat Jan 21 2023 Fedora Release Engineering - 1.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4a509c90b19c7bf375c00b3b29f66ca5ebc079a4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 6 Feb 2023 11:11:13 -0500 Subject: [PATCH 20/34] Update to 1.35 --- sources | 2 +- xchm.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 91c38ff..92f342f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.34.tar.gz) = c84ea8c84b4d3242e6251c428dd4762c34553c8980895e3185b4cb0408a050e0d028cbf27374b311b181a086db0a2647afdcf6d38477aab1daca0ae4923627ad +SHA512 (xchm-1.35.tar.gz) = 53a334b460c2de51b1f5a6afbca888e376430ab2fb48f2d60c71d34886b19ca5982cf3a4f23c3cb7456781c3b658affa5a64da3ade961accf258096b5fa6df3d diff --git a/xchm.spec b/xchm.spec index a391323..6f0b1a8 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,6 +1,6 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.34 +Version: 1.35 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appd %{_mandir}/man1/xchm.1* %changelog +* Mon Feb 06 2023 Yaakov Selkowitz - 1.35-1 +- Update to 1.35 + * Sun Feb 05 2023 Yaakov Selkowitz - 1.34-1 - Update to 1.34 From 618f20c449d810e0ad66bc95992ad661a04757c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:36:20 +0000 Subject: [PATCH 21/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xchm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 6f0b1a8..0e4d259 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.35 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appd %{_mandir}/man1/xchm.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 06 2023 Yaakov Selkowitz - 1.35-1 - Update to 1.35 From 51d14f13ba8312f39c18cf6d4937bbfd97801c47 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 19 Sep 2023 01:41:27 -0400 Subject: [PATCH 22/34] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++ xchm.spec | 170 +----------------------------------------------------- 2 files changed, 169 insertions(+), 168 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7558976 --- /dev/null +++ b/changelog @@ -0,0 +1,167 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 1.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 06 2023 Yaakov Selkowitz - 1.35-1 +- Update to 1.35 + +* Sun Feb 05 2023 Yaakov Selkowitz - 1.34-1 +- Update to 1.34 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 23 2022 Yaakov Selkowitz - 1.33-1 +- Update to 1.33 +- Modernize spec + +* Thu Aug 04 2022 Scott Talbert - 1.23-23 +- Rebuild with wxWidgets 3.2 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.23-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.23-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.23-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.23-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.23-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.23-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.23-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.23-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Aug 22 2018 Scott Talbert - 1.23-14 +- Rebuild with wxWidgets 3.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.23-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.23-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 1.23-11 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 1.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.23-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.23-5 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 1.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Jan 26 2014 manuel "lonely wolf" wolfshant - 1.23-2 +- Adjust version required for wxGTK and fixed "bogus date in %%changelog" + +* Mon Sep 02 2013 manuel "lonely wolf" wolfshant - 1.23-1 +- New upstream version + +* Sun Aug 04 2013 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Mar 23 2013 manuel "lonely wolf" wolfshant - 1.22-1 +- New upstream version +- Use newer autoconf in order to support ARM64 + +* Sun Feb 10 2013 Parag Nemade - 1.21-2 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + +* Mon Nov 26 2012 Manuel "lonely wolf" Wolfshant - 1.21-1 +- New upstream version + +* Sun Jul 22 2012 Fedora Release Engineering - 1.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri May 6 2011 Manuel "lonely wolf" Wolfshant - 1.20-1 +- New upstream version, fixes #701827 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 14 2010 Dan Horák - 1.17-3 +- rebuilt against wxGTK-2.8.11-2 + +* Mon Jul 27 2009 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 8 2009 Manuel "lonely wolf" Wolfshant - 1.17-1 +- Version update. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Mar 1 2008 Patrice Dumas 1.14-1 +- update to 1.14. Remove upstreamed gcc 4.3 patch + +* Sat Jan 5 2008 Patrice Dumas 1.13-2 +- fixes for gcc 4.3 + +* Wed Aug 8 2007 Patrice Dumas 1.13-1 +- update to 1.13 + +* Sun Dec 17 2006 Patrice Dumas 1.10-2 +- rebuild for wxGTK-2.8.0 + +* Wed Nov 22 2006 Patrice Dumas 1.10-1 +- update to 1.10 + +* Thu Oct 05 2006 Christian Iseli 1.9-6 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Sep 25 2006 Patrice Dumas 1.9-5 +- install the icon for the chm file type + +* Sun Sep 24 2006 Patrice Dumas 1.9-4 +- add a MimeType entry in desktop file. Fix #207833 + +* Sat Sep 23 2006 Patrice Dumas 1.9-3 +- install icons in %%{_datadir}/icons/ instead of %%{_datadir}/pixmaps/ + fix #207759 + +* Tue Sep 12 2006 Patrice Dumas 1.9-2 +- rebuild for FC6 + +* Fri Jun 2 2006 Patrice Dumas 1.9-1 +- update to 1.9 + +* Fri Jun 2 2006 Patrice Dumas 1.8-1 +- update to 1.8 + +* Thu Mar 9 2006 Patrice Dumas 1.4-3 +- update to 1.4 + +* Mon Dec 05 2005 Peter Lemenkov 1.2-1 +- Version 1.2 + +* Mon Mar 21 2005 Nick Soracco +- Initial RPM release. Complementing the faderbox.org package. diff --git a/xchm.spec b/xchm.spec index 0e4d259..25d249c 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,7 +1,7 @@ Summary: A GUI front-end to CHMlib Name: xchm Version: 1.35 -Release: 2%{?dist} +Release: %autorelease License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz @@ -46,170 +46,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appd %{_mandir}/man1/xchm.1* %changelog -* Sat Jul 22 2023 Fedora Release Engineering - 1.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Feb 06 2023 Yaakov Selkowitz - 1.35-1 -- Update to 1.35 - -* Sun Feb 05 2023 Yaakov Selkowitz - 1.34-1 -- Update to 1.34 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 23 2022 Yaakov Selkowitz - 1.33-1 -- Update to 1.33 -- Modernize spec - -* Thu Aug 04 2022 Scott Talbert - 1.23-23 -- Rebuild with wxWidgets 3.2 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.23-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.23-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.23-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.23-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.23-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.23-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.23-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.23-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Aug 22 2018 Scott Talbert - 1.23-14 -- Rebuild with wxWidgets 3.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.23-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.23-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 1.23-11 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 1.23-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.23-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.23-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.23-5 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 1.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Jan 26 2014 manuel "lonely wolf" wolfshant - 1.23-2 -- Adjust version required for wxGTK and fixed "bogus date in %%changelog" - -* Mon Sep 02 2013 manuel "lonely wolf" wolfshant - 1.23-1 -- New upstream version - -* Sun Aug 04 2013 Fedora Release Engineering - 1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Mar 23 2013 manuel "lonely wolf" wolfshant - 1.22-1 -- New upstream version -- Use newer autoconf in order to support ARM64 - -* Sun Feb 10 2013 Parag Nemade - 1.21-2 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - -* Mon Nov 26 2012 Manuel "lonely wolf" Wolfshant - 1.21-1 -- New upstream version - -* Sun Jul 22 2012 Fedora Release Engineering - 1.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri May 6 2011 Manuel "lonely wolf" Wolfshant - 1.20-1 -- New upstream version, fixes #701827 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 14 2010 Dan Horák - 1.17-3 -- rebuilt against wxGTK-2.8.11-2 - -* Mon Jul 27 2009 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 8 2009 Manuel "lonely wolf" Wolfshant - 1.17-1 -- Version update. - -* Thu Feb 26 2009 Fedora Release Engineering - 1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Mar 1 2008 Patrice Dumas 1.14-1 -- update to 1.14. Remove upstreamed gcc 4.3 patch - -* Sat Jan 5 2008 Patrice Dumas 1.13-2 -- fixes for gcc 4.3 - -* Wed Aug 8 2007 Patrice Dumas 1.13-1 -- update to 1.13 - -* Sun Dec 17 2006 Patrice Dumas 1.10-2 -- rebuild for wxGTK-2.8.0 - -* Wed Nov 22 2006 Patrice Dumas 1.10-1 -- update to 1.10 - -* Thu Oct 05 2006 Christian Iseli 1.9-6 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Mon Sep 25 2006 Patrice Dumas 1.9-5 -- install the icon for the chm file type - -* Sun Sep 24 2006 Patrice Dumas 1.9-4 -- add a MimeType entry in desktop file. Fix #207833 - -* Sat Sep 23 2006 Patrice Dumas 1.9-3 -- install icons in %%{_datadir}/icons/ instead of %%{_datadir}/pixmaps/ - fix #207759 - -* Tue Sep 12 2006 Patrice Dumas 1.9-2 -- rebuild for FC6 - -* Fri Jun 2 2006 Patrice Dumas 1.9-1 -- update to 1.9 - -* Fri Jun 2 2006 Patrice Dumas 1.8-1 -- update to 1.8 - -* Thu Mar 9 2006 Patrice Dumas 1.4-3 -- update to 1.4 - -* Mon Dec 05 2005 Peter Lemenkov 1.2-1 -- Version 1.2 - -* Mon Mar 21 2005 Nick Soracco -- Initial RPM release. Complementing the faderbox.org package. +%autochangelog From a1aa564b6b6c149b9aa79cc9fee8ef4a85972380 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 19 Sep 2023 01:42:11 -0400 Subject: [PATCH 23/34] Update to 1.36 Resolves: rhbz#2239569 --- sources | 2 +- xchm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 92f342f..ac33a54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.35.tar.gz) = 53a334b460c2de51b1f5a6afbca888e376430ab2fb48f2d60c71d34886b19ca5982cf3a4f23c3cb7456781c3b658affa5a64da3ade961accf258096b5fa6df3d +SHA512 (xchm-1.36.tar.gz) = 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65 diff --git a/xchm.spec b/xchm.spec index 25d249c..a630a9f 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,6 +1,6 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.35 +Version: 1.36 Release: %autorelease License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM From f7a1090a48ef3648cb3a1ce748ce2b4f8439b8b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:24:47 +0000 Subject: [PATCH 24/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9a2034971732a39a6a6127a83027203889b0f6e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:48:24 +0000 Subject: [PATCH 25/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 37a8669b5bce828e2bb66d4e6a305b1d50218b98 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 12:08:11 +0300 Subject: [PATCH 26/34] xCHM ver. 1.37 Signed-off-by: Peter Lemenkov --- sources | 2 +- xchm.spec | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sources b/sources index ac33a54..379cc8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.36.tar.gz) = 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65 +SHA512 (xchm-1.37.tar.gz) = 284cdd92788aaa11be3cfbfb10c6537d465625bf9acfb40a0a8859f2c9b5fefc1f454a81046c86638d7dbad31a2bba7d859c34b945d9e8557287279c9572c0ac diff --git a/xchm.spec b/xchm.spec index a630a9f..29b6e68 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,26 +1,26 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.36 +Version: 1.37 Release: %autorelease License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM -Source0: %{url}/releases/download/%{version}/xchm-%{version}.tar.gz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz -BuildRequires: make -BuildRequires: gcc-c++ -BuildRequires: gcc BuildRequires: chmlib-devel -BuildRequires: wxGTK-devel BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libappstream-glib +BuildRequires: make +BuildRequires: wxGTK-devel %description -xCHM is a wxWidgets-based .chm viewer. xCHM can show the contents tree if -one is available, print the displayed page, change fonts faces and size, -work with bookmarks, do the usual history stunts (forward, back, home), -provide a searchable index and seach for text in the whole book. The -search is a fast B-tree search, based on the internal $FIftiMain file -found inside indexed .chm archives, and it can be customized to search in +xCHM is a wxWidgets-based .chm viewer. xCHM can show the contents tree if +one is available, print the displayed page, change fonts faces and size, +work with bookmarks, do the usual history stunts (forward, back, home), +provide a searchable index and seach for text in the whole book. The +search is a fast B-tree search, based on the internal $FIftiMain file +found inside indexed .chm archives, and it can be customized to search in content or just the topics' titles. %prep @@ -32,18 +32,18 @@ content or just the topics' titles. %install %make_install -desktop-file-validate %{buildroot}%{_datadir}/applications/xchm.desktop -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xchm.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml %find_lang %{name} %files -f %{name}.lang %doc ChangeLog README %license AUTHORS COPYING -%{_bindir}/xchm -%{_datadir}/applications/xchm.desktop -%{_datadir}/icons/hicolor/*/apps/xchm* -%{_datadir}/metainfo/xchm.appdata.xml -%{_mandir}/man1/xchm.1* +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}* +%{_datadir}/metainfo/%{name}.appdata.xml +%{_mandir}/man1/%{name}.1* %changelog %autochangelog From b487d6223b05709f0e89f9dc4fe788784a739abf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:31:54 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 99adac62147750f7c93e5b38da5cbb2cf17536f4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 5 Feb 2025 16:53:30 +0100 Subject: [PATCH 28/34] The --disable-dependency-tracking option already is a part of configure macro Signed-off-by: Peter Lemenkov --- xchm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xchm.spec b/xchm.spec index 29b6e68..a529ca4 100644 --- a/xchm.spec +++ b/xchm.spec @@ -27,7 +27,7 @@ content or just the topics' titles. %autosetup %build -%configure --disable-dependency-tracking +%configure %make_build %install From f4f010bb91749e36a183c408ae67c888127931a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:40:47 +0000 Subject: [PATCH 29/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0cd4746a622fc290f1f0049f4d67365922a57578 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 10 Aug 2025 12:05:14 +0200 Subject: [PATCH 30/34] This file doesn't contain licensing information Signed-off-by: Peter Lemenkov --- xchm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xchm.spec b/xchm.spec index a529ca4..dbfd25e 100644 --- a/xchm.spec +++ b/xchm.spec @@ -37,8 +37,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a %find_lang %{name} %files -f %{name}.lang -%doc ChangeLog README -%license AUTHORS COPYING +%doc AUTHORS ChangeLog README +%license COPYING %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}* From c2c8d15ad5befe7109242187eb07e257249073a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:30:27 +0000 Subject: [PATCH 31/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7a9fc60292dc31fa6a48d7752948844d4ce7ccec Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 1 Feb 2026 15:42:12 +0100 Subject: [PATCH 32/34] xCHM ver. 1.38 Signed-off-by: Peter Lemenkov --- sources | 2 +- xchm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 379cc8a..5e2c640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.37.tar.gz) = 284cdd92788aaa11be3cfbfb10c6537d465625bf9acfb40a0a8859f2c9b5fefc1f454a81046c86638d7dbad31a2bba7d859c34b945d9e8557287279c9572c0ac +SHA512 (xchm-1.38.tar.gz) = ae737c7149720e94181bb017c417fb0646f12d7f836f121d692373fbe6e0b938224d1add67c97515f2c7d6ff29ff368ca32ad873ee8badd83d5fe6a9081a392b diff --git a/xchm.spec b/xchm.spec index dbfd25e..ed4e4ea 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,6 +1,6 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.37 +Version: 1.38 Release: %autorelease License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM From 2d26890effaf2d03311095ff459f31d59ded823d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 14 Apr 2026 11:40:58 +0200 Subject: [PATCH 33/34] xCHM ver. 1.39 Signed-off-by: Peter Lemenkov --- .packit.yaml | 22 ++++++++++++++++++++++ sources | 2 +- xchm.spec | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..b54f174 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,22 @@ +specfile_path: xchm.spec +upstream_package_name: xCHM +downstream_package_name: xchm +upstream_project_url: https://github.com/rzvncj/xCHM + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-stable + - fedora-rawhide + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-stable + - fedora-rawhide + + - job: bodhi_update + trigger: koji_build_tag + dist_git_branches: + - fedora-stable diff --git a/sources b/sources index 5e2c640..2090e37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xchm-1.38.tar.gz) = ae737c7149720e94181bb017c417fb0646f12d7f836f121d692373fbe6e0b938224d1add67c97515f2c7d6ff29ff368ca32ad873ee8badd83d5fe6a9081a392b +SHA512 (xchm-1.39.tar.gz) = b480b90fb5e289bee86122c273b4f0ca9322045552b24639087b7173bb84c2e5b08fc7cf2ffb09cf5727c18739167576c4fb6595733cffd582f73b6300dc4f01 diff --git a/xchm.spec b/xchm.spec index ed4e4ea..5854099 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,6 +1,6 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.38 +Version: 1.39 Release: %autorelease License: GPL-2.0-or-later URL: https://github.com/rzvncj/xCHM From 4ad0e28362ceb384454883ff71e6375182132ee5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:03:53 +0000 Subject: [PATCH 34/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild