besser82 pushed to swig (f20). "Update to 2.0.12"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 2 08:48:57 UTC 2015


>From e983b631917ac1b1b20ee05d6b547e14b4185959 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Thu, 29 Aug 2013 10:10:58 +0200
Subject: Fixed BZ#994120


diff --git a/swig.spec b/swig.spec
index dccf7db..2fcdc31 100644
--- a/swig.spec
+++ b/swig.spec
@@ -10,7 +10,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
 Version: 2.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+ and BSD
 Group:   Development/Tools
 URL:     http://swig.sourceforge.net/
@@ -60,12 +60,6 @@ This package contains documentation for SWIG and useful examples
 %patch1 -p1 -b .setools
 %patch2 -p1 -b .x390
 
-# as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2
-# (specific req/prov filtering). Before you remove this hack make sure you don't
-# reintroduce https://bugzilla.redhat.com/show_bug.cgi?id=489421
-%global __provides_exclude_from %{_docdir}/%{name}-doc-%{version}
-%global __requires_exclude_from %{_docdir}/%{name}-doc-%{version}
-
 for all in CHANGES README; do
     iconv -f ISO88591 -t UTF8 < $all > $all.new
     touch -r $all $all.new
@@ -128,6 +122,11 @@ gzip %{buildroot}%{_mandir}/man1/$(basename %{SOURCE1})
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Wed Aug 21 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.10-4
+- Fixed BZ#994120
+  - Remove the req/prov filtering from version docdir (BZ#489421), because
+    it is not needed
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-- 
cgit v0.10.2


>From 2ba2aaa0d8fdbe49e6a7038febdff0953cf2e64d Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Mon, 30 Sep 2013 13:31:50 +0200
Subject: 2.0.11 bump


diff --git a/.gitignore b/.gitignore
index 116ef5a..8299dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ swig-2.0.0.tar.gz
 /swig-2.0.8.tar.gz
 /swig-2.0.9.tar.gz
 /swig-2.0.10.tar.gz
+/swig-2.0.11.tar.gz
diff --git a/sources b/sources
index 7f6b56f..63a8121 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d5e7ad05b4a404e5e85db9befb70c9a  swig-2.0.10.tar.gz
+291ba57c0acd218da0b0916c280dcbae  swig-2.0.11.tar.gz
diff --git a/swig.spec b/swig.spec
index 2fcdc31..b6cd0da 100644
--- a/swig.spec
+++ b/swig.spec
@@ -9,8 +9,8 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
-Version: 2.0.10
-Release: 4%{?dist}
+Version: 2.0.11
+Release: 1%{?dist}
 License: GPLv3+ and BSD
 Group:   Development/Tools
 URL:     http://swig.sourceforge.net/
@@ -122,6 +122,9 @@ gzip %{buildroot}%{_mandir}/man1/$(basename %{SOURCE1})
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Mon Sep 16 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.11-1
+- Update to 2.0.11
+
 * Wed Aug 21 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.10-4
 - Fixed BZ#994120
   - Remove the req/prov filtering from version docdir (BZ#489421), because
-- 
cgit v0.10.2


>From 06c4d674de807b848d9d0eda20de9320c38d1b3e Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Wed, 9 Oct 2013 14:43:39 +0200
Subject: Use bconds for enabling testsuite


diff --git a/swig.spec b/swig.spec
index b6cd0da..90bf0eb 100644
--- a/swig.spec
+++ b/swig.spec
@@ -1,3 +1,6 @@
+# We can skip tests
+%bcond_without testsuite
+
 %{!?tcl:%define tcl 1}
 %{!?guile:%define guile 1}
 
@@ -10,7 +13,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
 Version: 2.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and BSD
 Group:   Development/Tools
 URL:     http://swig.sourceforge.net/
@@ -80,8 +83,10 @@ done
 ;
 make %{?_smp_mflags}
 
+%if %{with testsuite}
 # Test suite
 make check
+%endif
 
 %install
 # Remove all arch dependent files in Examples/ created during tests
@@ -122,6 +127,9 @@ gzip %{buildroot}%{_mandir}/man1/$(basename %{SOURCE1})
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Wed Oct 09 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.11-2
+- Use bconds for enabling testsuite
+
 * Mon Sep 16 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.11-1
 - Update to 2.0.11
 
-- 
cgit v0.10.2


>From fa769de6ddc00fb673159e35c107235b07782af6 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Fri, 28 Feb 2014 21:01:46 -0700
Subject: Update to 2.0.12


diff --git a/.gitignore b/.gitignore
index 8299dbf..7ed62aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ swig-2.0.0.tar.gz
 /swig-2.0.9.tar.gz
 /swig-2.0.10.tar.gz
 /swig-2.0.11.tar.gz
+/swig-2.0.12.tar.gz
diff --git a/sources b/sources
index 63a8121..3260489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-291ba57c0acd218da0b0916c280dcbae  swig-2.0.11.tar.gz
+c3fb0b2d710cc82ed0154b91e43085a4  swig-2.0.12.tar.gz
diff --git a/swig.spec b/swig.spec
index 90bf0eb..c563746 100644
--- a/swig.spec
+++ b/swig.spec
@@ -12,8 +12,8 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
-Version: 2.0.11
-Release: 2%{?dist}
+Version: 2.0.12
+Release: 1%{?dist}
 License: GPLv3+ and BSD
 Group:   Development/Tools
 URL:     http://swig.sourceforge.net/
@@ -127,6 +127,9 @@ gzip %{buildroot}%{_mandir}/man1/$(basename %{SOURCE1})
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Fri Feb 28 2014 Orion Poplawski <orion at cora.nwra.com> - 2.0.12-1
+- Update to 2.0.12
+
 * Wed Oct 09 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.11-2
 - Use bconds for enabling testsuite
 
-- 
cgit v0.10.2


>From b1604a3cc8b0df5b9f2d518c0492ab83ec7ba2a9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Sat, 1 Mar 2014 10:13:24 -0700
Subject: A patch to fix guile locale


diff --git a/swig-guile.patch b/swig-guile.patch
new file mode 100644
index 0000000..3b9cdf4
--- /dev/null
+++ b/swig-guile.patch
@@ -0,0 +1,10 @@
+diff -up swig-2.0.12/Examples/test-suite/guile/li_std_string_runme.scm.guile swig-2.0.12/Examples/test-suite/guile/li_std_string_runme.scm
+--- swig-2.0.12/Examples/test-suite/guile/li_std_string_runme.scm.guile	2014-02-09 15:09:05.000000000 -0700
++++ swig-2.0.12/Examples/test-suite/guile/li_std_string_runme.scm	2014-03-01 08:33:41.343216202 -0700
+@@ -5,5 +5,5 @@
+ ; Note: when working with non-ascii strings in guile 2
+ ;       locale must be set explicitly
+ ;       The setlocale call below takes care of that
+-(setlocale LC_ALL "")
++(setlocale LC_ALL "en_US.utf-8")
+ (load "../schemerunme/li_std_string.scm")
diff --git a/swig.spec b/swig.spec
index c563746..1f54f18 100644
--- a/swig.spec
+++ b/swig.spec
@@ -19,6 +19,9 @@ Group:   Development/Tools
 URL:     http://swig.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
 Source1: swig.1
+# Upstream patch to fix guile locale
+# https://github.com/swig/swig/pull/139/files
+Patch0:  swig-guile.patch
 Patch1:  swig207-setools.patch
 # Fix the failure on arch x390 during testing
 Patch2:  swig-2.0.10-Fix-x390-build.patch
@@ -60,6 +63,7 @@ This package contains documentation for SWIG and useful examples
 %prep
 %setup -q -n swig-%{version}
 
+%patch0 -p1 -b .guile
 %patch1 -p1 -b .setools
 %patch2 -p1 -b .x390
 
@@ -129,6 +133,7 @@ gzip %{buildroot}%{_mandir}/man1/$(basename %{SOURCE1})
 %changelog
 * Fri Feb 28 2014 Orion Poplawski <orion at cora.nwra.com> - 2.0.12-1
 - Update to 2.0.12
+- A patch to fix guile locale
 
 * Wed Oct 09 2013 Jitka Plesnikova <jplesnik at redhat.com> - 2.0.11-2
 - Use bconds for enabling testsuite
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/swig.git/commit/?h=f20&id=fa52dc14fa9d05f40f15f9888251b87567eaea51


More information about the scm-commits mailing list