Architecture specific change in rpms/python-MDAnalysis.git
by githook-noreply＠fedoraproject.org
The package rpms/python-MDAnalysis.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-MDAnalysis.git/commit/?id=....
Change:
+ExcludeArch: i686 armv7hl s390x ppc64le aarch64
Thanks.
Full change:
============
commit 6f231a2656f9ad4c15676a05638c82aa2d02ff75
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Wed Sep 4 10:39:31 2019 -0600
Version bump to 0.20.1
diff --git a/.gitignore b/.gitignore
index 60277bb..c95755f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@
/MDAnalysis-0.18.0.tar.gz
/MDAnalysisTests-0.18.0.tar.gz
/pypidoc.zip
+/MDAnalysis-0.20.0.tar.gz
+/MDAnalysisTests-0.20.0.tar.gz
+/MDAnalysis-0.20.1.tar.gz
+/MDAnalysisTests-0.20.1.tar.gz
diff --git a/python-MDAnalysis-32bit.patch b/python-MDAnalysis-32bit.patch
index b8845eb..c6b42f6 100644
--- a/python-MDAnalysis-32bit.patch
+++ b/python-MDAnalysis-32bit.patch
@@ -39,8 +39,8 @@ diff -up MDAnalysis-0.18.0/MDAnalysis/analysis/encore/clustering/include/ap.h.32
int sqmIndex(int, int, int);
@@ -27,4 +29,4 @@ float min(float*, int);
+ #endif
- float max(float*, int);
-int CAffinityPropagation(float*, int, float, int, int, int, long*);
+int CAffinityPropagation(float*, int, float, int, int, int, int64_t*);
@@ -64,21 +64,9 @@ diff -up MDAnalysis-0.18.0/MDAnalysis/analysis/encore/clustering/src/ap.c.32bit
/* n: number of elements
s: similarity matrix
-diff -up MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx.32bit MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx
---- MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx.32bit 2018-04-22 19:06:55.000000000 +0200
-+++ MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx 2018-07-02 15:41:51.359803083 +0200
-@@ -653,7 +653,7 @@ cdef class DCDFile:
-
- cdef np.ndarray[np.int64_t, ndim=1] c_indices
- if indices is None:
-- c_indices = np.arange(self.natoms)
-+ c_indices = np.arange(self.natoms, dtype=np.int64)
- natoms = self.natoms
- else:
- natoms = len(indices)
diff -up MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py.32bit MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py
---- MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py.32bit 2018-04-15 21:56:44.000000000 +0200
-+++ MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py 2018-07-02 15:41:51.360803093 +0200
+--- MDAnalysis-0.20.0/MDAnalysisTests-0.20.0/MDAnalysisTests/analysis/test_encore.py.32bit 2018-04-15 21:56:44.000000000 +0200
++++ MDAnalysis-0.20.0/MDAnalysisTests-0.20.0/MDAnalysisTests/analysis/test_encore.py 2018-07-02 15:41:51.360803093 +0200
@@ -262,7 +262,7 @@ inconsistent results")
clustering_method=encore.AffinityPropagationNative(preference = -3.0))
result_value = results[0,1]
diff --git a/python-MDAnalysis-duecredit.patch b/python-MDAnalysis-duecredit.patch
deleted file mode 100644
index 0604579..0000000
--- a/python-MDAnalysis-duecredit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py.orig MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py
---- MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py.orig 2018-04-15 21:57:08.000000001 +0200
-+++ MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py 2018-07-02 16:42:56.949956938 +0200
-@@ -28,6 +28,10 @@ import pytest
- # to work; duecredit must also be installed)
- import MDAnalysis as mda
-
-+# duecredit itself is not needed in the name space but this is a
-+# convenient way to skip all tests if duecredit is not installed
-+# (see https://github.com/MDAnalysis/mdanalysis/issues/1906)
-+pytest.importorskip('duecredit')
-
- @pytest.mark.skipif((os.environ.get('DUECREDIT_ENABLE', 'yes').lower()
- in ('no', '0', 'false')),
diff --git a/python-MDAnalysis.spec b/python-MDAnalysis.spec
index c43571c..28b64a7 100644
--- a/python-MDAnalysis.spec
+++ b/python-MDAnalysis.spec
@@ -2,8 +2,8 @@
%bcond_without check
Name: python-%{pname}
-Version: 0.18.0
-Release: 4%{?dist}
+Version: 0.20.1
+Release: 1%{?dist}
Summary: Analyze and manipulate molecular dynamics trajectories
License: GPLv2+ and BSD and MIT and CC-BY-ND
# BSD:
@@ -23,14 +23,10 @@ Source1: https://files.pythonhosted.org/packages/source/M/%{pname}Tests/%{pname}
Source2: https://github.com/%{pname}/mdanalysis/files/1935925/pypidoc.zip
# force rebuild of cythonized intermediate sources
Patch1: %{name}-cython.patch
-# fix some failing tests on 32bit arches
-# https://github.com/MDAnalysis/mdanalysis/issues/1362
-Patch2: %{name}-32bit.patch
-Patch3: %{name}-flags.patch
-# https://github.com/MDAnalysis/mdanalysis/issues/1906
-# and duecredit is not packaged in Fedora
-Patch4: %{name}-duecredit.patch
-
+Patch2: %{name}-flags.patch
+# 32-bit archs: https://github.com/MDAnalysis/mdanalysis/issues/2342
+# ppc64le, aarch64: https://github.com/MDAnalysis/mdanalysis/issues/2343
+ExcludeArch: i686 armv7hl s390x ppc64le aarch64
# we don't want to provide private python extension libs in python3 dirs
# there are actually called lib...so, so this is needed
%global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$
@@ -88,6 +84,7 @@ BuildRequires: python3-pytest-xdist
BuildRequires: python3-scikit-learn
BuildRequires: python3-tempdir
%endif
+BuildRequires: gcc-c++
# MDAnalysis/coordinates/xdrfile/src
Provides: bundled(xdrfile) = 0.7.7
%{?python_provide:%python_provide python3-%{pname}}
@@ -110,9 +107,7 @@ This package contains the documentation
%prep
%setup -q -n %{pname}-%{version} -a 1
%patch1 -p1 -b .cython
-%patch2 -p1 -b .32bit
-%patch3 -p1 -b .flags
-%patch4 -p1 -b .due
+%patch2 -p1 -b .flags
# force rebuild of Egg Metadata
rm -r %{pname}.egg-info
rm -r %{pname}Tests-%{version}/%{pname}Tests.egg-info
@@ -187,6 +182,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitearch} \
%doc doc/html/*
%changelog
+* Wed Sep 11 2019 Christoph Junghans <junghans(a)votca.org> - 0.20.1-1
+- Version bump to 0.20.1
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.18.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index a42acca..f37a71b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (MDAnalysis-0.18.0.tar.gz) = b235471c04ab2e117fe25e972d88a6245b1641f96d30eafd2f68949c8af8c1360eed49b1ec9960d8c386c0bbca8b3749cec322eb19f9975f15225983af0f5819
-SHA512 (MDAnalysisTests-0.18.0.tar.gz) = d3945046c7949a7120273dc9bc707f52e284438fdf4d831be320401696f545e490e820c552188d6718ff78476a662d3510b2f4ab378e978206996d652a4cb683
-SHA512 (pypidoc.zip) = 574506cad8f3935e6d5bf7b2bd4e9a7d298a8c29f35e70c3ac4d51c9f33c073f2ad8fa824f2d62121b8745318c967b1cef06965c155a66cece9f37e0b662abc5
+SHA512 (MDAnalysis-0.20.1.tar.gz) = 9b3e5b5e600a9250923952d329052fbefa699a3b24acfc34b6157714e3797641c0de229be5322e8c954d2a45fb5556e0fe30a60958022c24199173d3345a2152
+SHA512 (MDAnalysisTests-0.20.1.tar.gz) = afdd1f063a600075dd8554a37d48acaccd9540fdfc5909d57bcf1be46acbadb9b376c2a57b2b2877ee5bad43f4bb8e53df3f9d8a3492b133e954335fa4527c79
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/hypre.git
by githook-noreply＠fedoraproject.org
The package rpms/hypre.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/hypre.git/commit/?id=5325bd34bc1c....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit 5325bd34bc1c698a34a4456e08e1ab6433e14101
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sat Sep 7 16:28:40 2019 -0600
Drop old el6 conditionals
diff --git a/hypre.spec b/hypre.spec
index e9d1b50..495be27 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -2,20 +2,8 @@
# Copyright (c) 2018 Dave Love, University of Manchester
# MIT licence, per Fedora policy
-%if 0%{?el6}
-%ifarch ppc64
-%bcond_with mpich
-%else
-%bcond_without mpich
-%endif
-%else
-%bcond_without mpich
-%endif
-
-%if 0%{?fedora}
%bcond_without openmpi
%bcond_without mpich
-%endif
%bcond_with check
@@ -161,14 +149,9 @@ cp -a src mpich
%global lalibs --with-blas-libs=openblas --with-lapack-libs=openblas \\\
--with-blas-lib-dirs=%_libdir --with-lapack-lib-dirs=%_libdir
%else
-%if 0%{?el6}
-%global lalibs --with-blas-libs=-f77blas --with-lapack-libs=llapack \\\
- --with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas
-%else
%global lalibs --with-blas-libs=satlas --with-lapack-libs=satlas \\\
--with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas
%endif
-%endif
pushd src
# -O3 seems like a good idea for vectorization, at least. We need LIBS to
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/erlang.git
by githook-noreply＠fedoraproject.org
The package rpms/erlang.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/erlang.git/commit/?id=6d1b9b2ecad....
Change:
+ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit 6d1b9b2ecad9542784ada2918476f9fae2018bd8
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Wed Sep 11 15:07:36 2019 +0200
Disable arches with a broken builders
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/erlang.spec b/erlang.spec
index 45680e7..948638e 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -66,7 +66,7 @@
Name: erlang
Version: 22.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: General-purpose programming language and runtime environment
License: ASL 2.0
@@ -82,6 +82,7 @@ Source8: epmd@.socket
# These files are intended for Fedora package maintainers only.
Source998: otp-make-subpackages.py
Source999: otp-get-patches.sh
+ExcludeArch: s390 s390x
# For the source of the Fedora specific patches, see the respective
# branch at https://github.com/lemenkov/otp
@@ -360,7 +361,7 @@ Requires: lksctp-tools
Provides: erlang(erl_drv_version) = 3.3
# See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version).
#Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt)
-Provides: erlang(erl_nif_version) = 2.14
+Provides: erlang(erl_nif_version) = 2.15
Provides: bundled(pcre) = 8.33
Obsoletes: erlang-appmon
Obsoletes: erlang-docbuilder
@@ -1936,6 +1937,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%changelog
+* Wed Sep 11 2019 Peter Lemenkov <lemenkov(a)gmail.com> - 22.0.7-2
+- Disable arches with a broken builders
+- Expose a correct NIF API version
+
* Tue Jul 30 2019 Peter Lemenkov <lemenkov(a)gmail.com> - 22.0.7-1
- Ver. 22.0.7
- Removed otp_mibs application
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/erlang.git
by githook-noreply＠fedoraproject.org
The package rpms/erlang.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/erlang.git/commit/?id=6d1b9b2ecad....
Change:
+ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit 6d1b9b2ecad9542784ada2918476f9fae2018bd8
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Wed Sep 11 15:07:36 2019 +0200
Disable arches with a broken builders
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/erlang.spec b/erlang.spec
index 45680e7..948638e 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -66,7 +66,7 @@
Name: erlang
Version: 22.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: General-purpose programming language and runtime environment
License: ASL 2.0
@@ -82,6 +82,7 @@ Source8: epmd@.socket
# These files are intended for Fedora package maintainers only.
Source998: otp-make-subpackages.py
Source999: otp-get-patches.sh
+ExcludeArch: s390 s390x
# For the source of the Fedora specific patches, see the respective
# branch at https://github.com/lemenkov/otp
@@ -360,7 +361,7 @@ Requires: lksctp-tools
Provides: erlang(erl_drv_version) = 3.3
# See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version).
#Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt)
-Provides: erlang(erl_nif_version) = 2.14
+Provides: erlang(erl_nif_version) = 2.15
Provides: bundled(pcre) = 8.33
Obsoletes: erlang-appmon
Obsoletes: erlang-docbuilder
@@ -1936,6 +1937,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%changelog
+* Wed Sep 11 2019 Peter Lemenkov <lemenkov(a)gmail.com> - 22.0.7-2
+- Disable arches with a broken builders
+- Expose a correct NIF API version
+
* Tue Jul 30 2019 Peter Lemenkov <lemenkov(a)gmail.com> - 22.0.7-1
- Ver. 22.0.7
- Removed otp_mibs application
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/perl.git
by githook-noreply＠fedoraproject.org
The package rpms/perl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/perl.git/commit/?id=f343fa2b53bb3....
Change:
+%ifarch %{multilib_64_archs}
Thanks.
Full change:
============
commit d9b784b6569c96de17f5069333707964fa914cd7
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 14:34:25 2019 +0200
Correct an RT number for perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
diff --git a/perl.spec b/perl.spec
index 48398b7..3bcbd33 100644
--- a/perl.spec
+++ b/perl.spec
@@ -366,7 +366,7 @@ Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
# fixed after 5.31.3
Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
-# Fix a memory leak when matching a UTF-8 regular expression, RT#134329,
+# Fix a memory leak when matching a UTF-8 regular expression, RT#134390,
# fixed after 5.31.3
Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
@@ -3107,7 +3107,7 @@ perl -x patchlevel.h \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
- 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
+ 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134390)' \
'Fedora Patch102: Fix a detection for futimes (RT#134432)' \
'Fedora Patch103: Fix a detection for futimes (RT#134432)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
@@ -5401,7 +5401,7 @@ popd
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-435
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
-- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
+- Fix a memory leak when matching a UTF-8 regular expression (RT#134390)
- Fix a detection for futimes (RT#134432)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-434
commit 10bdc93169f0d52e722bd8880373389a1d6b4e7b
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 12:04:46 2019 +0200
Fix a detection for futimes
diff --git a/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch b/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
new file mode 100644
index 0000000..0ceb4e0
--- /dev/null
+++ b/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
@@ -0,0 +1,30 @@
+From 425077e4b85509df2907be6c103d54c0687c7647 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer(a)redhat.com>
+Date: Mon, 9 Sep 2019 19:35:47 +0200
+Subject: [PATCH 1/2] Configure: Include <stdlib.h> in futimes check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Needed for the exit function.
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ Configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Configure b/Configure
+index 818deb8378..7aa03d6aed 100755
+--- a/Configure
++++ b/Configure
+@@ -14091,6 +14091,7 @@ $cat >try.c <<EOCP
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+
+ int main ()
+ {
+--
+2.21.0
+
diff --git a/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch b/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
new file mode 100644
index 0000000..e213e5e
--- /dev/null
+++ b/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
@@ -0,0 +1,28 @@
+From da006e4432402cea01c9018743467314377e3c1e Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony(a)develop-help.com>
+Date: Tue, 10 Sep 2019 10:44:10 +1000
+Subject: [PATCH 2/2] Florian Weimer is now a perl author
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ AUTHORS | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/AUTHORS b/AUTHORS
+index a2b6d8c15a..a554cfc045 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -418,6 +418,7 @@ Fergal Daly <fergal(a)esatclear.ie>
+ Fingle Nark <finglenark(a)gmail.com>
+ Florent Guillaume
+ Florian Ragwitz <rafl(a)debian.org>
++Florian Weimer <fweimer(a)redhat.com>
+ Franois Dsarmnien <desar(a)club-internet.fr>
+ Franois Perrad <francois.perrad(a)gadz.org>
+ Frank Crawford
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index e734800..48398b7 100644
--- a/perl.spec
+++ b/perl.spec
@@ -370,6 +370,10 @@ Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
# fixed after 5.31.3
Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
+# Fix a detection for futimes, RT#134432, fixed after 5.31.3
+Patch102: perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
+Patch103: perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3017,6 +3021,8 @@ Perl extension for Version Objects
%patch99 -p1
%patch100 -p1
%patch101 -p1
+%patch102 -p1
+%patch103 -p1
%patch200 -p1
%patch201 -p1
@@ -3102,6 +3108,8 @@ perl -x patchlevel.h \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
+ 'Fedora Patch102: Fix a detection for futimes (RT#134432)' \
+ 'Fedora Patch103: Fix a detection for futimes (RT#134432)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5394,6 +5402,7 @@ popd
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
+- Fix a detection for futimes (RT#134432)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-434
- Fix propagating non-string variables in an exception value (RT#134291)
commit d0a22986c5c6e5152feb90b995829b262dbbf2ff
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 11:59:33 2019 +0200
Fix a memory leak when matching a UTF-8 regular expression
diff --git a/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch b/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
new file mode 100644
index 0000000..2790944
--- /dev/null
+++ b/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
@@ -0,0 +1,29 @@
+From 05a03c0da6f3694904885fa1629a6e35e75d2875 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony(a)develop-help.com>
+Date: Mon, 2 Sep 2019 15:35:36 +1000
+Subject: [PATCH] (perl #134390) don't leak the SV we just created on an early
+ return
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ regexec.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/regexec.c b/regexec.c
+index c390bff72e..97ea458a20 100644
+--- a/regexec.c
++++ b/regexec.c
+@@ -10405,6 +10405,7 @@ S_to_byte_substr(pTHX_ regexp *prog)
+ && !prog->substrs->data[i].substr) {
+ SV* sv = newSVsv(prog->substrs->data[i].utf8_substr);
+ if (! sv_utf8_downgrade(sv, TRUE)) {
++ SvREFCNT_dec_NN(sv);
+ return FALSE;
+ }
+ if (SvVALID(prog->substrs->data[i].utf8_substr)) {
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index a869015..e734800 100644
--- a/perl.spec
+++ b/perl.spec
@@ -366,6 +366,10 @@ Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
# fixed after 5.31.3
Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
+# Fix a memory leak when matching a UTF-8 regular expression, RT#134329,
+# fixed after 5.31.3
+Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3012,6 +3016,7 @@ Perl extension for Version Objects
%patch98 -p1
%patch99 -p1
%patch100 -p1
+%patch101 -p1
%patch200 -p1
%patch201 -p1
@@ -3096,6 +3101,7 @@ perl -x patchlevel.h \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
+ 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5387,6 +5393,7 @@ popd
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-435
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
+- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-434
- Fix propagating non-string variables in an exception value (RT#134291)
commit 2f3fb5aa0a0c7a470d80a0096a827332ad7f8107
Author: Petr Psa <ppisar(a)redhat.com>
Date: Mon Sep 2 10:40:07 2019 +0200
Correct a misspelling in perlrebackslash documentation
diff --git a/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch b/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
new file mode 100644
index 0000000..8a320d5
--- /dev/null
+++ b/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
@@ -0,0 +1,31 @@
+From 7ea7c4bb61d23965a7ad7041fe9c58b5075aac85 Mon Sep 17 00:00:00 2001
+From: James E Keenan <jkeenan(a)cpan.org>
+Date: Sat, 31 Aug 2019 19:18:36 -0400
+Subject: [PATCH] Supply missing right brace in regex example
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As suggested by Jim Avera in RT 134395.
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ pod/perlrebackslash.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pod/perlrebackslash.pod b/pod/perlrebackslash.pod
+index cfd182a7e1..4a8717346d 100644
+--- a/pod/perlrebackslash.pod
++++ b/pod/perlrebackslash.pod
+@@ -446,7 +446,7 @@ Mnemonic: I<g>roup.
+ =head3 Relative referencing
+
+ C<\g-I<N>> (starting in Perl 5.10.0) is used for relative addressing. (It can
+-be written as C<\g{-I<N>>.) It refers to the I<N>th group before the
++be written as C<\g{-I<N>}>.) It refers to the I<N>th group before the
+ C<\g{-I<N>}>.
+
+ The big advantage of this form is that it makes it much easier to write
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index 2ad00ae..a869015 100644
--- a/perl.spec
+++ b/perl.spec
@@ -362,6 +362,10 @@ Patch98: perl-5.30.0-perl-134266-make-sure-is-writable-when-we-write-to-i
# Fix a documentation about a future API change, fixed after 5.31.2
Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
+# Correct a misspelling in perlrebackslash documentation, RT#134395,
+# fixed after 5.31.3
+Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3007,6 +3011,7 @@ Perl extension for Version Objects
%patch97 -p1
%patch98 -p1
%patch99 -p1
+%patch100 -p1
%patch200 -p1
%patch201 -p1
@@ -3090,6 +3095,7 @@ perl -x patchlevel.h \
'Fedora Patch97: Fix a NULL pointer dereference in PerlIOVia_pushed()' \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
+ 'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5380,6 +5386,7 @@ popd
%changelog
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-435
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
+- Correct a misspelling in perlrebackslash documentation (RT#134395)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-434
- Fix propagating non-string variables in an exception value (RT#134291)
commit f343fa2b53bb3a8e9aac594942bf28b22500d482
Author: Petr Psa <ppisar(a)redhat.com>
Date: Mon Sep 2 08:37:14 2019 +0200
Adjust spec file to rpm-build-4.15.0-0.rc1.1
diff --git a/perl.spec b/perl.spec
index 638c91d..2ad00ae 100644
--- a/perl.spec
+++ b/perl.spec
@@ -83,7 +83,7 @@ License: GPL+ or Artistic
Epoch: %{perl_epoch}
Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise
-Release: 434%{?dist}
+Release: 435%{?dist}
Summary: Practical Extraction and Report Language
Url: https://www.perl.org/
Source0: https://www.cpan.org/src/5.0/perl-%{perl_version}.tar.xz
@@ -3014,9 +3014,9 @@ Perl extension for Version Objects
# Local patch tracking
perl -x patchlevel.h \
'Fedora Patch1: Removes date check, Fedora/RHEL specific' \
-%ifarch %{multilib_64_archs} \
+%ifarch %{multilib_64_archs}
'Fedora Patch2: support for libdir64' \
-%endif \
+%endif
'Fedora Patch3: use libresolv instead of libbind' \
'Fedora Patch4: USE_MM_LD_RUN_PATH' \
'Fedora Patch5: Provide MM::maybe_command independently (bug #1129443)' \
@@ -5378,6 +5378,9 @@ popd
# Old changelog entries are preserved in CVS.
%changelog
+* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-435
+- Adjust spec file to rpm-build-4.15.0-0.rc1.1
+
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-434
- Fix propagating non-string variables in an exception value (RT#134291)
- Include trailing zero in scalars holding trie data (RT#134207)
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/perl.git
by githook-noreply＠fedoraproject.org
The package rpms/perl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/perl.git/commit/?id=3157fd520e4ab....
Change:
+%ifarch %{multilib_64_archs}
Thanks.
Full change:
============
commit d11a766da3d8d507e76b8b184ca6d893c82f398b
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 14:34:25 2019 +0200
Correct an RT number for perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
diff --git a/perl.spec b/perl.spec
index 77778b5..f131ba8 100644
--- a/perl.spec
+++ b/perl.spec
@@ -366,7 +366,7 @@ Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
# fixed after 5.31.3
Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
-# Fix a memory leak when matching a UTF-8 regular expression, RT#134329,
+# Fix a memory leak when matching a UTF-8 regular expression, RT#134390,
# fixed after 5.31.3
Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
@@ -3107,7 +3107,7 @@ perl -x patchlevel.h \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
- 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
+ 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134390)' \
'Fedora Patch102: Fix a detection for futimes (RT#134432)' \
'Fedora Patch103: Fix a detection for futimes (RT#134432)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
@@ -5401,7 +5401,7 @@ popd
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-440
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
-- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
+- Fix a memory leak when matching a UTF-8 regular expression (RT#134390)
- Fix a detection for futimes (RT#134432)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-439
commit b0e9b2f23bbd7164180d2f348eb2f3ad788671a9
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 12:04:46 2019 +0200
Fix a detection for futimes
diff --git a/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch b/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
new file mode 100644
index 0000000..0ceb4e0
--- /dev/null
+++ b/perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
@@ -0,0 +1,30 @@
+From 425077e4b85509df2907be6c103d54c0687c7647 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer(a)redhat.com>
+Date: Mon, 9 Sep 2019 19:35:47 +0200
+Subject: [PATCH 1/2] Configure: Include <stdlib.h> in futimes check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Needed for the exit function.
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ Configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Configure b/Configure
+index 818deb8378..7aa03d6aed 100755
+--- a/Configure
++++ b/Configure
+@@ -14091,6 +14091,7 @@ $cat >try.c <<EOCP
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+
+ int main ()
+ {
+--
+2.21.0
+
diff --git a/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch b/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
new file mode 100644
index 0000000..e213e5e
--- /dev/null
+++ b/perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
@@ -0,0 +1,28 @@
+From da006e4432402cea01c9018743467314377e3c1e Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony(a)develop-help.com>
+Date: Tue, 10 Sep 2019 10:44:10 +1000
+Subject: [PATCH 2/2] Florian Weimer is now a perl author
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ AUTHORS | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/AUTHORS b/AUTHORS
+index a2b6d8c15a..a554cfc045 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -418,6 +418,7 @@ Fergal Daly <fergal(a)esatclear.ie>
+ Fingle Nark <finglenark(a)gmail.com>
+ Florent Guillaume
+ Florian Ragwitz <rafl(a)debian.org>
++Florian Weimer <fweimer(a)redhat.com>
+ Franois Dsarmnien <desar(a)club-internet.fr>
+ Franois Perrad <francois.perrad(a)gadz.org>
+ Frank Crawford
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index 6431b66..77778b5 100644
--- a/perl.spec
+++ b/perl.spec
@@ -370,6 +370,10 @@ Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
# fixed after 5.31.3
Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
+# Fix a detection for futimes, RT#134432, fixed after 5.31.3
+Patch102: perl-5.31.3-Configure-Include-stdlib.h-in-futimes-check.patch
+Patch103: perl-5.31.3-Florian-Weimer-is-now-a-perl-author.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3017,6 +3021,8 @@ Perl extension for Version Objects
%patch99 -p1
%patch100 -p1
%patch101 -p1
+%patch102 -p1
+%patch103 -p1
%patch200 -p1
%patch201 -p1
@@ -3102,6 +3108,8 @@ perl -x patchlevel.h \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
+ 'Fedora Patch102: Fix a detection for futimes (RT#134432)' \
+ 'Fedora Patch103: Fix a detection for futimes (RT#134432)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5394,6 +5402,7 @@ popd
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
+- Fix a detection for futimes (RT#134432)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-439
- Fix propagating non-string variables in an exception value (RT#134291)
commit 2393edb3b739725ed1e36a5e73e5cb8cd4e2a638
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Sep 11 11:59:33 2019 +0200
Fix a memory leak when matching a UTF-8 regular expression
diff --git a/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch b/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
new file mode 100644
index 0000000..2790944
--- /dev/null
+++ b/perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
@@ -0,0 +1,29 @@
+From 05a03c0da6f3694904885fa1629a6e35e75d2875 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony(a)develop-help.com>
+Date: Mon, 2 Sep 2019 15:35:36 +1000
+Subject: [PATCH] (perl #134390) don't leak the SV we just created on an early
+ return
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ regexec.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/regexec.c b/regexec.c
+index c390bff72e..97ea458a20 100644
+--- a/regexec.c
++++ b/regexec.c
+@@ -10405,6 +10405,7 @@ S_to_byte_substr(pTHX_ regexp *prog)
+ && !prog->substrs->data[i].substr) {
+ SV* sv = newSVsv(prog->substrs->data[i].utf8_substr);
+ if (! sv_utf8_downgrade(sv, TRUE)) {
++ SvREFCNT_dec_NN(sv);
+ return FALSE;
+ }
+ if (SvVALID(prog->substrs->data[i].utf8_substr)) {
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index e032c9e..6431b66 100644
--- a/perl.spec
+++ b/perl.spec
@@ -366,6 +366,10 @@ Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
# fixed after 5.31.3
Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
+# Fix a memory leak when matching a UTF-8 regular expression, RT#134329,
+# fixed after 5.31.3
+Patch101: perl-5.31.3-perl-134390-don-t-leak-the-SV-we-just-created-on-an-.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3012,6 +3016,7 @@ Perl extension for Version Objects
%patch98 -p1
%patch99 -p1
%patch100 -p1
+%patch101 -p1
%patch200 -p1
%patch201 -p1
@@ -3096,6 +3101,7 @@ perl -x patchlevel.h \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
+ 'Fedora Patch101: Fix a memory leak when matching a UTF-8 regular expression (RT#134329)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5387,6 +5393,7 @@ popd
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-440
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
- Correct a misspelling in perlrebackslash documentation (RT#134395)
+- Fix a memory leak when matching a UTF-8 regular expression (RT#134329)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-439
- Fix propagating non-string variables in an exception value (RT#134291)
commit 7c7f400a7743741d0a495879b1b129189826bb5f
Author: Petr Psa <ppisar(a)redhat.com>
Date: Mon Sep 2 10:40:07 2019 +0200
Correct a misspelling in perlrebackslash documentation
diff --git a/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch b/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
new file mode 100644
index 0000000..8a320d5
--- /dev/null
+++ b/perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
@@ -0,0 +1,31 @@
+From 7ea7c4bb61d23965a7ad7041fe9c58b5075aac85 Mon Sep 17 00:00:00 2001
+From: James E Keenan <jkeenan(a)cpan.org>
+Date: Sat, 31 Aug 2019 19:18:36 -0400
+Subject: [PATCH] Supply missing right brace in regex example
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As suggested by Jim Avera in RT 134395.
+
+Signed-off-by: Petr Psa <ppisar(a)redhat.com>
+---
+ pod/perlrebackslash.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pod/perlrebackslash.pod b/pod/perlrebackslash.pod
+index cfd182a7e1..4a8717346d 100644
+--- a/pod/perlrebackslash.pod
++++ b/pod/perlrebackslash.pod
+@@ -446,7 +446,7 @@ Mnemonic: I<g>roup.
+ =head3 Relative referencing
+
+ C<\g-I<N>> (starting in Perl 5.10.0) is used for relative addressing. (It can
+-be written as C<\g{-I<N>>.) It refers to the I<N>th group before the
++be written as C<\g{-I<N>}>.) It refers to the I<N>th group before the
+ C<\g{-I<N>}>.
+
+ The big advantage of this form is that it makes it much easier to write
+--
+2.21.0
+
diff --git a/perl.spec b/perl.spec
index 4ca818e..e032c9e 100644
--- a/perl.spec
+++ b/perl.spec
@@ -362,6 +362,10 @@ Patch98: perl-5.30.0-perl-134266-make-sure-is-writable-when-we-write-to-i
# Fix a documentation about a future API change, fixed after 5.31.2
Patch99: perl-5.31.2-perlapi-5.30-promise-not-met-change-to-5.32.patch
+# Correct a misspelling in perlrebackslash documentation, RT#134395,
+# fixed after 5.31.3
+Patch100: perl-5.31.3-Supply-missing-right-brace-in-regex-example.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -3007,6 +3011,7 @@ Perl extension for Version Objects
%patch97 -p1
%patch98 -p1
%patch99 -p1
+%patch100 -p1
%patch200 -p1
%patch201 -p1
@@ -3090,6 +3095,7 @@ perl -x patchlevel.h \
'Fedora Patch97: Fix a NULL pointer dereference in PerlIOVia_pushed()' \
'Fedora Patch98: Fix a crash when setting $@ on unwinding a call stack (RT#134266)' \
'Fedora Patch99: Fix a documentation about a future API change' \
+ 'Fedora Patch100: Correct a misspelling in perlrebackslash documentation (RT#134395)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5380,6 +5386,7 @@ popd
%changelog
* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-440
- Adjust spec file to rpm-build-4.15.0-0.rc1.1
+- Correct a misspelling in perlrebackslash documentation (RT#134395)
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-439
- Fix propagating non-string variables in an exception value (RT#134291)
commit 3157fd520e4ab5e6f940ffaeee6841d341d72608
Author: Petr Psa <ppisar(a)redhat.com>
Date: Mon Sep 2 08:37:14 2019 +0200
Adjust spec file to rpm-build-4.15.0-0.rc1.1
diff --git a/perl.spec b/perl.spec
index 65e669c..4ca818e 100644
--- a/perl.spec
+++ b/perl.spec
@@ -83,7 +83,7 @@ License: GPL+ or Artistic
Epoch: %{perl_epoch}
Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise
-Release: 439%{?dist}
+Release: 440%{?dist}
Summary: Practical Extraction and Report Language
Url: https://www.perl.org/
Source0: https://www.cpan.org/src/5.0/perl-%{perl_version}.tar.xz
@@ -3014,9 +3014,9 @@ Perl extension for Version Objects
# Local patch tracking
perl -x patchlevel.h \
'Fedora Patch1: Removes date check, Fedora/RHEL specific' \
-%ifarch %{multilib_64_archs} \
+%ifarch %{multilib_64_archs}
'Fedora Patch2: support for libdir64' \
-%endif \
+%endif
'Fedora Patch3: use libresolv instead of libbind' \
'Fedora Patch4: USE_MM_LD_RUN_PATH' \
'Fedora Patch5: Provide MM::maybe_command independently (bug #1129443)' \
@@ -5378,6 +5378,9 @@ popd
# Old changelog entries are preserved in CVS.
%changelog
+* Wed Sep 11 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-440
+- Adjust spec file to rpm-build-4.15.0-0.rc1.1
+
* Wed Aug 07 2019 Petr Pisar <ppisar(a)redhat.com> - 4:5.28.2-439
- Fix propagating non-string variables in an exception value (RT#134291)
- Include trailing zero in scalars holding trie data (RT#134207)
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/compat-libicu62.git
by githook-noreply＠fedoraproject.org
The package rpms/compat-libicu62.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/compat-libicu62.git/commit/?id=dc....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit dc1ea9e0253c580183e97debbdd870373649108d
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Wed Sep 11 12:09:26 2019 +0100
Retire old compat package in F31+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ee29b6f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/icu4c-62_1-src.tgz
diff --git a/armv7hl-disable-tests.patch b/armv7hl-disable-tests.patch
deleted file mode 100644
index 2d869b1..0000000
--- a/armv7hl-disable-tests.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdptst.c
---- orig.icu/source/test/cintltst/cnmdptst.c 2016-03-23 21:48:18.000000000 +0100
-+++ icu/source/test/cintltst/cnmdptst.c 2016-04-15 18:34:06.148251985 +0200
-@@ -186,6 +186,12 @@
- /* Test exponential pattern*/
- static void TestExponential(void)
- {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+ /* Actually only 3 tests fail, but given the nested structure depending on
-+ * array sizes there's no simple "disable this and that". */
-+ return;
-+#endif
- int32_t pat_length, val_length, lval_length;
- int32_t ival, ilval, p, v, lneed;
- UNumberFormat *fmt;
-diff -ru orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcfmtest.cpp
---- orig.icu/source/test/intltest/dcfmtest.cpp 2016-03-23 21:48:38.000000000 +0100
-+++ icu/source/test/intltest/dcfmtest.cpp 2016-04-15 18:34:06.148251985 +0200
-@@ -279,6 +279,13 @@
- //
- formatLineMat.reset(testLine);
- if (formatLineMat.lookingAt(status)) {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+// [Formattable] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6"
-+// [StringPiece] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6"
-+ if (lineNum == 62)
-+ continue;
-+#endif
- execFormatTest(lineNum,
- formatLineMat.group(1, status), // Pattern
- formatLineMat.group(2, status), // rounding mode
-diff -ru orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intltest/numfmtspectest.cpp
---- orig.icu/source/test/intltest/numfmtspectest.cpp 2016-03-23 21:48:40.000000000 +0100
-+++ icu/source/test/intltest/numfmtspectest.cpp 2016-04-15 18:34:06.148251985 +0200
-@@ -137,11 +137,14 @@
-
- void NumberFormatSpecificationTest::TestScientificNotation() {
- assertPatternFr("1,23E4", 12345.0, "0.00E0", TRUE);
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- assertPatternFr("123,00E2", 12300.0, "000.00E0", TRUE);
- assertPatternFr("123,0E2", 12300.0, "000.0#E0", TRUE);
- assertPatternFr("123,0E2", 12300.1, "000.0#E0", TRUE);
- assertPatternFr("123,01E2", 12301.0, "000.0#E0", TRUE);
- assertPatternFr("123,01E+02", 12301.0, "000.0#E+00", TRUE);
-+#endif
- assertPatternFr("12,3E3", 12345.0, "##0.00E0", TRUE);
- assertPatternFr("12,300E3", 12300.1, "##0.0000E0", TRUE);
- assertPatternFr("12,30E3", 12300.1, "##0.000#E0", TRUE);
-@@ -221,6 +224,8 @@
- assertEquals("", "USD (433.22)", result, TRUE);
- }
- }
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- const char *paddedSciPattern = "QU**00.#####E0";
- assertPatternFr("QU***43,3E-1", 4.33, paddedSciPattern, TRUE);
- {
-@@ -242,6 +247,7 @@
- }
- // padding cannot work as intended with scientific notation.
- assertPatternFr("QU**43,32E-1", 4.332, paddedSciPattern, TRUE);
-+#endif
- }
-
- void NumberFormatSpecificationTest::assertPatternFr(
-diff -ru orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/numfmtst.cpp
---- orig.icu/source/test/intltest/numfmtst.cpp 2016-03-23 21:48:40.000000000 +0100
-+++ icu/source/test/intltest/numfmtst.cpp 2016-04-15 18:34:06.150251997 +0200
-@@ -730,6 +730,12 @@
- void
- NumberFormatTest::TestExponential(void)
- {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+ /* Actually only 3 tests fail, but given the nested structure depending on
-+ * array sizes there's no simple "disable this and that". */
-+ return;
-+#endif
- UErrorCode status = U_ZERO_ERROR;
- DecimalFormatSymbols sym(Locale::getUS(), status);
- if (U_FAILURE(status)) { errcheckln(status, "FAIL: Bad status returned by DecimalFormatSymbols ct - %s", u_errorName(status)); return; }
-@@ -1846,8 +1852,11 @@
- (int32_t) 45678000, "5E7", status);
- expect(new DecimalFormat("00E0", US, status),
- (int32_t) 45678000, "46E6", status);
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- expect(new DecimalFormat("000E0", US, status),
- (int32_t) 45678000, "457E5", status);
-+#endif
- /*
- expect(new DecimalFormat("###E0", US, status),
- new Object[] { new Double(0.0000123), "12.3E-6",
diff --git a/compat-libicu62.spec b/compat-libicu62.spec
deleted file mode 100644
index e6652e7..0000000
--- a/compat-libicu62.spec
+++ /dev/null
@@ -1,99 +0,0 @@
-Name: compat-libicu62
-Version: 62.1
-Release: 3%{?dist}
-Summary: Compat package with icu libraries
-
-License: MIT and UCD and Public Domain
-URL: http://www.icu-project.org/
-Source0: http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz
-
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: doxygen, autoconf, python2
-
-Patch4: gennorm2-man.patch
-Patch5: icuinfo-man.patch
-Patch6: rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
-Patch100: armv7hl-disable-tests.patch
-
-# Explicitly conflict with older icu packages that ship libraries
-# with the same soname as this compat package
-Conflicts: libicu < 63
-
-%description
-Compatibility package with libicu libraries ABI version 61.
-
-
-%prep
-%setup -q -n icu
-%patch4 -p1 -b .gennorm2-man.patch
-%patch5 -p1 -b .icuinfo-man.patch
-%patch6 -p2 -b .rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
-%ifarch armv7hl
-%patch100 -p1 -b .armv7hl-disable-tests.patch
-%endif
-
-
-%build
-pushd source
-autoconf
-CFLAGS='%optflags -fno-strict-aliasing'
-CXXFLAGS='%optflags -fno-strict-aliasing'
-# Endian: BE=0 LE=1
-%if ! 0%{?endian}
-CPPFLAGS='-DU_IS_BIG_ENDIAN=1'
-%endif
-
-#rhbz856594 do not use --disable-renaming or cope with the mess
-OPTIONS='--with-data-packaging=library --disable-samples'
-%if 0%{?debugtrace}
-OPTIONS=$OPTIONS' --enable-debug --enable-tracing'
-%endif
-%configure $OPTIONS
-
-#rhbz#225896
-sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
-#rhbz#813484
-sed -i 's| \$(docfilesdir)/installdox||' Makefile
-# There is no source/doc/html/search/ directory
-sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
-# rhbz#856594 The configure --disable-renaming and possibly other options
-# result in icu/source/uconfig.h.prepend being created, include that content in
-# icu/source/common/unicode/uconfig.h to propagate to consumer packages.
-test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' -i common/unicode/uconfig.h
-
-# more verbosity for build.log
-sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile
-
-make %{?_smp_mflags} VERBOSE=1
-
-
-%install
-make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-
-# Remove files that aren't needed for the compat package
-rm -rf $RPM_BUILD_ROOT%{_bindir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so
-rm -rf $RPM_BUILD_ROOT%{_libdir}/icu/
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-rm -rf $RPM_BUILD_ROOT%{_sbindir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icu/
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-
-
-%files
-%license LICENSE
-%{_libdir}/*.so.*
-
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 62.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 62.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter(a)fedoraproject.org> - 62.1-1
-- Initial packaging
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a0780ba
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Retire old compat package in F31+
diff --git a/gennorm2-man.patch b/gennorm2-man.patch
deleted file mode 100644
index 07b5b9d..0000000
--- a/gennorm2-man.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Description: supply manual page for program that doesn't have one
-Author: Jay Berkenbilt <qjb(a)debian.org>
-Bug: http://bugs.icu-project.org/trac/ticket/7554
-
-diff -r -u -N icu.orig/source/tools/gennorm2/gennorm2.8.in icu/source/tools/gennorm2/gennorm2.8.in
---- icu.orig/source/tools/gennorm2/gennorm2.8.in 1970-01-01 01:00:00.000000000 +0100
-+++ icu/source/tools/gennorm2/gennorm2.8.in 2013-02-25 16:43:28.297062638 +0100
-@@ -0,0 +1,71 @@
-+.\" Hey, Emacs! This is -*-nroff-*- you know...
-+.\"
-+.\" gennorm2.8: manual page for the gennorm2 utility
-+.\"
-+.\" Copyright (C) 2005-2006 International Business Machines Corporation and others
-+.\"
-+.TH GENNORM2 8 "15 March 2010" "ICU MANPAGE" "ICU @VERSION@ Manual"
-+.SH NAME
-+.B gennorm2
-+\- Builds binary data file with Unicode normalization data.
-+.SH SYNOPSIS
-+.B gennorm2
-+[
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+]
-+[
-+.BR "\-V\fP, \fB\-\-version"
-+]
-+[
-+.BR "\-c\fP, \fB\-\-copyright"
-+]
-+[
-+.BR "\-v\fP, \fB\-\-verbose"
-+]
-+[
-+.BI "\-u\fP, \fB\-\-unicode" " unicode\-version\-number"
-+]
-+[
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+]
-+[
-+.BI "\-o\fP, \fB\-\-output" " output\-filename"
-+]
-+.BI "\fB\-\-fast"
-+.SH DESCRIPTION
-+.B gennorm2
-+reads text files that define Unicode normalization,
-+them, and builds a binary data file.
-+.SH OPTIONS
-+.TP
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+Print help about usage and exit.
-+.TP
-+.BR "\-V\fP, \fB\-\-version"
-+Print the version of
-+.B gennorm2
-+and exit.
-+.TP
-+.BR "\-c\fP, \fB\-\-copyright"
-+Include a copyright notice.
-+.TP
-+.BR "\-v\fP, \fB\-\-verbose"
-+Display extra informative messages during execution.
-+.TP
-+.BR "\-u\fP, \fB\-\-unicode"
-+Specify Unicode version number, such as 5.2.0.
-+.TP
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+Specify the input directory.
-+.TP
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+Set the name of the output file.
-+.TP
-+.BI "\fB\-\-fast"
-+optimize the .nrm file for fast normalization,
-+which might increase its size (Writes fully decomposed
-+regular mappings instead of delta mappings.
-+You should measure the runtime speed to make sure that
-+this is a good trade-off.)
-+.SH COPYRIGHT
-+Copyright (C) 2009-2010 International Business Machines Corporation and others
-diff -r -u -N icu.orig/source/tools/gennorm2/Makefile.in icu/source/tools/gennorm2/Makefile.in
---- icu.orig/source/tools/gennorm2/Makefile.in 2013-01-11 01:23:32.000000000 +0100
-+++ icu/source/tools/gennorm2/Makefile.in 2013-02-25 16:43:28.296062632 +0100
-@@ -16,8 +16,13 @@
-
- TARGET_STUB_NAME = gennorm2
-
-+SECTION = 8
-+
-+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
-+
-+
- ## Extra files to remove for 'make clean'
--CLEANFILES = *~ $(DEPS)
-+CLEANFILES = *~ $(DEPS) $(MAN_FILES)
-
- ## Target information
- TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
-@@ -44,12 +49,16 @@
- dist: dist-local
- check: all check-local
-
--all-local: $(TARGET)
-+all-local: $(TARGET) $(MAN_FILES)
-
--install-local: all-local
-+install-local: all-local install-man
- $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
- $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
-
-+install-man: $(MAN_FILES)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-+ $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
-+
- dist-local:
-
- clean-local:
-@@ -70,6 +79,11 @@
- $(POST_BUILD_STEP)
-
-
-+%.$(SECTION): $(srcdir)/%.$(SECTION).in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
- ifeq (,$(MAKECMDGOALS))
- -include $(DEPS)
- else
diff --git a/icuinfo-man.patch b/icuinfo-man.patch
deleted file mode 100644
index 987e879..0000000
--- a/icuinfo-man.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Description: supply manual page for program that doesn't have one
-Author: Jay Berkenbilt <qjb(a)debian.org>
-Bug: http://bugs.icu-project.org/trac/ticket/7665
-erAck: adapted to ICU 56.1 icu/source/tools/icuinfo/Makefile.in
-
-diff -Nur orig.icu/source/tools/icuinfo/icuinfo.1.in icu/source/tools/icuinfo/icuinfo.1.in
---- orig.icu/source/tools/icuinfo/icuinfo.1.in 1970-01-01 01:00:00.000000000 +0100
-+++ icu/source/tools/icuinfo/icuinfo.1.in 2015-10-27 19:19:35.184056800 +0100
-@@ -0,0 +1,76 @@
-+.\" Hey, Emacs! This is -*-nroff-*- you know...
-+.\"
-+.\" icuinfo.1: manual page for the icuinfo utility
-+.\"
-+.\" Copyright (C) 2005-2006 International Business Machines Corporation and others
-+.\"
-+.TH ICUINFO 1 "1 May 2010" "ICU MANPAGE" "ICU @VERSION@ Manual"
-+.SH NAME
-+.B icuinfo
-+\- Shows some basic info about the current ICU
-+.SH SYNOPSIS
-+.B icuinfo
-+[
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+]
-+[
-+.BR "\-V\fP, \fB\-\-version"
-+]
-+[
-+.BR "\-c\fP, \fB\-\-copyright"
-+]
-+[
-+.BI "\-i\fP, \fB\-\-icudatadir" " directory"
-+]
-+[
-+.BR "\-v\fP, \fB\-\-verbose"
-+]
-+[
-+.BI "\-L\fP, \fB\-\-list-plugins"
-+]
-+[
-+.BI "\-m\fP, \fB\-\-milisecond-time"
-+]
-+[
-+.BI "\-K\fP, \fB\-\-cleanup"
-+]
-+.SH DESCRIPTION
-+.B icuinfo
-+prints basic information about the current version of ICU.
-+.SH OPTIONS
-+.TP
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+Print help about usage and exit.
-+.TP
-+.BR "\-V\fP, \fB\-\-version"
-+Print the version of
-+.B icuinfo
-+and exit.
-+.TP
-+.BR "\-c\fP, \fB\-\-copyright"
-+Embeds the standard ICU copyright into the
-+.IR output-file .
-+.TP
-+.BR "\-v\fP, \fB\-\-verbose"
-+Display extra informative messages during execution.
-+.TP
-+.BI "\-i\fP, \fB\-\-icudatadir" " directory"
-+Look for any necessary ICU data files in
-+.IR directory .
-+For example, the file
-+.B pnames.icu
-+must be located when ICU's data is not built as a shared library.
-+The default ICU data directory is specified by the environment variable
-+.BR ICU_DATA .
-+Most configurations of ICU do not require this argument.
-+.TP
-+.BI "\-L\fP, \fB\-\-list-plugins"
-+If specified, list and diagnose issues with ICU plugins.
-+.TP
-+.BI "\-K\fP, \fB\-\-cleanup"
-+Attempt to unload plugins before exiting.
-+.TP
-+.BI "\-m\fP, \fB\-\-milisecond-time"
-+Print the current UTC time in milliseconds.
-+.SH COPYRIGHT
-+Copyright (C) 2010 International Business Machines Corporation and others
-diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in
---- orig.icu/source/tools/icuinfo/Makefile.in 2015-10-08 05:53:56.000000000 +0200
-+++ icu/source/tools/icuinfo/Makefile.in 2015-10-27 19:23:19.115509906 +0100
-@@ -14,8 +14,15 @@
- ## Build directory information
- subdir = tools/icuinfo
-
-+TARGET_STUB_NAME = icuinfo
-+
-+SECTION = 1
-+
-+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
-+
-+
- ## Extra files to remove for 'make clean'
--CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
-+CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN) $(MAN_FILES)
-
- ## Target information
- TARGET = icuinfo$(EXEEXT)
-@@ -35,7 +42,8 @@
-
- ## List of phony targets
- .PHONY : all all-local install install-local clean clean-local \
--distclean distclean-local dist dist-local check check-local plugin-check
-+distclean distclean-local dist dist-local check check-local plugin-check \
-+install-man
-
- ## Clear suffix list
- .SUFFIXES :
-@@ -48,12 +56,16 @@
- dist: dist-local
- check: all check-local
-
--all-local: $(TARGET)
-+all-local: $(TARGET) $(MAN_FILES)
-
--install-local: all-local
-+install-local: all-local install-man
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
-
-+install-man: $(MAN_FILES)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-+ $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
-+
- dist-local:
-
- clean-local:
-@@ -103,6 +115,10 @@
- @echo "Plugins are disabled (use --enable-plugins to enable)"
- endif
-
-+%.$(SECTION): $(srcdir)/%.$(SECTION).in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
- ifeq (,$(MAKECMDGOALS))
- -include $(DEPS)
- else
diff --git a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch b/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
deleted file mode 100644
index 3debd3f..0000000
--- a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001
-From: Shane Carr <shane(a)unicode.org>
-Date: Mon, 29 Oct 2018 23:52:44 -0700
-Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing.
-
----
- icu4c/source/i18n/fmtable.cpp | 2 +-
- icu4c/source/i18n/number_decimalquantity.cpp | 5 ++++-
- icu4c/source/test/intltest/numfmtst.cpp | 8 ++++++++
- .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 ++++-
- .../impl/number/DecimalQuantity_DualStorageBCD.java | 10 +++++++++-
- .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 +++++
- 6 files changed, 31 insertions(+), 4 deletions(-)
-
-erAck:
-* obviously removed the icu4j *.java patch parts
-* stripped the icu4c/source/test/intltest/numfmtst.cpp part because it
- added code to a test that does not exist yet in ICU 62.1
- * TODO: when upgrading to ICU 63.1 add that back in from
- https://github.com/unicode-org/icu/commit/53d8c8f3d181d87a6aa925b449b51c4...
-
-diff --git a/icu4c/source/i18n/fmtable.cpp b/icu4c/source/i18n/fmtable.cpp
-index 45c7024fc29..8601d95f4a6 100644
---- a/icu4c/source/i18n/fmtable.cpp
-+++ b/icu4c/source/i18n/fmtable.cpp
-@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) {
- // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?).
- if (fDecimalQuantity->isZero()) {
- fDecimalStr->append("0", -1, status);
-- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) {
-+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status);
- } else {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status);
-diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp
-index 47b930a564b..d5dd7ae694c 100644
---- a/icu4c/source/i18n/number_decimalquantity.cpp
-+++ b/icu4c/source/i18n/number_decimalquantity.cpp
-@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const {
- }
- result.append(u'E');
- int32_t _scale = upperPos + scale;
-- if (_scale < 0) {
-+ if (_scale == INT32_MIN) {
-+ result.append({u"-2147483648", -1});
-+ return result;
-+ } else if (_scale < 0) {
- _scale *= -1;
- result.append(u'-');
- } else {
diff --git a/sources b/sources
deleted file mode 100644
index f897dee..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (icu4c-62_1-src.tgz) = 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/compat-libicu62.git
by githook-noreply＠fedoraproject.org
The package rpms/compat-libicu62.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/compat-libicu62.git/commit/?id=dc....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit dc1ea9e0253c580183e97debbdd870373649108d
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Wed Sep 11 12:09:26 2019 +0100
Retire old compat package in F31+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ee29b6f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/icu4c-62_1-src.tgz
diff --git a/armv7hl-disable-tests.patch b/armv7hl-disable-tests.patch
deleted file mode 100644
index 2d869b1..0000000
--- a/armv7hl-disable-tests.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdptst.c
---- orig.icu/source/test/cintltst/cnmdptst.c 2016-03-23 21:48:18.000000000 +0100
-+++ icu/source/test/cintltst/cnmdptst.c 2016-04-15 18:34:06.148251985 +0200
-@@ -186,6 +186,12 @@
- /* Test exponential pattern*/
- static void TestExponential(void)
- {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+ /* Actually only 3 tests fail, but given the nested structure depending on
-+ * array sizes there's no simple "disable this and that". */
-+ return;
-+#endif
- int32_t pat_length, val_length, lval_length;
- int32_t ival, ilval, p, v, lneed;
- UNumberFormat *fmt;
-diff -ru orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcfmtest.cpp
---- orig.icu/source/test/intltest/dcfmtest.cpp 2016-03-23 21:48:38.000000000 +0100
-+++ icu/source/test/intltest/dcfmtest.cpp 2016-04-15 18:34:06.148251985 +0200
-@@ -279,6 +279,13 @@
- //
- formatLineMat.reset(testLine);
- if (formatLineMat.lookingAt(status)) {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+// [Formattable] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6"
-+// [StringPiece] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6"
-+ if (lineNum == 62)
-+ continue;
-+#endif
- execFormatTest(lineNum,
- formatLineMat.group(1, status), // Pattern
- formatLineMat.group(2, status), // rounding mode
-diff -ru orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intltest/numfmtspectest.cpp
---- orig.icu/source/test/intltest/numfmtspectest.cpp 2016-03-23 21:48:40.000000000 +0100
-+++ icu/source/test/intltest/numfmtspectest.cpp 2016-04-15 18:34:06.148251985 +0200
-@@ -137,11 +137,14 @@
-
- void NumberFormatSpecificationTest::TestScientificNotation() {
- assertPatternFr("1,23E4", 12345.0, "0.00E0", TRUE);
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- assertPatternFr("123,00E2", 12300.0, "000.00E0", TRUE);
- assertPatternFr("123,0E2", 12300.0, "000.0#E0", TRUE);
- assertPatternFr("123,0E2", 12300.1, "000.0#E0", TRUE);
- assertPatternFr("123,01E2", 12301.0, "000.0#E0", TRUE);
- assertPatternFr("123,01E+02", 12301.0, "000.0#E+00", TRUE);
-+#endif
- assertPatternFr("12,3E3", 12345.0, "##0.00E0", TRUE);
- assertPatternFr("12,300E3", 12300.1, "##0.0000E0", TRUE);
- assertPatternFr("12,30E3", 12300.1, "##0.000#E0", TRUE);
-@@ -221,6 +224,8 @@
- assertEquals("", "USD (433.22)", result, TRUE);
- }
- }
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- const char *paddedSciPattern = "QU**00.#####E0";
- assertPatternFr("QU***43,3E-1", 4.33, paddedSciPattern, TRUE);
- {
-@@ -242,6 +247,7 @@
- }
- // padding cannot work as intended with scientific notation.
- assertPatternFr("QU**43,32E-1", 4.332, paddedSciPattern, TRUE);
-+#endif
- }
-
- void NumberFormatSpecificationTest::assertPatternFr(
-diff -ru orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/numfmtst.cpp
---- orig.icu/source/test/intltest/numfmtst.cpp 2016-03-23 21:48:40.000000000 +0100
-+++ icu/source/test/intltest/numfmtst.cpp 2016-04-15 18:34:06.150251997 +0200
-@@ -730,6 +730,12 @@
- void
- NumberFormatTest::TestExponential(void)
- {
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 1
-+ /* Actually only 3 tests fail, but given the nested structure depending on
-+ * array sizes there's no simple "disable this and that". */
-+ return;
-+#endif
- UErrorCode status = U_ZERO_ERROR;
- DecimalFormatSymbols sym(Locale::getUS(), status);
- if (U_FAILURE(status)) { errcheckln(status, "FAIL: Bad status returned by DecimalFormatSymbols ct - %s", u_errorName(status)); return; }
-@@ -1846,8 +1852,11 @@
- (int32_t) 45678000, "5E7", status);
- expect(new DecimalFormat("00E0", US, status),
- (int32_t) 45678000, "46E6", status);
-+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */
-+#if 0
- expect(new DecimalFormat("000E0", US, status),
- (int32_t) 45678000, "457E5", status);
-+#endif
- /*
- expect(new DecimalFormat("###E0", US, status),
- new Object[] { new Double(0.0000123), "12.3E-6",
diff --git a/compat-libicu62.spec b/compat-libicu62.spec
deleted file mode 100644
index e6652e7..0000000
--- a/compat-libicu62.spec
+++ /dev/null
@@ -1,99 +0,0 @@
-Name: compat-libicu62
-Version: 62.1
-Release: 3%{?dist}
-Summary: Compat package with icu libraries
-
-License: MIT and UCD and Public Domain
-URL: http://www.icu-project.org/
-Source0: http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz
-
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: doxygen, autoconf, python2
-
-Patch4: gennorm2-man.patch
-Patch5: icuinfo-man.patch
-Patch6: rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
-Patch100: armv7hl-disable-tests.patch
-
-# Explicitly conflict with older icu packages that ship libraries
-# with the same soname as this compat package
-Conflicts: libicu < 63
-
-%description
-Compatibility package with libicu libraries ABI version 61.
-
-
-%prep
-%setup -q -n icu
-%patch4 -p1 -b .gennorm2-man.patch
-%patch5 -p1 -b .icuinfo-man.patch
-%patch6 -p2 -b .rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
-%ifarch armv7hl
-%patch100 -p1 -b .armv7hl-disable-tests.patch
-%endif
-
-
-%build
-pushd source
-autoconf
-CFLAGS='%optflags -fno-strict-aliasing'
-CXXFLAGS='%optflags -fno-strict-aliasing'
-# Endian: BE=0 LE=1
-%if ! 0%{?endian}
-CPPFLAGS='-DU_IS_BIG_ENDIAN=1'
-%endif
-
-#rhbz856594 do not use --disable-renaming or cope with the mess
-OPTIONS='--with-data-packaging=library --disable-samples'
-%if 0%{?debugtrace}
-OPTIONS=$OPTIONS' --enable-debug --enable-tracing'
-%endif
-%configure $OPTIONS
-
-#rhbz#225896
-sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
-#rhbz#813484
-sed -i 's| \$(docfilesdir)/installdox||' Makefile
-# There is no source/doc/html/search/ directory
-sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
-# rhbz#856594 The configure --disable-renaming and possibly other options
-# result in icu/source/uconfig.h.prepend being created, include that content in
-# icu/source/common/unicode/uconfig.h to propagate to consumer packages.
-test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' -i common/unicode/uconfig.h
-
-# more verbosity for build.log
-sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile
-
-make %{?_smp_mflags} VERBOSE=1
-
-
-%install
-make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-
-# Remove files that aren't needed for the compat package
-rm -rf $RPM_BUILD_ROOT%{_bindir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so
-rm -rf $RPM_BUILD_ROOT%{_libdir}/icu/
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-rm -rf $RPM_BUILD_ROOT%{_sbindir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icu/
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-
-
-%files
-%license LICENSE
-%{_libdir}/*.so.*
-
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 62.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 62.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Pete Walter <pwalter(a)fedoraproject.org> - 62.1-1
-- Initial packaging
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a0780ba
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Retire old compat package in F31+
diff --git a/gennorm2-man.patch b/gennorm2-man.patch
deleted file mode 100644
index 07b5b9d..0000000
--- a/gennorm2-man.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Description: supply manual page for program that doesn't have one
-Author: Jay Berkenbilt <qjb(a)debian.org>
-Bug: http://bugs.icu-project.org/trac/ticket/7554
-
-diff -r -u -N icu.orig/source/tools/gennorm2/gennorm2.8.in icu/source/tools/gennorm2/gennorm2.8.in
---- icu.orig/source/tools/gennorm2/gennorm2.8.in 1970-01-01 01:00:00.000000000 +0100
-+++ icu/source/tools/gennorm2/gennorm2.8.in 2013-02-25 16:43:28.297062638 +0100
-@@ -0,0 +1,71 @@
-+.\" Hey, Emacs! This is -*-nroff-*- you know...
-+.\"
-+.\" gennorm2.8: manual page for the gennorm2 utility
-+.\"
-+.\" Copyright (C) 2005-2006 International Business Machines Corporation and others
-+.\"
-+.TH GENNORM2 8 "15 March 2010" "ICU MANPAGE" "ICU @VERSION@ Manual"
-+.SH NAME
-+.B gennorm2
-+\- Builds binary data file with Unicode normalization data.
-+.SH SYNOPSIS
-+.B gennorm2
-+[
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+]
-+[
-+.BR "\-V\fP, \fB\-\-version"
-+]
-+[
-+.BR "\-c\fP, \fB\-\-copyright"
-+]
-+[
-+.BR "\-v\fP, \fB\-\-verbose"
-+]
-+[
-+.BI "\-u\fP, \fB\-\-unicode" " unicode\-version\-number"
-+]
-+[
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+]
-+[
-+.BI "\-o\fP, \fB\-\-output" " output\-filename"
-+]
-+.BI "\fB\-\-fast"
-+.SH DESCRIPTION
-+.B gennorm2
-+reads text files that define Unicode normalization,
-+them, and builds a binary data file.
-+.SH OPTIONS
-+.TP
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+Print help about usage and exit.
-+.TP
-+.BR "\-V\fP, \fB\-\-version"
-+Print the version of
-+.B gennorm2
-+and exit.
-+.TP
-+.BR "\-c\fP, \fB\-\-copyright"
-+Include a copyright notice.
-+.TP
-+.BR "\-v\fP, \fB\-\-verbose"
-+Display extra informative messages during execution.
-+.TP
-+.BR "\-u\fP, \fB\-\-unicode"
-+Specify Unicode version number, such as 5.2.0.
-+.TP
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+Specify the input directory.
-+.TP
-+.BI "\-s\fP, \fB\-\-sourcedir" " source\-directory"
-+Set the name of the output file.
-+.TP
-+.BI "\fB\-\-fast"
-+optimize the .nrm file for fast normalization,
-+which might increase its size (Writes fully decomposed
-+regular mappings instead of delta mappings.
-+You should measure the runtime speed to make sure that
-+this is a good trade-off.)
-+.SH COPYRIGHT
-+Copyright (C) 2009-2010 International Business Machines Corporation and others
-diff -r -u -N icu.orig/source/tools/gennorm2/Makefile.in icu/source/tools/gennorm2/Makefile.in
---- icu.orig/source/tools/gennorm2/Makefile.in 2013-01-11 01:23:32.000000000 +0100
-+++ icu/source/tools/gennorm2/Makefile.in 2013-02-25 16:43:28.296062632 +0100
-@@ -16,8 +16,13 @@
-
- TARGET_STUB_NAME = gennorm2
-
-+SECTION = 8
-+
-+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
-+
-+
- ## Extra files to remove for 'make clean'
--CLEANFILES = *~ $(DEPS)
-+CLEANFILES = *~ $(DEPS) $(MAN_FILES)
-
- ## Target information
- TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
-@@ -44,12 +49,16 @@
- dist: dist-local
- check: all check-local
-
--all-local: $(TARGET)
-+all-local: $(TARGET) $(MAN_FILES)
-
--install-local: all-local
-+install-local: all-local install-man
- $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
- $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
-
-+install-man: $(MAN_FILES)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-+ $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
-+
- dist-local:
-
- clean-local:
-@@ -70,6 +79,11 @@
- $(POST_BUILD_STEP)
-
-
-+%.$(SECTION): $(srcdir)/%.$(SECTION).in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
- ifeq (,$(MAKECMDGOALS))
- -include $(DEPS)
- else
diff --git a/icuinfo-man.patch b/icuinfo-man.patch
deleted file mode 100644
index 987e879..0000000
--- a/icuinfo-man.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Description: supply manual page for program that doesn't have one
-Author: Jay Berkenbilt <qjb(a)debian.org>
-Bug: http://bugs.icu-project.org/trac/ticket/7665
-erAck: adapted to ICU 56.1 icu/source/tools/icuinfo/Makefile.in
-
-diff -Nur orig.icu/source/tools/icuinfo/icuinfo.1.in icu/source/tools/icuinfo/icuinfo.1.in
---- orig.icu/source/tools/icuinfo/icuinfo.1.in 1970-01-01 01:00:00.000000000 +0100
-+++ icu/source/tools/icuinfo/icuinfo.1.in 2015-10-27 19:19:35.184056800 +0100
-@@ -0,0 +1,76 @@
-+.\" Hey, Emacs! This is -*-nroff-*- you know...
-+.\"
-+.\" icuinfo.1: manual page for the icuinfo utility
-+.\"
-+.\" Copyright (C) 2005-2006 International Business Machines Corporation and others
-+.\"
-+.TH ICUINFO 1 "1 May 2010" "ICU MANPAGE" "ICU @VERSION@ Manual"
-+.SH NAME
-+.B icuinfo
-+\- Shows some basic info about the current ICU
-+.SH SYNOPSIS
-+.B icuinfo
-+[
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+]
-+[
-+.BR "\-V\fP, \fB\-\-version"
-+]
-+[
-+.BR "\-c\fP, \fB\-\-copyright"
-+]
-+[
-+.BI "\-i\fP, \fB\-\-icudatadir" " directory"
-+]
-+[
-+.BR "\-v\fP, \fB\-\-verbose"
-+]
-+[
-+.BI "\-L\fP, \fB\-\-list-plugins"
-+]
-+[
-+.BI "\-m\fP, \fB\-\-milisecond-time"
-+]
-+[
-+.BI "\-K\fP, \fB\-\-cleanup"
-+]
-+.SH DESCRIPTION
-+.B icuinfo
-+prints basic information about the current version of ICU.
-+.SH OPTIONS
-+.TP
-+.BR "\-h\fP, \fB\-?\fP, \fB\-\-help"
-+Print help about usage and exit.
-+.TP
-+.BR "\-V\fP, \fB\-\-version"
-+Print the version of
-+.B icuinfo
-+and exit.
-+.TP
-+.BR "\-c\fP, \fB\-\-copyright"
-+Embeds the standard ICU copyright into the
-+.IR output-file .
-+.TP
-+.BR "\-v\fP, \fB\-\-verbose"
-+Display extra informative messages during execution.
-+.TP
-+.BI "\-i\fP, \fB\-\-icudatadir" " directory"
-+Look for any necessary ICU data files in
-+.IR directory .
-+For example, the file
-+.B pnames.icu
-+must be located when ICU's data is not built as a shared library.
-+The default ICU data directory is specified by the environment variable
-+.BR ICU_DATA .
-+Most configurations of ICU do not require this argument.
-+.TP
-+.BI "\-L\fP, \fB\-\-list-plugins"
-+If specified, list and diagnose issues with ICU plugins.
-+.TP
-+.BI "\-K\fP, \fB\-\-cleanup"
-+Attempt to unload plugins before exiting.
-+.TP
-+.BI "\-m\fP, \fB\-\-milisecond-time"
-+Print the current UTC time in milliseconds.
-+.SH COPYRIGHT
-+Copyright (C) 2010 International Business Machines Corporation and others
-diff -Nur orig.icu/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in
---- orig.icu/source/tools/icuinfo/Makefile.in 2015-10-08 05:53:56.000000000 +0200
-+++ icu/source/tools/icuinfo/Makefile.in 2015-10-27 19:23:19.115509906 +0100
-@@ -14,8 +14,15 @@
- ## Build directory information
- subdir = tools/icuinfo
-
-+TARGET_STUB_NAME = icuinfo
-+
-+SECTION = 1
-+
-+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
-+
-+
- ## Extra files to remove for 'make clean'
--CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
-+CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN) $(MAN_FILES)
-
- ## Target information
- TARGET = icuinfo$(EXEEXT)
-@@ -35,7 +42,8 @@
-
- ## List of phony targets
- .PHONY : all all-local install install-local clean clean-local \
--distclean distclean-local dist dist-local check check-local plugin-check
-+distclean distclean-local dist dist-local check check-local plugin-check \
-+install-man
-
- ## Clear suffix list
- .SUFFIXES :
-@@ -48,12 +56,16 @@
- dist: dist-local
- check: all check-local
-
--all-local: $(TARGET)
-+all-local: $(TARGET) $(MAN_FILES)
-
--install-local: all-local
-+install-local: all-local install-man
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
-
-+install-man: $(MAN_FILES)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-+ $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
-+
- dist-local:
-
- clean-local:
-@@ -103,6 +115,10 @@
- @echo "Plugins are disabled (use --enable-plugins to enable)"
- endif
-
-+%.$(SECTION): $(srcdir)/%.$(SECTION).in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
- ifeq (,$(MAKECMDGOALS))
- -include $(DEPS)
- else
diff --git a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch b/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
deleted file mode 100644
index 3debd3f..0000000
--- a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001
-From: Shane Carr <shane(a)unicode.org>
-Date: Mon, 29 Oct 2018 23:52:44 -0700
-Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing.
-
----
- icu4c/source/i18n/fmtable.cpp | 2 +-
- icu4c/source/i18n/number_decimalquantity.cpp | 5 ++++-
- icu4c/source/test/intltest/numfmtst.cpp | 8 ++++++++
- .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 ++++-
- .../impl/number/DecimalQuantity_DualStorageBCD.java | 10 +++++++++-
- .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 +++++
- 6 files changed, 31 insertions(+), 4 deletions(-)
-
-erAck:
-* obviously removed the icu4j *.java patch parts
-* stripped the icu4c/source/test/intltest/numfmtst.cpp part because it
- added code to a test that does not exist yet in ICU 62.1
- * TODO: when upgrading to ICU 63.1 add that back in from
- https://github.com/unicode-org/icu/commit/53d8c8f3d181d87a6aa925b449b51c4...
-
-diff --git a/icu4c/source/i18n/fmtable.cpp b/icu4c/source/i18n/fmtable.cpp
-index 45c7024fc29..8601d95f4a6 100644
---- a/icu4c/source/i18n/fmtable.cpp
-+++ b/icu4c/source/i18n/fmtable.cpp
-@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) {
- // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?).
- if (fDecimalQuantity->isZero()) {
- fDecimalStr->append("0", -1, status);
-- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) {
-+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status);
- } else {
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status);
-diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp
-index 47b930a564b..d5dd7ae694c 100644
---- a/icu4c/source/i18n/number_decimalquantity.cpp
-+++ b/icu4c/source/i18n/number_decimalquantity.cpp
-@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const {
- }
- result.append(u'E');
- int32_t _scale = upperPos + scale;
-- if (_scale < 0) {
-+ if (_scale == INT32_MIN) {
-+ result.append({u"-2147483648", -1});
-+ return result;
-+ } else if (_scale < 0) {
- _scale *= -1;
- result.append(u'-');
- } else {
diff --git a/sources b/sources
deleted file mode 100644
index f897dee..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (icu4c-62_1-src.tgz) = 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/sqlite-jdbc.git
by githook-noreply＠fedoraproject.org
The package rpms/sqlite-jdbc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/sqlite-jdbc.git/commit/?id=0cd70e....
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit 0cd70ee0e7fb3c918ae6b8299c28588db72658d2
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Sep 11 12:46:13 2019 +0200
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 65659df..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/sqlite-jdbc-b643d0cb28a3dc6618b77827e734f500b3ef1562.tar.gz
-/sqlite-jdbc-d271bbfbbd7f8c0f05df796bb6930bf324166d3b.tar.gz
-/sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.tar.gz
-/sqlite-jdbc-0ff4aaf6839786817143a4794dbe3211fc3eda15.tar.gz
-/sqlite-jdbc-3bd593eecdd223f0118a45182ba39fbbb067ca37.tar.gz
-/sqlite-jdbc-70a84beb468ba47060935f17877ae22228db3741.tar.gz
-/sqlite-jdbc-b6efb5f83befbc8ec297c9577451390d9e5b0447.tar.gz
-/sqlite-jdbc-3.15.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/sources b/sources
deleted file mode 100644
index 2c4a560..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-1ed2a1ad2754e03a5218fc352045b32b sqlite-jdbc-3.15.1.tar.gz
diff --git a/sqlite-jdbc-3.15.1-build.patch b/sqlite-jdbc-3.15.1-build.patch
deleted file mode 100644
index 406d4f2..0000000
--- a/sqlite-jdbc-3.15.1-build.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Nru sqlite-jdbc-3.15.1/Makefile sqlite-jdbc-3.15.1.build/Makefile
---- sqlite-jdbc-3.15.1/Makefile 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/Makefile 2016-11-06 12:15:06.926445700 +0100
-@@ -3,45 +3,37 @@
-
- RESOURCE_DIR = src/main/resources
-
--.phony: all package win32 win64 mac32 linux32 linux64 linux-arm linux-armhf native native-all deploy
-+.phony: all package win32 win64 mac32 linux native native-all deploy
-
- all: jni-header package
-
- deploy:
-- mvn package deploy -DperformRelease=true
-
--MVN:=mvn
-+
-+MVN:=xmvn -o
- SRC:=src/main/java
- SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH)
--SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
--SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
--SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-+#SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
-+#SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
-+#SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-
--CCFLAGS:= -I$(SQLITE_OUT) -I$(SQLITE_AMAL_DIR) $(CCFLAGS)
-+CCFLAGS:= -I$(SQLITE_OUT) $(CCFLAGS) -lsqlite3
-
- $(SQLITE_ARCHIVE):
-- @mkdir -p $(@D)
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2016/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2014/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/2013/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@ http://www.sqlite.org/$(SQLITE_OLD_AMAL_PREFIX).zip
-+
-
- $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
-- unzip -qo $< -d $(TARGET)/tmp.$(version)
-- (mv $(TARGET)/tmp.$(version)/$(SQLITE_AMAL_PREFIX) $(TARGET) && rmdir $(TARGET)/tmp.$(version)) || mv $(TARGET)/tmp.$(version)/ $(TARGET)/$(SQLITE_AMAL_PREFIX)
-- touch $@
-
-
--$(TARGET)/common-lib/org/sqlite/%.class: src/main/java/org/sqlite/%.java
-+
-+$(SQLITE_OUT)/org/sqlite/%.class: src/main/java/org/sqlite/%.java
- @mkdir -p $(@D)
-- $(JAVAC) -source 1.5 -target 1.5 -sourcepath $(SRC) -d $(TARGET)/common-lib $<
-+ $(JAVAC) -source 1.6 -target 1.6 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-
--jni-header: $(TARGET)/common-lib/NativeDB.h
-+jni-header: $(SQLITE_OUT)/NativeDB.h
-
--$(TARGET)/common-lib/NativeDB.h: $(TARGET)/common-lib/org/sqlite/core/NativeDB.class
-- $(JAVAH) -classpath $(TARGET)/common-lib -jni -o $@ org.sqlite.core.NativeDB
-+$(SQLITE_OUT)/NativeDB.h: $(SQLITE_OUT)/org/sqlite/core/NativeDB.class
-+ $(JAVAH) -classpath $(SQLITE_OUT) -jni -o $@ org.sqlite.core.NativeDB
-
- test:
- mvn test
-@@ -50,35 +42,11 @@
-
-
- $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
-- @mkdir -p $(@D)
-- perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
-- $(SQLITE_AMAL_DIR)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
--# insert a code for loading extension functions
-- perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" \
-- $(SQLITE_AMAL_DIR)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c
-- cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3.c
-- $(CC) -o $@ -c $(CCFLAGS) \
-- -DSQLITE_ENABLE_LOAD_EXTENSION=1 \
-- -DSQLITE_HAVE_ISNAN \
-- -DSQLITE_HAVE_USLEEP \
-- -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-- -DSQLITE_ENABLE_COLUMN_METADATA \
-- -DSQLITE_CORE \
-- -DSQLITE_ENABLE_FTS3 \
-- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-- -DSQLITE_ENABLE_FTS5 \
-- -DSQLITE_ENABLE_JSON1 \
-- -DSQLITE_ENABLE_RTREE \
-- -DSQLITE_ENABLE_STAT2 \
-- -DSQLITE_THREADSAFE=1 \
-- -DSQLITE_DEFAULT_MEMSTATUS=0 \
-- -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-- $(SQLITE_FLAGS) \
-- $(SQLITE_OUT)/sqlite3.c
-
--$(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c
-+
-+$(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c $(SQLITE_OUT)/NativeDB.h
- @mkdir -p $(@D)
-- $(CC) $(CCFLAGS) -I $(TARGET)/common-lib -c -o $(SQLITE_OUT)/NativeDB.o $(SRC)/org/sqlite/core/NativeDB.c
-+ $(CC) $(CCFLAGS) -I $(SQLITE_OUT) -c -o $(SQLITE_OUT)/NativeDB.o $(SRC)/org/sqlite/core/NativeDB.c
- $(CC) $(CCFLAGS) -o $@ $(SQLITE_OUT)/*.o $(LINKFLAGS)
- $(STRIP) $@
-
-@@ -88,7 +56,7 @@
- NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
-
- # For cross-compilation, install docker. See also https://github.com/dockcross/dockcross
--native-all: native win32 win64 linux32 linux64 linux-arm linux-armhf
-+native-all: native linux
-
- native: $(SQLITE_UNPACKED) $(NATIVE_DLL)
-
-@@ -99,33 +67,23 @@
- cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-
- win32: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-windows-x86 bash -c 'make clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86'
--
--win64: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-windows-x64 bash -c 'make clean-native native CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64'
-
--linux32: $(SQLITE_UNPACKED) jni-header
-- docker run -ti -v $$PWD:/work xerial/centos5-linux-x86 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86'
-
--linux64: $(SQLITE_UNPACKED) jni-header
-- docker run -ti -v $$PWD:/work xerial/centos5-linux-x86_64 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86_64'
-+win64: $(SQLITE_UNPACKED) jni-header
-
--linux-arm: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-armv5 bash -c 'make clean-native native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm'
-
--linux-armhf: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-armv6 bash -c 'make clean-native native CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf'
-+linux: $(SQLITE_UNPACKED) jni-header
-+ $(MAKE) native OS_NAME=Linux OS_ARCH=$(OS_ARCH)
-
- sparcv9:
-- $(MAKE) native OS_NAME=SunOS OS_ARCH=sparcv9
-+
-
- # deprecated
- mac32:
-- $(MAKE) native OS_NAME=Mac OS_ARCH=x86
-+
-
- package: native-all
-- rm -rf target/dependency-maven-plugin-markers
-- $(MVN) package
-+
-
- clean-native:
- rm -rf $(SQLITE_OUT)
-@@ -138,7 +96,7 @@
- rm -rf $(TARGET)/{surefire*,testdb.jar*}
-
- docker-linux64:
-- docker build -f docker/Dockerfile.linux_x86_64 -t xerial/centos5-linux-x86-64 .
-+
-
- docker-linux32:
-- docker build -f docker/Dockerfile.linux_x86 -t xerial/centos5-linux-x86 .
-+
-diff -Nru sqlite-jdbc-3.15.1/Makefile.common sqlite-jdbc-3.15.1.build/Makefile.common
---- sqlite-jdbc-3.15.1/Makefile.common 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/Makefile.common 2016-11-06 11:58:31.575085824 +0100
-@@ -47,50 +47,24 @@
-
- # os=Default is meant to be generic unix/linux
-
--known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
-+known_targets := Linux Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
- target := $(OS_NAME)-$(OS_ARCH)
-
--ifeq (,$(findstring $(strip $(target)),$(known_targets)))
-- target := Default
-+ifeq ($(OS_NAME),Linux)
-+ target := $(OS_NAME)
-+else
-+ target := $(OS_NAME)-$(OS_ARCH)
- endif
-
- # cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
- CROSS_PREFIX :=
-
--Default_CC := $(CROSS_PREFIX)gcc
--Default_STRIP := $(CROSS_PREFIX)strip
--Default_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC -fvisibility=hidden
--Default_LINKFLAGS := -shared
--Default_LIBNAME := libsqlitejdbc.so
--Default_SQLITE_FLAGS :=
--
--Linux-x86_CC := $(CROSS_PREFIX)gcc
--Linux-x86_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC -m32 -fvisibility=hidden
--Linux-x86_LINKFLAGS := -shared -static-libgcc
--Linux-x86_LIBNAME := libsqlitejdbc.so
--Linux-x86_SQLITE_FLAGS :=
--
--Linux-x86_64_CC := $(CROSS_PREFIX)gcc
--Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_64_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -m64 -fvisibility=hidden
--Linux-x86_64_LINKFLAGS := -shared -static-libgcc
--Linux-x86_64_LIBNAME := libsqlitejdbc.so
--Linux-x86_64_SQLITE_FLAGS :=
--
--Linux-arm_CC := $(CROSS_PREFIX)gcc
--Linux-arm_STRIP := $(CROSS_PREFIX)strip
--Linux-arm_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC -mfloat-abi=softfp -mfpu=vfp -fvisibility=hidden
--Linux-arm_LINKFLAGS := -shared -static-libgcc
--Linux-arm_LIBNAME := libsqlitejdbc.so
--Linux-arm_SQLITE_FLAGS :=
--
--Linux-armhf_CC := $(CROSS_PREFIX)gcc
--Linux-armhf_STRIP := $(CROSS_PREFIX)strip
--Linux-armhf_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=hard -mfpu=vfp -fPIC -fvisibility=hidden
--Linux-armhf_LINKFLAGS := -shared -static-libgcc
--Linux-armhf_LIBNAME := libsqlitejdbc.so
--Linux-armhf_SQLITE_FLAGS :=
-+Linux_CC := gcc
-+Linux_STRIP := strip
-+Linux_CCFLAGS := -I$(JAVA_HOME)/include $(CCFLAGS) -fPIC -fvisibility=hidden
-+Linux_LINKFLAGS := -shared -static-libgcc
-+Linux_LIBNAME := libsqlitejdbc.so
-+Linux_SQLITE_FLAGS :=
-
- FreeBSD-x86_64_CC := $(CROSS_PREFIX)cc
- FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip
-diff -Nru sqlite-jdbc-3.15.1/pom.xml sqlite-jdbc-3.15.1.build/pom.xml
---- sqlite-jdbc-3.15.1/pom.xml 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/pom.xml 2016-11-06 11:54:16.840693425 +0100
-@@ -84,7 +84,7 @@
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
-- <source>1.5</source>
-+ <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
diff --git a/sqlite-jdbc-Makefile b/sqlite-jdbc-Makefile
deleted file mode 100644
index 78094e7..0000000
--- a/sqlite-jdbc-Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Author: gil cattaneo <puntogil(a)libero.it>
-
-include VERSION
-
-ifndef JAVA_HOME
-$(warning Set JAVA_HOME environment variable)
-endif
-
-JAVA := "$$JAVA_HOME/bin/java"
-JAVAC := "$$JAVA_HOME/bin/javac"
-JAVAH := "$$JAVA_HOME/bin/javah"
-
-CXX := gcc
-STRIP := strip
-SRCDIR := src/main/java/org/sqlite/core
-JSRCDIR := src/main/java
-
-BUILD := target
-
-OSINFO_CLASS := org.sqlite.OSInfo
-#OSINFO_CLASS := org.sqlite.util.OSInfo
-
-ifndef OS_NAME
-OS_NAME := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --os)
-endif
-ifndef OS_ARCH
-OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
-endif
-
-sqlite := sqlite-$(version)
-TARGET := $(sqlite)-$(OS_NAME)-$(OS_ARCH)
-ODIR := $(BUILD)/$(TARGET)
-LIBNAME := libsqlitejdbc.so
-
-NATIVE_ROOT := org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
-NATIVE_DIR := src/main/resources/$(NATIVE_ROOT)
-NATIVE_TARGET_DIR := $(BUILD)/classes/$(NATIVE_ROOT)
-
-IGEN := $(ODIR)
-JCLASSESDIR := $(ODIR)
-SQLITE_OUT := $(ODIR)
-
-INCLUDE=-I$(SQLITE_OUT) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-_OBJ_STD = NativeDB.o
-OBJ_STD = $(patsubst %,$(ODIR)/%,$(_OBJ_STD))
-_JAVA = $(shell find $(JSRCDIR) -name "*.java" -print)
-
-.PHONY: clean native
-
-build: $(ODIR)/$(LIBNAME)
-
-$(ODIR)/$(LIBNAME): $(OBJ_STD)
- $(CXX) -shared -fPIC -static-libgcc -lsqlite3 $(CFLAGS) $(LDFLAGS) -o $@ $^
- $(STRIP) $@
-
-$(ODIR)/%.class: OSINFO_PROG
- mkdir -p $(ODIR)
- $(JAVAC) -d $(ODIR) @javafiles-list
-
-javafiles-list: $(_JAVA)
- echo $^ > javafiles-list
-
-$(ODIR)/%.o: $(SRCDIR)/%.c $(IGEN)/NativeDB.h
- mkdir -p $(ODIR)
- $(CXX) $(CFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -lsqlite3 -c -o $@ $<
-
-$(IGEN)/NativeDB.h: $(ODIR)/%.class
- mkdir -p $(IGEN)
- $(JAVAH) -o $(IGEN)/NativeDB.h -classpath $(ODIR) org.sqlite.core.NativeDB
-
-native: $(ODIR)/$(LIBNAME)
- @mkdir -p $(NATIVE_DIR)
- cp $< $(NATIVE_DIR)/$(LIBNAME)
- @mkdir -p $(NATIVE_TARGET_DIR)
- cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-
-OSINFO_PROG: javafiles-list
-# -rm -Rf lib/org/sqlite/OSInfo.class
-# cp src/main/java/org/sqlite/util/OSInfo.java lib/org/sqlite/OSInfo.java
-# sed -i "s|package org.sqlite.util;|package org.sqlite;|" lib/org/sqlite/OSInfo.java
- $(JAVAC) lib/org/sqlite/OSInfo.java -d lib
- $(eval OS_NAME=$(shell $(JAVA) -cp lib $(OSINFO_CLASS) --os))
- $(eval OS_ARCH=$(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch))
-
-clean:
- -rm javafiles-list
- -rm -Rf $(BUILD)
diff --git a/sqlite-jdbc-build.patch b/sqlite-jdbc-build.patch
deleted file mode 100644
index 1f94949..0000000
--- a/sqlite-jdbc-build.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile 2015-05-11 16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile 2015-05-12 10:54:53.068289878 +0200
-@@ -4,35 +4,33 @@
-
- RESOURCE_DIR = src/main/resources
-
--.phony: all package win32 mac32 linux32 native deploy
-+.phony: all package win32 mac32 linux native deploy
-
- all: package
-
- deploy:
-- mvn deploy
-
--MVN:=mvn
-+
-+MVN:=xmvn -o
- SRC:=src/main/java
- SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH)
--SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
--SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
--SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-+#SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
-+#SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
-+#SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-
-
--CCFLAGS:= -I$(SQLITE_OUT) -I$(SQLITE_AMAL_DIR) $(CCFLAGS)
-+CCFLAGS:= -I$(SQLITE_OUT) $(CCFLAGS) -lsqlite3
-
- $(SQLITE_ARCHIVE):
-- @mkdir -p $(@D)
-- curl -o$@ http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip
-+
-
- $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
-- unzip -qo $< -d $(TARGET)
-- touch $@
-+
-
-
- $(SQLITE_OUT)/org/sqlite/%.class: src/main/java/org/sqlite/%.java
- @mkdir -p $(@D)
-- $(JAVAC) -source 1.5 -target 1.5 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-+ $(JAVAC) -source 1.6 -target 1.6 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-
- jni-header: $(SQLITE_OUT)/NativeDB.h
-
-@@ -40,30 +38,13 @@
- $(JAVAH) -classpath $(SQLITE_OUT) -jni -o $@ org.sqlite.core.NativeDB
-
- test:
-- mvn test
-+
-
- clean: clean-native clean-java clean-tests
-
-
- $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
-- @mkdir -p $(@D)
-- perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
-- $(SQLITE_AMAL_DIR)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
--# insert a code for loading extension functions
-- perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" \
-- $(SQLITE_AMAL_DIR)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c
-- cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3.c
-- $(CC) -o $@ -c $(CCFLAGS) \
-- -DSQLITE_ENABLE_LOAD_EXTENSION=1 \
-- -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-- -DSQLITE_ENABLE_COLUMN_METADATA \
-- -DSQLITE_CORE \
-- -DSQLITE_ENABLE_FTS3 \
-- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-- -DSQLITE_ENABLE_RTREE \
-- -DSQLITE_ENABLE_STAT2 \
-- $(SQLITE_FLAGS) \
-- $(SQLITE_OUT)/sqlite3.c
-+
-
- $(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c $(SQLITE_OUT)/NativeDB.h
- @mkdir -p $(@D)
-@@ -92,19 +73,8 @@
- win64:
- $(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=x86_64
-
--linux32:
-- $(MAKE) native OS_NAME=Linux OS_ARCH=x86
--
--linux64:
-- $(MAKE) native OS_NAME=Linux OS_ARCH=x86_64
--
--# for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
--linux-arm:
-- $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm
--
--# for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabihf package
--linux-armhf:
-- $(MAKE) native CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf
-+linux:
-+ $(MAKE) native OS_NAME=Linux OS_ARCH=$(OS_ARCH)
-
- sparcv9:
- $(MAKE) native OS_NAME=SunOS OS_ARCH=sparcv9
-@@ -115,8 +85,7 @@
-
-
- package: $(NATIVE32_DLL) native
-- rm -rf target/dependency-maven-plugin-markers
-- $(MVN) package
-+
-
- clean-native:
- rm -rf $(TARGET)/$(sqlite)-$(OS_NAME)*
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.common sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.common
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.common 2015-05-11 16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.common 2015-05-12 10:57:04.669475556 +0200
-@@ -45,50 +45,24 @@
-
- # os=Default is meant to be generic unix/linux
-
--known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
-+known_targets := Linux Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
- target := $(OS_NAME)-$(OS_ARCH)
-
--ifeq (,$(findstring $(strip $(target)),$(known_targets)))
-- target := Default
-+ifeq ($(OS_NAME),Linux)
-+ target := $(OS_NAME)
-+else
-+ target := $(OS_NAME)-$(OS_ARCH)
- endif
-
- # cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
- CROSS_PREFIX :=
-
--Default_CC := $(CROSS_PREFIX)gcc
--Default_STRIP := $(CROSS_PREFIX)strip
--Default_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC -fvisibility=hidden
--Default_LINKFLAGS := -shared
--Default_LIBNAME := libsqlitejdbc.so
--Default_SQLITE_FLAGS :=
--
--Linux-x86_CC := $(CROSS_PREFIX)gcc
--Linux-x86_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC -m32 -fvisibility=hidden
--Linux-x86_LINKFLAGS := -shared -static-libgcc
--Linux-x86_LIBNAME := libsqlitejdbc.so
--Linux-x86_SQLITE_FLAGS :=
--
--Linux-x86_64_CC := $(CROSS_PREFIX)gcc
--Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_64_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -m64 -fvisibility=hidden
--Linux-x86_64_LINKFLAGS := -shared -static-libgcc
--Linux-x86_64_LIBNAME := libsqlitejdbc.so
--Linux-x86_64_SQLITE_FLAGS :=
--
--Linux-arm_CC := $(CROSS_PREFIX)gcc
--Linux-arm_STRIP := $(CROSS_PREFIX)strip
--Linux-arm_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=softfp -mfpu=vfp -fPIC -fvisibility=hidden
--Linux-arm_LINKFLAGS := -shared -static-libgcc
--Linux-arm_LIBNAME := libsqlitejdbc.so
--Linux-arm_SQLITE_FLAGS :=
--
--Linux-armhf_CC := $(CROSS_PREFIX)gcc
--Linux-armhf_STRIP := $(CROSS_PREFIX)strip
--Linux-armhf_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=hard -mfpu=vfp -fPIC -fvisibility=hidden
--Linux-armhf_LINKFLAGS := -shared -static-libgcc
--Linux-armhf_LIBNAME := libsqlitejdbc.so
--Linux-armhf_SQLITE_FLAGS :=
-+Linux_CC := gcc
-+Linux_STRIP := strip
-+Linux_CCFLAGS := -I$(JAVA_HOME)/include $(CCFLAGS) -fPIC -fvisibility=hidden
-+Linux_LINKFLAGS := -shared -static-libgcc
-+Linux_LIBNAME := libsqlitejdbc.so
-+Linux_SQLITE_FLAGS :=
-
- FreeBSD-x86_64_CC := $(CROSS_PREFIX)cc
- FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip
-@@ -162,13 +136,7 @@
- ifeq ($(OS_NAME),Windows)
- NATIVE32_DLL = win32
- else ifeq ($(OS_NAME),Linux)
-- ifeq ($(OS_ARCH),arm)
-- NATIVE32_DLL = linux-arm
-- else ifeq ($(OS_ARCH),armhf)
-- NATIVE32_DLL = linux-armhf
-- else
-- NATIVE32_DLL = linux32
-- endif
-+ NATIVE32_DLL = linux
- else ifeq ($(OS_NAME),Mac)
- NATIVE32_DLL = mac32
- endif
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.package sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.package
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.package 2015-05-11 16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.package 2015-05-12 10:58:42.264422080 +0200
-@@ -21,7 +21,7 @@
- AMD_WORK=work/hg/sqlite-jdbc
-
- BUILD_CMD = hg pull -u && make clean-native && make native
--TEST_CMD = mvn test
-+TEST_CMD = xmvn -o test
-
- all: compile test
-
-@@ -97,21 +97,15 @@
- cp $(LIB_PUREJAVA) $(RESOURCE_DIR)/org/sqlite
-
- test-native:
-- ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(TEST_CMD)"
-- ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(TEST_CMD)"
-- ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_WORK) && $(TEST_CMD)"
-- ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(TEST_CMD)"
-- ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(TEST_CMD)"
-
- test:
-- ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_WORK) && $(TEST_CMD) -DargLine='-Dsqlite.purejava=true'"
-+
-
- release:
-- mvn release:prepare
-- mvn release:perform
-+
-
- release-xerial:
-- mvn release:perform -Dtag=sqlite-jdbc-$(version)
-+
-
- release-sourceforge:
-- mvn release:perform -Darguments="-P sourceforge" -Dtag=sqlite-jdbc-$(version)
-+
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/pom.xml sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/pom.xml
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/pom.xml 2015-05-11 16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/pom.xml 2015-05-12 10:51:19.780333950 +0200
-@@ -45,6 +45,10 @@
- <resources>
- <resource>
- <directory>src/main/java</directory>
-+ <excludes>
-+ <exclude>**/*.java</exclude>
-+ <exclude>**/*.c</exclude>
-+ </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
-@@ -87,7 +91,7 @@
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
-- <source>1.5</source>
-+ <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
diff --git a/sqlite-jdbc.spec b/sqlite-jdbc.spec
deleted file mode 100644
index b5daa9d..0000000
--- a/sqlite-jdbc.spec
+++ /dev/null
@@ -1,240 +0,0 @@
-#%% global githash
-# empty debuginfo
-%global debug_package %nil
-
-Name: sqlite-jdbc
-Version: 3.15.1
-Release: 9%{?dist}
-Summary: SQLite JDBC library
-
-# ASL 2.0:
-# ./src/main/java/org/sqlite/SQLiteConfig.java
-# ./src/main/java/org/sqlite/SQLiteDataSource.java
-# ./src/main/java/org/sqlite/SQLiteErrorCode.java
-# ./src/main/java/org/sqlite/SQLiteJDBCLoader.java
-# ./src/main/java/org/sqlite/SQLiteOpenMode.java
-# ./src/main/java/org/sqlite/javax/SQLiteConnectionPoolDataSource.java
-# ./src/main/java/org/sqlite/javax/SQLitePooledConnection.java
-# ./src/main/java/org/sqlite/util/OSInfo.java
-# ./src/main/java/org/sqlite/util/ResourceFinder.java
-
-# ISC:
-# ./src/main/java/org/sqlite/Function.java
-# ./src/main/java/org/sqlite/JDBC.java
-# ./src/main/java/org/sqlite/SQLiteConnection.java:
-# ./src/main/java/org/sqlite/core/Codes.java
-# ./src/main/java/org/sqlite/core/CoreDatabaseMetaData.java
-# ./src/main/java/org/sqlite/core/CoreResultSet.java
-# ./src/main/java/org/sqlite/core/CoreStatement.java
-# ./src/main/java/org/sqlite/core/CorePreparedStatement.java
-# ./src/main/java/org/sqlite/core/DB.java
-# ./src/main/java/org/sqlite/core/NativeDB.c
-# ./src/main/java/org/sqlite/core/NativeDB.java
-
-# This package is a fork of zentus sqlite driver the
-# original code is under BSD license. See LICENSE.zentus
-# ./src/main/java/org/sqlite/Function.java
-# ./src/main/java/org/sqlite/JDBC.java
-# ./src/main/java/org/sqlite/core/Codes.java
-# ./src/main/java/org/sqlite/core/DB.java
-# ./src/main/java/org/sqlite/core/NativeDB.c
-# ./src/main/java/org/sqlite/core/NativeDB.java
-
-License: ASL 2.0 and BSD and ISC
-URL: https://github.com/xerial/sqlite-jdbc
-Source0: https://github.com/xerial/sqlite-jdbc/archive/%{version}/%{name}-%{versio...
-Patch0: %{name}-3.15.1-build.patch
-
-BuildRequires: gcc
-BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires: sqlite-devel
-
-
-%description
-SQLite JDBC, is a library for accessing and
-creating SQLite database files in Java.
-
-%package javadoc
-Summary: Javadoc for %{name}
-BuildArch: noarch
-
-%description javadoc
-This package contains javadoc for %{name}.
-
-%prep
-%setup -q -n %{name}-%{version}
-# Cleanup
-find . -name "*.class" -delete
-# Do not delete test resources
-find . -name "*.jar" ! -name "testdb.jar" -delete
-
-# Remove prebuilt libraries
-find -name "*.jnilib" -print -delete
-find -name "*.dll" -print -delete
-find -name "*.so" -print -delete
-find -name "*.h" -print -delete
-rm -r archive/* docker/*
-
-# extensions won't work with our sqlite (should be patched)
-# or use http://www.sqlite.org/2016/sqlite-amalgamation-3150100.zip
-# ./sqlite-amalgamation-3150100/shell.c
-# ./sqlite-amalgamation-3150100/sqlite3.c
-# ./sqlite-amalgamation-3150100/sqlite3.h
-# ./sqlite-amalgamation-3150100/sqlite3ext.h
-# disable extensions and remove tests for them
-# java.sql.SQLException: [SQLITE_ERROR] SQL error or missing database (no such function: radians)
-rm -r src/test/java/org/sqlite/ExtensionTest.java
-sed -i '/ExtensionTest/d' src/test/java/org/sqlite/AllTests.java
-# secondConnWillWait(org.sqlite.TransactionTest) Time elapsed: 23.213 sec
-rm -r src/test/java/org/sqlite/TransactionTest.java
-sed -i '/TransactionTest/d' src/test/java/org/sqlite/AllTests.java
-
-%ifarch %{power64}
-# failed test on big endian arches
-# ComparisonFailure: expected:<UTF-16[l]e> but was:<UTF-16[b]e>
-rm -r src/test/java/org/sqlite/SQLiteDataSourceTest.java
-sed -i '/SQLiteDataSourceTest/d' src/test/java/org/sqlite/AllTests.java
-%endif
-
-%patch0 -p1
-
-# Build JNI library. Use native task to avoid to run multiple, conflicting,
-# operations at the same time
-%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin:1.7 . '
-<dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.8.0</version>
- </dependency>
-</dependencies>
-
-<executions>
- <execution>
- <id>compile</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <javac destdir="lib"
- srcdir="lib"
- source="1.6" target="1.6" debug="on"
- classpathref="maven.plugin.classpath">
- <include name="**/OSInfo.java"/>
- </javac>
- <exec executable="make">
- <arg line="%{?_smp_mflags}
- JAVA_HOME=%{_jvmdir}/java
- JAVA=%{_jvmdir}/java/bin/java
- JAVAC=%{_jvmdir}/java/bin/javac
- JAVAH=%{_jvmdir}/java/bin/javah
- native"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-</executions>'
-
-# Used for build JNI library
-cp -p src/main/java/org/sqlite/util/OSInfo.java lib/org/sqlite/
-sed -i "s|package org.sqlite.util;|package org.sqlite;|" lib/org/sqlite/OSInfo.java
-
-%mvn_file org.xerial:%{name} %{name}
-
-%build
-
-%ifarch %{arm}
-opts='-f'
-%endif
-
-sed -i 's|$(CCFLAGS) -I|$(CCFLAGS) $(CFLAGS) -I|' Makefile
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
-sed -i 's|$(CCFLAGS) -o|$(CCFLAGS) $(LDFLAGS) -o|' Makefile
-LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS;
-%mvn_build $opts -- -Dmaven.test.failure.ignore=true
-
-%install
-%mvn_install
-
-%files -f .mfiles
-%doc CHANGELOG README.md Usage.md
-%license LICENSE* NOTICE
-
-%files javadoc -f .mfiles-javadoc
-%license LICENSE* NOTICE
-
-%changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Nov 10 2016 gil cattaneo <puntogil(a)libero.it> 3.15.1-2
-- fix rhbz#1392845,1392848,1392851,1392854
-
-* Sun Nov 06 2016 gil cattaneo <puntogil(a)libero.it> 3.15.1-1
-- update to 3.15.1
-
-* Thu Sep 22 2016 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-5
-- disable test suite on arm builder cause JVM crash
-
-* Mon Jun 20 2016 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-4
-- add missing build requires: maven-plugin-bundle
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.8.11.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Oct 05 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-2
-- fix for rhbz#1268789
-
-* Sun Oct 04 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-1
-- update to 3.8.11.2
-
-* Tue Aug 04 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.1-1
-- update to 3.8.11.1
-
-* Thu Jul 30 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11-1
-- update to 3.8.11
-
-* Tue Jul 28 2015 gil cattaneo <puntogil(a)libero.it> 3.8.10.2-1
-- update to 3.8.10.2
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.8.10.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 12 2015 gil cattaneo <puntogil(a)libero.it> 3.8.10.1-1
-- update to 3.8.10.1
-
-* Fri May 08 2015 gil cattaneo <puntogil(a)libero.it> 3.8.9.1-1
-- update to 3.8.9.1
-
-* Fri Apr 24 2015 gil cattaneo <puntogil(a)libero.it> 3.8.9-1
-- update to 3.8.9
-
-* Tue Apr 21 2015 gil cattaneo <puntogil(a)libero.it> 3.8.8.2-1
-- update to 3.8.8.2
-
-* Tue Apr 21 2015 gil cattaneo <puntogil(a)libero.it> 3.8.7-1
-- initial rpm
4 years, 9 months
- 1
- 0
Architecture specific change in rpms/compat-libvpx5.git
by githook-noreply＠fedoraproject.org
The package rpms/compat-libvpx5.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/compat-libvpx5.git/commit/?id=207....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit 207e7a76b1a04d3bbe1be161b860ea640f98b6ad
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Wed Sep 11 11:45:38 2019 +0100
Retire old compat package in F32+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index eb11a9d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/v1.7.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 83e96fe..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# compat-libvpx5
-
-The compat-libvpx5 package
\ No newline at end of file
diff --git a/compat-libvpx5.spec b/compat-libvpx5.spec
deleted file mode 100644
index 3e60f3d..0000000
--- a/compat-libvpx5.spec
+++ /dev/null
@@ -1,181 +0,0 @@
-%global somajor 5
-%global sominor 0
-%global sotiny 0
-%global soversion %{somajor}.%{sominor}.%{sotiny}
-
-Name: compat-libvpx5
-Summary: Compat package with libvpx libraries
-Version: 1.7.0
-Release: 2%{?dist}
-License: BSD
-#Source0: http://downloads.webmproject.org/releases/webm/%{name}-%{version}.tar.bz2
-Source0: https://github.com/webmproject/libvpx/archive/v%{version}.tar.gz
-# Thanks to debian.
-Source2: libvpx.ver
-URL: http://www.webmproject.org/code/
-BuildRequires: gcc
-BuildRequires: gcc-c++
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
-BuildRequires: doxygen, php-cli, perl(Getopt::Long)
-# Do not disable FORTIFY_SOURCE=2
-Patch0: libvpx-1.7.0-leave-fortify-source-on.patch
-
-# Explicitly conflict with older libvpx packages that ship libraries
-# with the same soname as this compat package
-Conflicts: libvpx < 1.8.0
-
-%description
-Compatibility package with libvpx libraries ABI version 5.
-
-%prep
-%setup -q -n libvpx-%{version}
-%patch0 -p1 -b .leave-fs-on
-
-%build
-%ifarch %{ix86}
-%global vpxtarget x86-linux-gcc
-%else
-%ifarch x86_64
-%global vpxtarget x86_64-linux-gcc
-%else
-%ifarch armv7hl
-%global vpxtarget armv7-linux-gcc
-%else
-%ifarch aarch64
-%global vpxtarget arm64-linux-gcc
-%else
-%global vpxtarget generic-gnu
-%endif
-%endif
-%endif
-%endif
-
-# History: The configure script used to reject the shared flag on the generic target.
-# This meant that we needed to fall back to manual shared lib creation.
-# However, the modern configure script permits the shared flag and assumes ELF.
-# Additionally, the libvpx.ver would need to be updated to work properly.
-# As a result, we disable this universally, but keep it around in case we ever need to support
-# something "special".
-%if "%{vpxtarget}" == "generic-gnu"
-%global generic_target 0
-%else
-%global generic_target 0
-%endif
-
-# only found in Fedora 28+
-%if 0%{?fedora} >= 28
-%set_build_flags
-%endif
-
-%ifarch armv7hl
-CROSS=armv7hl-redhat-linux-gnueabi- CHOST=armv7hl-redhat-linux-gnueabi-hardfloat ./configure \
-%else
-./configure --target=%{vpxtarget} \
-%endif
-%ifarch %{arm}
---disable-neon --disable-neon_asm \
-%endif
---enable-pic --disable-install-srcs \
---enable-vp9-decoder --enable-vp9-encoder \
---enable-experimental --enable-spatial-svc \
---enable-vp9-highbitdepth \
-%if ! %{generic_target}
---enable-shared \
-%endif
---prefix=%{_prefix} --libdir=%{_libdir} --size-limit=16384x16384
-
-# Hack our optflags in.
-sed -i "s|-O3|%{optflags}|g" libs-%{vpxtarget}.mk
-sed -i "s|-O3|%{optflags}|g" examples-%{vpxtarget}.mk
-sed -i "s|-O3|%{optflags}|g" docs-%{vpxtarget}.mk
-
-%ifarch armv7hl
-#hackety hack hack
-sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" libs-%{vpxtarget}.mk
-sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" examples-%{vpxtarget}.mk
-sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" docs-%{vpxtarget}.mk
-
-sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" libs-%{vpxtarget}.mk
-sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" examples-%{vpxtarget}.mk
-sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" docs-%{vpxtarget}.mk
-
-sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" libs-%{vpxtarget}.mk
-sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" examples-%{vpxtarget}.mk
-sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" docs-%{vpxtarget}.mk
-%endif
-
-make %{?_smp_mflags} verbose=true
-
-# Manual shared library creation
-# We should never need to do this anymore, and if we do, we need to fix the version-script.
-%if %{generic_target}
-mkdir tmp
-cd tmp
-ar x ../libvpx_g.a
-cd ..
-gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.%{somajor} -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{soversion} tmp/*.o
-rm -rf tmp
-%endif
-
-# Temporarily dance the static libs out of the way
-# mv libvpx.a libNOTvpx.a
-# mv libvpx_g.a libNOTvpx_g.a
-
-# We need to do this so the examples can link against it.
-# ln -sf libvpx.so.%{soversion} libvpx.so
-
-# make %{?_smp_mflags} verbose=true target=examples CONFIG_SHARED=1
-# make %{?_smp_mflags} verbose=true target=docs
-
-# Put them back so the install doesn't fail
-# mv libNOTvpx.a libvpx.a
-# mv libNOTvpx_g.a libvpx_g.a
-
-%install
-%ifarch armv7hl
-export CROSS=armv7hl-redhat-linux-gnueabi-
-export CHOST=armv7hl-redhat-linux-gnueabi-hardfloat
-%endif
-make DIST_DIR=%{buildroot}%{_prefix} dist
-
-# Simpler to label the dir as %%doc.
-if [ -d %{buildroot}%{_prefix}/docs ]; then
- mv %{buildroot}%{_prefix}/docs doc/
-fi
-
-# Again, we should never need to do this anymore.
-%if %{generic_target}
-install -p libvpx.so.%{soversion} %{buildroot}%{_libdir}
-pushd %{buildroot}%{_libdir}
-ln -sf libvpx.so.%{soversion} libvpx.so
-ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor}
-ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor}.%{sominor}
-popd
-%endif
-
-pushd %{buildroot}
-# Stuff we don't need.
-rm -rf .%{_prefix}/build/ .%{_prefix}/md5sums.txt .%{_libdir}*/*.a .%{_prefix}/CHANGELOG .%{_prefix}/README
-# No, bad google. No treat.
-mv .%{_bindir}/examples/* .%{_bindir}
-rm -rf .%{_bindir}/examples
-popd
-
-# Remove files that aren't needed for the compat package
-rm -rf %{buildroot}%{_bindir}
-rm -rf %{buildroot}%{_includedir}
-rm -rf %{buildroot}%{_libdir}/*.so
-rm -rf %{buildroot}%{_libdir}/pkgconfig/
-
-%files
-%license LICENSE
-%{_libdir}/libvpx.so.*
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Feb 05 2019 Pete Walter <pwalter(a)fedoraproject.org> - 1.7.0-1
-- Initial packaging
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ee30899
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Retire old compat package in F32+
diff --git a/libvpx-1.7.0-leave-fortify-source-on.patch b/libvpx-1.7.0-leave-fortify-source-on.patch
deleted file mode 100644
index 23099da..0000000
--- a/libvpx-1.7.0-leave-fortify-source-on.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libvpx-1.7.0/build/make/configure.sh.leave-fs-on libvpx-1.7.0/build/make/configure.sh
---- libvpx-1.7.0/build/make/configure.sh.leave-fs-on 2018-01-26 15:02:18.767645332 -0500
-+++ libvpx-1.7.0/build/make/configure.sh 2018-01-26 15:02:28.594420775 -0500
-@@ -1440,7 +1440,7 @@ EOF
-
- # Work around longjmp interception on glibc >= 2.11, to improve binary
- # compatibility. See http://code.google.com/p/webm/issues/detail?id=166
-- enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
-+ # enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
-
- # Check for strip utility variant
- ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable_feature gnu_strip
diff --git a/libvpx.ver b/libvpx.ver
deleted file mode 100644
index aa147ab..0000000
--- a/libvpx.ver
+++ /dev/null
@@ -1,79 +0,0 @@
-{ global:
-vpx_codec_build_config;
-vpx_codec_control_;
-vpx_codec_dec_init_ver;
-vpx_codec_decode;
-vpx_codec_destroy;
-vpx_codec_enc_config_default;
-vpx_codec_enc_config_set;
-vpx_codec_enc_init_ver;
-vpx_codec_encode;
-vpx_codec_error;
-vpx_codec_error_detail;
-vpx_codec_err_to_string;
-vpx_codec_get_caps;
-vpx_codec_get_cx_data;
-vpx_codec_get_frame;
-vpx_codec_get_global_headers;
-vpx_codec_get_mem_map;
-vpx_codec_get_preview_frame;
-vpx_codec_get_stream_info;
-vpx_codec_iface_name;
-vpx_codec_peek_stream_info;
-vpx_codec_register_put_frame_cb;
-vpx_codec_register_put_slice_cb;
-vpx_codec_set_cx_data_buf;
-vpx_codec_set_frame_buffer_functions;
-vpx_codec_set_mem_map;
-vpx_codec_version;
-vpx_codec_version_extra_str;
-vpx_codec_version_str;
-vpx_codec_vp8_algo;
-vpx_codec_vp8_cx;
-vpx_codec_vp8_cx_algo;
-vpx_codec_vp8_dx;
-vpx_codec_vp8_dx_algo;
-vpx_codec_vp9_cx;
-vpx_codec_vp9_cx_algo;
-vpx_codec_vp9_dx;
-vpx_codec_vp9_dx_algo;
-vpx_dec_control;
-vpx_dec_decode;
-vpx_dec_destroy;
-vpx_dec_error;
-vpx_dec_error_detail;
-vpx_dec_err_to_string;
-vpx_dec_get_caps;
-vpx_dec_get_frame;
-vpx_dec_get_mem_map;
-vpx_dec_get_stream_info;
-vpx_dec_iface_name;
-vpx_dec_init_ver;
-vpx_dec_peek_stream_info;
-vpx_dec_register_put_frame_cb;
-vpx_dec_register_put_slice_cb;
-vpx_dec_set_mem_map;
-vpx_dec_xma_init_ver;
-vpx_enc_vp8_algo;
-vpx_img_alloc;
-vpx_img_flip;
-vpx_img_free;
-vpx_img_set_rect;
-vpx_img_wrap;
-vpx_svc_dump_statistics;
-vpx_svc_encode;
-vpx_svc_get_buffer;
-vpx_svc_get_encode_frame_count;
-vpx_svc_get_frame_size;
-vpx_svc_get_layer_resolution;
-vpx_svc_get_message;
-vpx_svc_get_rc_stats_buffer;
-vpx_svc_get_rc_stats_buffer_size;
-vpx_svc_init;
-vpx_svc_is_keyframe;
-vpx_svc_release;
-vpx_svc_set_keyframe;
-vpx_svc_set_options;
-vpx_svc_set_quantizers;
-vpx_svc_set_scale_factors;
-local: *; };
diff --git a/sources b/sources
deleted file mode 100644
index 6954b10..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (v1.7.0.tar.gz) = 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
4 years, 9 months
- 1
- 0