rpms/icu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'remotes/origin/pr/2'

Browse Source
This commit is contained in:
Eike Rathke 2020-07-22 00:27:51 +02:00
commit 7f2f3a0c61
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu.spec
View File

@ -2,7 +2,7 @@
Name: icu Name: icu
Version: 67.1 Version: 67.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: International Components for Unicode Summary: International Components for Unicode
License: MIT and UCD and Public Domain License: MIT and UCD and Public Domain
@ -90,13 +90,13 @@ test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepen
# more verbosity for build.log # more verbosity for build.log
sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile
make %{?_smp_mflags} VERBOSE=1 %make_build
make %{?_smp_mflags} doc %make_build doc
%install %install
rm -rf $RPM_BUILD_ROOT source/__docs rm -rf $RPM_BUILD_ROOT source/__docs
make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT %make_install %{?_smp_mflags} -C source
make %{?_smp_mflags} -C source install-doc docdir=__docs make %{?_smp_mflags} -C source install-doc docdir=__docs
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
( (
@ -113,9 +113,9 @@ if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; th
fi fi
%ifarch i686 %ifarch i686
# F26 since the mass rebuild in 2017-Feb fails a check, ignore error. TODO: find cause / disable only one. # F26 since the mass rebuild in 2017-Feb fails a check, ignore error. TODO: find cause / disable only one.
make %{?_smp_mflags} -C source check ||: %make_build -C source check ||:
%else %else
make %{?_smp_mflags} -C source check %make_build -C source check
%endif %endif
# log available codes # log available codes
@ -179,9 +179,13 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%changelog %changelog
* Tue Jul 21 2020 Eike Rathke <erack@redhat.com> - 67.1-2 * Tue Jul 21 2020 Eike Rathke <erack@redhat.com> - 67.1-3
- Replace unversioned %%{__python} macro with %%{__python3} - Replace unversioned %%{__python} macro with %%{__python3}
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 67.1-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 67.1-1 * Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 67.1-1
- Update to 67.1 - Update to 67.1