#2 - Update xchm to 1.30
Opened 2 months ago by filiperosset. Modified 2 months ago
rpms/ filiperosset/xchm master  into  master

file modified
+1

@@ -4,3 +4,4 @@ 

  /xchm-1.21.tar.gz

  /xchm-1.22.tar.gz

  /xchm-1.23.tar.gz

+ /1.30.tar.gz

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- 486d029bd81071a2d04e7181909b1602  xchm-1.23.tar.gz

+ SHA512 (1.30.tar.gz) = c9ac375435b506f2651d748ddc7235f2057fda5882afcb7684c377c6bf9f2e2400ea84a77027f8e493b06b171975b18e5258533e8efafd97f2cab57382f74fcd

file removed
-21

@@ -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();

file modified
+24 -15

@@ -1,17 +1,19 @@ 

  Summary:        A GUI front-end to CHMlib

  Name:           xchm

- Version:        1.23

- Release:        15%{?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,17 +25,15 @@ 

  content or just the topics' titles.

  

  %prep

- %setup -q

- %patch0 -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 %{?_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

@@ -44,20 +44,29 @@ 

  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}

  

  %files -f %{name}.lang

- %doc AUTHORS COPYING ChangeLog README

+ %doc AUTHORS ChangeLog README

+ %license COPYING

  %{_bindir}/xchm

  %{_datadir}/icons/hicolor/

  %{_datadir}/applications/*

+ %{_datadir}/man/man1/xchm.1*

+ %{_datadir}/metainfo/xchm.appdata.xml

  

  %changelog

+ * Wed Jul 17 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.30-1

+ - Update to 1.30

+ 

+ * Wed Jul 17 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.23-16

+ - spec cleanup

+ 

  * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-15

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild