Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
388e4d8e28 | ||
|
69bd94a154 | ||
|
c473c6cad0 | ||
|
8a587e6b11 | ||
|
d120b3dac0 | ||
|
b06aae2d7c | ||
|
030a9a83a3 | ||
|
995d45bd58 | ||
|
832863e3eb | ||
|
60ff054aa6 | ||
|
e0f635b9c2 |
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,5 +1 @@
|
|||||||
/PyICU-1.*.tar.gz
|
/PyICU-1.1.tar.gz
|
||||||
/PyICU-2.0.tar.gz
|
|
||||||
/PyICU-2.0.2.tar.gz
|
|
||||||
/PyICU-2.0.3.tar.gz
|
|
||||||
/PyICU-2.2.tar.gz
|
|
||||||
|
@ -1,25 +1,24 @@
|
|||||||
From 777dcdf87976160e9a6639b0b1cc506192bc911b Mon Sep 17 00:00:00 2001
|
From 1b99bba11f3d5f5e61a081c2fa3e9b4dc0f31522 Mon Sep 17 00:00:00 2001
|
||||||
From: Pete Walter <pwalter@fedoraproject.org>
|
From: David Tardon <dtardon@redhat.com>
|
||||||
Date: Thu, 30 Nov 2017 22:35:32 +0000
|
Date: Wed, 27 Aug 2014 15:39:11 +0200
|
||||||
Subject: [PATCH] disable failing test
|
Subject: [PATCH] disable failing test
|
||||||
|
|
||||||
---
|
---
|
||||||
test/test_Script.py | 2 ++
|
test/test_Collator.py | 1 +
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/test/test_Script.py b/test/test_Script.py
|
diff --git a/test/test_Collator.py b/test/test_Collator.py
|
||||||
index 90a1c81..054058c 100644
|
index e229af8..56c836c 100644
|
||||||
--- a/test/test_Script.py
|
--- a/test/test_Collator.py
|
||||||
+++ b/test/test_Script.py
|
+++ b/test/test_Collator.py
|
||||||
@@ -34,6 +34,8 @@ def is_unicode_32bit():
|
@@ -127,6 +127,7 @@ class TestCollator(TestCase):
|
||||||
class TestScript(TestCase):
|
return collator
|
||||||
|
|
||||||
def testSurrogatePairs(self):
|
def testCollatorLoading(self):
|
||||||
+ return
|
+ return
|
||||||
+
|
|
||||||
pairs = u'a\u0950\u4e2d\U00029efa'
|
if ICU_VERSION >= '4.6':
|
||||||
unicode_32bit = is_unicode_32bit()
|
collator = self.LoadCollatorFromRules()
|
||||||
names = [Script.getScript(cp).getShortName() for cp in pairs]
|
--
|
||||||
--
|
1.9.3
|
||||||
2.14.3
|
|
||||||
|
|
||||||
|
24
0001-fix-build-with-icu-53.1.patch
Normal file
24
0001-fix-build-with-icu-53.1.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From 761c64927512d40858bb1d8b24cc5331b95e9ceb Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Tardon <dtardon@redhat.com>
|
||||||
|
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 <unicode/regex.h>
|
||||||
|
#include <unicode/normlzr.h>
|
||||||
|
#include <unicode/search.h>
|
||||||
|
+#include <unicode/sortkey.h>
|
||||||
|
#include <unicode/stsearch.h>
|
||||||
|
|
||||||
|
#define VERSION_HEX(major, minor, patch) \
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
16
pyicu-1.5-fix-build-with-icu-56.1.patch
Normal file
16
pyicu-1.5-fix-build-with-icu-56.1.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
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
|
126
pyicu.spec
126
pyicu.spec
@ -1,21 +1,27 @@
|
|||||||
|
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
|
||||||
|
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||||
|
%endif
|
||||||
%define realname PyICU
|
%define realname PyICU
|
||||||
Name: pyicu
|
Name: pyicu
|
||||||
Version: 2.2
|
Version: 1.5
|
||||||
Release: 4%{?dist}
|
Release: 26%{?dist}
|
||||||
Summary: Python extension wrapping IBM's ICU C++ libraries
|
Summary: Python extension wrapping IBM's ICU C++ libraries
|
||||||
|
Group: Development/Tools
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://pyicu.osafoundation.org/
|
URL: http://pyicu.osafoundation.org/
|
||||||
Source0: https://files.pythonhosted.org/packages/source/P/%{realname}/%{realname}-%{version}.tar.gz
|
Source0: http://pypi.python.org/packages/source/P/%{realname}/%{realname}-%{version}.tar.gz
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
|
BuildRequires: python2-devel
|
||||||
|
BuildRequires: python-setuptools
|
||||||
|
BuildRequires: libicu
|
||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: python3-pytest
|
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
BuildRequires: python3-six
|
|
||||||
|
|
||||||
|
Patch0: 0001-fix-build-with-icu-53.1.patch
|
||||||
Patch1: 0001-disable-failing-test.patch
|
Patch1: 0001-disable-failing-test.patch
|
||||||
|
Patch2: pyicu-1.5-fix-build-with-icu-56.1.patch
|
||||||
|
|
||||||
%global _description\
|
%global _description\
|
||||||
PyICU is Python extension wrapping IBM's International Components\
|
PyICU is Python extension wrapping IBM's International Components\
|
||||||
@ -26,85 +32,77 @@ the same results on all platforms and between C/C++ and Javasoftware.
|
|||||||
|
|
||||||
%description %_description
|
%description %_description
|
||||||
|
|
||||||
%package -n python3-pyicu
|
%package -n python2-pyicu
|
||||||
Summary: Python 3 extension wrapping IBM's ICU C++ libraries
|
Summary: %summary
|
||||||
|
%{?python_provide:%python_provide python2-pyicu}
|
||||||
|
# Remove before F30
|
||||||
|
Provides: pyicu = %{version}-%{release}
|
||||||
|
Provides: pyicu%{?_isa} = %{version}-%{release}
|
||||||
|
Obsoletes: pyicu < %{version}-%{release}
|
||||||
|
|
||||||
%description -n python3-pyicu %_description
|
%description -n python2-pyicu %_description
|
||||||
|
|
||||||
|
%package -n python%{python3_pkgversion}-pyicu
|
||||||
|
Summary: Python3 extension wrapping IBM's ICU C++ libraries
|
||||||
|
%description -n python%{python3_pkgversion}-pyicu
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{realname}-%{version}
|
%setup -q -n %{realname}-%{version}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
|
rm -rf %{py3dir}
|
||||||
|
cp -a . %{py3dir}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
|
||||||
|
%{__python2} setup.py build
|
||||||
|
|
||||||
|
pushd %{py3dir}
|
||||||
|
%{__python3} setup.py build
|
||||||
|
popd
|
||||||
|
|
||||||
# we don't want to provide private python extension libs
|
# we don't want to provide private python extension libs
|
||||||
%{?filter_setup:
|
%{?filter_setup:
|
||||||
%filter_provides_in %{python3_sitearch}/.*\.so$
|
%filter_provides_in %{python2_sitearch}/.*\.so$ %{python3_sitearch}/.*\.so$
|
||||||
%filter_setup
|
%filter_setup
|
||||||
}
|
}
|
||||||
|
|
||||||
|
%check
|
||||||
|
%{__python2} setup.py test
|
||||||
|
|
||||||
|
pushd %{py3dir}
|
||||||
|
%{__python3} setup.py test
|
||||||
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%py3_install
|
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||||
|
|
||||||
|
pushd %{py3dir}
|
||||||
|
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||||
|
popd
|
||||||
|
|
||||||
# Remove tests
|
# Remove tests
|
||||||
rm -rf %{buildroot}%{python3_sitearch}/tests
|
rm -rf %{buildroot}%{python2_sitearch}/tests %{buildroot}%{python3_sitearch}/tests
|
||||||
|
|
||||||
%check
|
%files -n python2-pyicu
|
||||||
%{__python3} setup.py test
|
%defattr(-,root,root,-)
|
||||||
|
%doc LICENSE README CHANGES CREDITS
|
||||||
|
%{python2_sitearch}/*
|
||||||
|
|
||||||
%files -n python3-pyicu
|
%files -n python%{python3_pkgversion}-pyicu
|
||||||
%doc LICENSE
|
%doc LICENSE
|
||||||
%{python3_sitearch}/PyICU*
|
%{python3_sitearch}/*
|
||||||
%{python3_sitearch}/__pycache__/PyICU*
|
|
||||||
%{python3_sitearch}/icu/
|
|
||||||
%{python3_sitearch}/_icu*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
|
* Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 1.5-26
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt to change main python from 3.4 to 3.6
|
||||||
|
|
||||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-3
|
* Fri Dec 28 2018 Robert Scheck <robert@fedoraproject.org> - 1.5-25
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Use %%{python3_pkgversion} macro
|
||||||
|
|
||||||
* Mon Jan 28 2019 Miro Hrončok <mhroncok@redhat.com> - 2.2-2
|
|
||||||
- Subpackage python2-pyicu has been removed
|
|
||||||
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
|
||||||
|
|
||||||
* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 2.2-1
|
|
||||||
- Update to 2.2
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.3-1
|
|
||||||
- Update to 2.0.3
|
|
||||||
|
|
||||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.2-5
|
|
||||||
- Rebuild for ICU 62
|
|
||||||
|
|
||||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-4
|
|
||||||
- Rebuilt for Python 3.7
|
|
||||||
|
|
||||||
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.2-3
|
|
||||||
- Rebuild for ICU 61.1
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 23 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.2-1
|
|
||||||
- Update to 2.0.2
|
|
||||||
|
|
||||||
* Tue Jan 09 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0-1
|
|
||||||
- Update to 2.0
|
|
||||||
|
|
||||||
* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 1.9.8-1
|
|
||||||
- Update to 1.9.8
|
|
||||||
|
|
||||||
* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 1.5-25
|
|
||||||
- Rebuild for ICU 60.1
|
|
||||||
|
|
||||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.5-24
|
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.5-24
|
||||||
- Add Provides for the old name without %%_isa
|
- Add Provides for the old name without %%_isa
|
||||||
|
Loading…
Reference in New Issue
Block a user