7:53 a.m.
commit 421d773c12b69871f3683dadeccb500bb187297a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 27 08:53:13 2016 +0100
Let try compat-wxGTK3-gtk2, rfbz#4267
wxsvg-wxwin.m4.patch | 27 +++++++++++++++++++++++++++
wxsvg.spec | 11 ++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/wxsvg-wxwin.m4.patch b/wxsvg-wxwin.m4.patch
new file mode 100644
index 0000000..c859927
--- /dev/null
+++ b/wxsvg-wxwin.m4.patch
@@ -0,0 +1,27 @@
+--- ./m4/wxwin.m4.org 2016-09-27 07:44:11.968104125 +0100
++++ ./m4/wxwin.m4 2016-09-27 07:45:28.972906202 +0100
+@@ -181,18 +181,18 @@ AC_DEFUN([WX_CONFIG_CHECK],
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+ [$wx_requested_minor_version],
diff --git a/wxsvg.spec b/wxsvg.spec
index a10ca29..ec1b6d4 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,19 +1,20 @@
Name: wxsvg
Version: 1.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
License: wxWidgets
URL: http://sourceforge.net/projects/wxsvg
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
+Patch1: wxsvg-wxwin.m4.patch
BuildRequires: autoconf automake libtool gettext
BuildRequires: expat-devel
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
BuildRequires: libart_lgpl-devel
BuildRequires: pango-devel
-BuildRequires: wxGTK3-devel
+BuildRequires: compat-wxGTK3-gtk2-devel
%description
wxSVG is C++ library to create, manipulate and render SVG files.
@@ -28,6 +29,7 @@ provides the files required to develop programs that use wxsvg.
%prep
%setup -q
+%patch1 -p1
%build
#clean autogenerated files before run autoreconf
@@ -36,7 +38,7 @@ rm m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4
m4/ltversion.m4
autoreconf -i
%configure \
--disable-dependency-tracking \
- --disable-static --with-wx-config=/usr/bin/wx-config-3.0
+ --disable-static --with-wx-config=/usr/bin/wx-config-3.0-gtk2
%{__sed} -i
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -66,6 +68,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Tue Sep 27 2016 Sérgio Basto <sergio(a)serjux.com> - 1.5.9-4
+- Let try compat-wxGTK3-gtk2, rfbz#4267
+
* Tue Aug 16 2016 Sérgio Basto <sergio(a)serjux.com> - 1.5.9-3
- Remove Requires old wxGTK-devel in wxsvg-devel, also don't need Requires wxsvg