From 60ff054aa6de1e5a72a47bfc6fa2997aa2fbdc63 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Tue, 31 Jan 2017 21:53:09 +0100 Subject: [PATCH] From EPEL6 to start --- .gitignore | 2 +- 0001-disable-failing-test.patch | 24 ----- 0001-fix-build-with-icu-53.1.patch | 24 ----- pyicu-1.5-fix-build-with-icu-56.1.patch | 16 --- pyicu.spec | 124 +++--------------------- sources | 2 +- 6 files changed, 13 insertions(+), 179 deletions(-) delete mode 100644 0001-disable-failing-test.patch delete mode 100644 0001-fix-build-with-icu-53.1.patch delete mode 100644 pyicu-1.5-fix-build-with-icu-56.1.patch diff --git a/.gitignore b/.gitignore index 071fed5..2ab0a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/PyICU-1.*.tar.gz +/PyICU-1.1.tar.gz diff --git a/0001-disable-failing-test.patch b/0001-disable-failing-test.patch deleted file mode 100644 index 8d40a54..0000000 --- a/0001-disable-failing-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1b99bba11f3d5f5e61a081c2fa3e9b4dc0f31522 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 27 Aug 2014 15:39:11 +0200 -Subject: [PATCH] disable failing test - ---- - test/test_Collator.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/test_Collator.py b/test/test_Collator.py -index e229af8..56c836c 100644 ---- a/test/test_Collator.py -+++ b/test/test_Collator.py -@@ -127,6 +127,7 @@ class TestCollator(TestCase): - return collator - - def testCollatorLoading(self): -+ return - - if ICU_VERSION >= '4.6': - collator = self.LoadCollatorFromRules() --- -1.9.3 - diff --git a/0001-fix-build-with-icu-53.1.patch b/0001-fix-build-with-icu-53.1.patch deleted file mode 100644 index 68ce7aa..0000000 --- a/0001-fix-build-with-icu-53.1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 761c64927512d40858bb1d8b24cc5331b95e9ceb Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 27 Aug 2014 15:27:53 +0200 -Subject: [PATCH] fix build with icu 53.1 - ---- - common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/common.h b/common.h -index 2ea50e4..88c99fb 100644 ---- a/common.h -+++ b/common.h -@@ -129,6 +129,7 @@ typedef intintobjargproc ssizessizeobjargproc; - #include - #include - #include -+#include - #include - - #define VERSION_HEX(major, minor, patch) \ --- -1.9.3 - diff --git a/pyicu-1.5-fix-build-with-icu-56.1.patch b/pyicu-1.5-fix-build-with-icu-56.1.patch deleted file mode 100644 index 749f3e1..0000000 --- a/pyicu-1.5-fix-build-with-icu-56.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur old.PyICU-1.5/layoutengine.cpp PyICU-1.5/layoutengine.cpp ---- old.PyICU-1.5/layoutengine.cpp 2012-11-23 21:39:01.000000000 +0100 -+++ PyICU-1.5/layoutengine.cpp 2015-10-29 13:44:15.610882520 +0100 -@@ -118,6 +118,12 @@ - * LEFontInstance API. - */ - -+ virtual const void *getFontTable(LETag tableTag, size_t &length) const -+ { -+ length = -1; -+ return getFontTable(tableTag); -+ } -+ - virtual const void *getFontTable(LETag tag) const - { - #if PY_MAJOR_VERSION >= 3 diff --git a/pyicu.spec b/pyicu.spec index 872ec9b..687954c 100644 --- a/pyicu.spec +++ b/pyicu.spec @@ -3,13 +3,14 @@ %endif %define realname PyICU Name: pyicu -Version: 1.5 -Release: 19%{?dist} +Version: 1.1 +Release: 2%{?dist} Summary: Python extension wrapping IBM's ICU C++ libraries Group: Development/Tools License: MIT URL: http://pyicu.osafoundation.org/ Source0: http://pypi.python.org/packages/source/P/%{realname}/%{realname}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel BuildRequires: python-setuptools @@ -17,10 +18,6 @@ BuildRequires: libicu BuildRequires: libicu-devel BuildRequires: gcc-c++ -Patch0: 0001-fix-build-with-icu-53.1.patch -Patch1: 0001-disable-failing-test.patch -Patch2: pyicu-1.5-fix-build-with-icu-56.1.patch - %description PyICU is Python extension wrapping IBM's International Components for Unicode C++ library (ICU). ICU is a mature, widely used set of @@ -28,132 +25,33 @@ C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Javasoftware. -%package -n python3-pyicu -Summary: Python3 extension wrapping IBM's ICU C++ libraries -%description -n python3-pyicu -%{summary}. - %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -rm -rf %{py3dir} -cp -a . %{py3dir} - %build - -%{__python2} setup.py build - -pushd %{py3dir} -%{__python3} setup.py build -popd - +%{__python} setup.py build # we don't want to provide private python extension libs %{?filter_setup: -%filter_provides_in %{python2_sitearch}/.*\.so$ %{python3_sitearch}/.*\.so$ +%filter_provides_in %{python_sitearch}/.*\.so$ %filter_setup } %check -%{__python2} setup.py test - -pushd %{py3dir} -%{__python3} setup.py test -popd +%{__python} setup.py test %install -%{__python2} setup.py install --skip-build --root %{buildroot} - -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd - +rm -rf %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} # Remove tests -rm -rf %{buildroot}%{python2_sitearch}/tests %{buildroot}%{python3_sitearch}/tests +rm -rf %{buildroot}%{python_sitearch}/tests %files %defattr(-,root,root,-) %doc LICENSE README CHANGES CREDITS -%{python2_sitearch}/* - -%files -n python3-pyicu -%doc LICENSE -%{python3_sitearch}/* +%{python_sitearch}/*.* +%{python_sitearch}/%{realname}-%{version}-py?.?.egg-info/*.* %changelog -* Tue Jan 31 2017 Benjamin Lefoul - 1.5-19 -- Python2 for RHEL7 - -* Mon Dec 19 2016 Miro Hrončok - 1.5-18 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 1.5-17 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Apr 15 2016 David Tardon - 1.5-16 -- rebuild for ICU 57.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Oct 29 2015 Eike Rathke - 1.5-13 -- fix build with ICU 56.1 - -* Wed Oct 28 2015 David Tardon - 1.5-12 -- rebuild for ICU 56.1 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.5-10 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 David Tardon - 1.5-9 -- rebuild for ICU 54.1 - -* Tue Aug 26 2014 David Tardon - 1.5-8 -- rebuild for ICU 53.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 16 2014 Bastien Nocera 1.5-6 -- Build Python3 version as well (#917449) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Feb 14 2014 Parag Nemade - 1.5-4 -- Rebuild for icu 52 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 22 2013 David Tardon - 1.5-2 -- rebuild for ICU ABI break - -* Fri Feb 08 2013 Jon Ciesla - 1.5-1 -- libicu rebuild. -- Update to 1.5, 1.4 doesn't build on new libicu. - -* Wed Aug 22 2012 Tom Callaway - 1.4-1 -- update to 1.4 - -* Sat Jul 21 2012 Fedora Release Engineering - 1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Oct 11 2011 Peter Robinson - 1.2-1 -- New upstream 1.2 release - * Sun May 08 2011 Prabin Kumar Datta - 1.1-2 - added CHANGES CREDITS under doc section - updated URL diff --git a/sources b/sources index af2b003..2da3de7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -099a3e6e3b8c2b9ab3bf6dde911db624 PyICU-1.5.tar.gz +70cbb5b43c3e6939b74c3f1b27e47aae PyICU-1.1.tar.gz