From 49f178093111234456771cab60a7f722d16c9292 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Jul 17 2019 04:27:30 +0000 Subject: [PATCH 1/2] spec cleanup --- diff --git a/xchm.spec b/xchm.spec index c7f3e91..bc4da0f 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 @@ -23,17 +23,15 @@ 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 -p1 %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 +%make_install mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/ desktop-file-install \ %if 0%{?fedora} < 19 @@ -52,12 +50,16 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %find_lang %{name} %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS ChangeLog README +%license COPYING %{_bindir}/xchm %{_datadir}/icons/hicolor/ %{_datadir}/applications/* %changelog +* Wed Jul 17 2019 Filipe Rosset - 1.23-16 +- spec cleanup + * Sun Feb 03 2019 Fedora Release Engineering - 1.23-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a740f2bb4462a4cc04481ab5b4a6854bd375a3e0 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Jul 17 2019 13:13:59 +0000 Subject: [PATCH 2/2] - Update to 1.30 --- diff --git a/.gitignore b/.gitignore index 4c939a9..40e2aa9 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 +/1.30.tar.gz diff --git a/sources b/sources index f145e21..fd84900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -486d029bd81071a2d04e7181909b1602 xchm-1.23.tar.gz +SHA512 (1.30.tar.gz) = c9ac375435b506f2651d748ddc7235f2057fda5882afcb7684c377c6bf9f2e2400ea84a77027f8e493b06b171975b18e5258533e8efafd97f2cab57382f74fcd 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.spec b/xchm.spec index bc4da0f..6bfeba2 100644 --- a/xchm.spec +++ b/xchm.spec @@ -1,17 +1,19 @@ Summary: A GUI front-end to CHMlib Name: xchm -Version: 1.23 -Release: 16%{?dist} +Version: 1.30 +Release: 1%{?dist} License: GPLv2+ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +URL: https://github.com/rzvncj/xCHM +Source0: https://github.com/rzvncj/xCHM/archive/1.30.tar.gz Source1: %{name}.desktop -Patch0: wxwidgets-3.0.patch -URL: http://xchm.sourceforge.net/ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: chmlib-devel BuildRequires: wxGTK3-devel BuildRequires: desktop-file-utils +BuildRequires: autoconf +BuildRequires: gettext-devel +BuildRequires: automake %description xCHM is a wxWidgets-based .chm viewer. xCHM can show the contents tree if @@ -23,10 +25,10 @@ found inside indexed .chm archives, and it can be customized to search in content or just the topics' titles. %prep -%autosetup -p1 +%autosetup -p1 -n xCHM-1.30 %build -#export CFLAGS="-g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic" +autoreconf -vfi %configure --disable-dependency-tracking %make_build @@ -42,9 +44,9 @@ desktop-file-install \ 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 + install -p -m644 art/${resolution}x${resolution}/apps/xchm.xpm $dir/apps/xchm.xpm + install -p -m644 art/${resolution}x${resolution}/apps/xchmdoc.xpm $dir/apps/xchmdoc.xpm +# ln -s application-x-chm.xpm $dir/mimetypes/gnome-mime-application-x-chm.xpm done rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %find_lang %{name} @@ -55,8 +57,13 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/pixmaps %{_bindir}/xchm %{_datadir}/icons/hicolor/ %{_datadir}/applications/* +%{_datadir}/man/man1/xchm.1* +%{_datadir}/metainfo/xchm.appdata.xml %changelog +* Wed Jul 17 2019 Filipe Rosset - 1.30-1 +- Update to 1.30 + * Wed Jul 17 2019 Filipe Rosset - 1.23-16 - spec cleanup