From a785404834dbe610c2f1f80152088efdee9965f1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 20 Oct 2016 17:01:15 +0200 Subject: [PATCH 1/3] Sub-package file swig.gdb (bug #1332673) --- swig.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/swig.spec b/swig.spec index bd92874..db10b32 100644 --- a/swig.spec +++ b/swig.spec @@ -31,7 +31,7 @@ Summary: Connects C/C++/Objective C to some high-level programming languages Name: swig Version: 3.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ and BSD URL: http://swig.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz @@ -116,6 +116,15 @@ BuildArch: noarch %description doc This package contains documentation for SWIG and useful examples +%package gdb +Summary: Commands for easier debugging of SWIG +License: BSD +Requires: swig + +%description gdb +This package contains file with commands for easier debugging of SWIG +in gdb. + %prep %setup -q -n swig-%{version} @@ -237,9 +246,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ install -dm 755 %{buildroot}%{_sysconfdir}/profile.d install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d +# Add swig.gdb sub-package gdb +mkdir -p %{buildroot}%{_datadir}/%{name}/gdb +install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb + %files -%{_bindir}/swig -%{_datadir}/swig +%{_bindir}/%{name} +%{_datadir}/%{name} +%exclude %{_datadir}/%{name}/gdb %{_mandir}/man1/swig.1* %license LICENSE LICENSE-GPL LICENSE-UNIVERSITIES %doc ANNOUNCE CHANGES CHANGES.current @@ -254,7 +268,13 @@ install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d %license LICENSE LICENSE-GPL LICENSE-UNIVERSITIES %doc Doc Examples COPYRIGHT +%files gdb +%{_datadir}/%{name}/gdb + %changelog +* Wed Oct 19 2016 Jitka Plesnikova - 3.0.10-2 +- Sub-package file swig.gdb (bug #1332673) + * Mon Jun 13 2016 Jitka Plesnikova - 3.0.10-1 - Update to 3.0.10 From bfe25de69d4f9a4821bded7f57db5b12d2c63614 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 4 Jan 2017 13:26:34 +0100 Subject: [PATCH 2/3] Update to 3.0.11; Add support for PHP 7 --- .gitignore | 1 + sources | 2 +- swig.spec | 22 +++++++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bb71b7e..f9b4dec 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ swig-2.0.0.tar.gz /swig-3.0.8.tar.gz /swig-3.0.9.tar.gz /swig-3.0.10.tar.gz +/swig-3.0.11.tar.gz diff --git a/sources b/sources index f433af1..e4912b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb4ab8047159469add7d00910e203124 swig-3.0.10.tar.gz +SHA512 (swig-3.0.11.tar.gz) = 36771bd29fcec159d283f0f8d056937c6c913fec717f1f3b97a9b17fa27a8a85aa5f7b79bec3c46d70b625c36c26e9e856a4750cbd0872070ca18e9174842a52 diff --git a/swig.spec b/swig.spec index db10b32..cbba80a 100644 --- a/swig.spec +++ b/swig.spec @@ -4,7 +4,7 @@ %{!?tcl:%global tcl 1} %{!?guile:%global guile 1} %{!?lualang:%global lualang 1} - +%{!?phplang:%global phplang 1} %{!?rubylang:%global rubylang 1} %ifarch aarch64 %{arm} %{mips} ppc64le ppc %{power64} s390 s390x @@ -25,13 +25,14 @@ %if 0%{?rhel} %{!?octave:%global octave 0} %else -%{!?octave:%global octave 1} +# Disable octave tests, because swig doesn't support Octave 4.2.0 +%{!?octave:%global octave 0} %endif Summary: Connects C/C++/Objective C to some high-level programming languages Name: swig -Version: 3.0.10 -Release: 2%{?dist} +Version: 3.0.11 +Release: 1%{?dist} License: GPLv3+ and BSD URL: http://swig.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz @@ -43,7 +44,8 @@ Source4: ccache-swig.csh Patch0: swig308-Do-not-use-isystem.patch -BuildRequires: perl, python2-devel, pcre-devel +BuildRequires: perl, pcre-devel +BuildRequires: python2-devel, python3-devel BuildRequires: autoconf, automake, gawk, dos2unix BuildRequires: gcc-c++ BuildRequires: help2man @@ -84,6 +86,9 @@ BuildRequires: R-devel %if %{javalang} BuildRequires: java, java-devel %endif +%if %{phplang} +BuildRequires: php, php-devel +%endif %description Simplified Wrapper and Interface Generator (SWIG) is a software @@ -144,6 +149,9 @@ done # It causes that log had more then 600M. %configure \ --without-ocaml \ +%if %{phplang} + --with-php=%{__php} \ +%endif %if ! %{javalang} --without-java \ %endif @@ -272,6 +280,10 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb %{_datadir}/%{name}/gdb %changelog +* Mon Jan 02 2017 Jitka Plesnikova - 3.0.11-1 +- Update to 3.0.11 + - Add support for PHP 7 + * Wed Oct 19 2016 Jitka Plesnikova - 3.0.10-2 - Sub-package file swig.gdb (bug #1332673) From 94e7bbcb93937ff725b82fb2bc91b7a91b03a92b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 4 Jan 2017 15:24:47 +0100 Subject: [PATCH 3/3] Disable guile tests (fail randomly) --- swig.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swig.spec b/swig.spec index cbba80a..7b4cb0a 100644 --- a/swig.spec +++ b/swig.spec @@ -2,7 +2,7 @@ %bcond_without testsuite %{!?tcl:%global tcl 1} -%{!?guile:%global guile 1} +%{!?guile:%global guile 0} %{!?lualang:%global lualang 1} %{!?phplang:%global phplang 1} %{!?rubylang:%global rubylang 1} @@ -283,6 +283,7 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb * Mon Jan 02 2017 Jitka Plesnikova - 3.0.11-1 - Update to 3.0.11 - Add support for PHP 7 + - Disable guile tests * Wed Oct 19 2016 Jitka Plesnikova - 3.0.10-2 - Sub-package file swig.gdb (bug #1332673)