Fix rhbz #1808694. Remove octave tar.gz from -fonts subpackage.
This commit is contained in:
parent
44443919ca
commit
822f9f6950
|
@ -0,0 +1,11 @@
|
||||||
|
diff -urp mathgl-2.4.2.1/CMakeLists.txt mathgl-2.4.2.1-norebuild_l10n/CMakeLists.txt
|
||||||
|
--- mathgl-2.4.2.1/CMakeLists.txt 2018-03-31 00:32:12.000000000 +0700
|
||||||
|
+++ mathgl-2.4.2.1-norebuild_l10n/CMakeLists.txt 2020-03-02 10:07:18.750912058 +0700
|
||||||
|
@@ -636,6 +636,7 @@ if(WIN32)
|
||||||
|
set(USE_GETTEXT 0)
|
||||||
|
set(MGL_USE_LIBINTL 0)
|
||||||
|
endif(WIN32)
|
||||||
|
+set(USE_GETTEXT 0)
|
||||||
|
|
||||||
|
if(enable-doc-info)
|
||||||
|
set(MGL_HAVE_DOC_INFO 1)
|
16
mathgl.spec
16
mathgl.spec
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
Name: mathgl
|
Name: mathgl
|
||||||
Version: 2.4.4
|
Version: 2.4.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Cross-platform library for making high-quality scientific graphics
|
Summary: Cross-platform library for making high-quality scientific graphics
|
||||||
Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
|
Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
|
||||||
Summary(ru): Библиотека для осуществления высококачественной визуализации данных
|
Summary(ru): Библиотека для осуществления высококачественной визуализации данных
|
||||||
|
@ -53,6 +53,12 @@ Patch7: mathgl-2.4.1-no_updatedb.patch
|
||||||
|
|
||||||
Patch8: mathgl-freeglut.patch
|
Patch8: mathgl-freeglut.patch
|
||||||
|
|
||||||
|
# Disable rebuild of l10n files, rhbz #1808694
|
||||||
|
# .mo files built in compile time contain time stamp what make them different
|
||||||
|
# between different archs (or not if you are lucky. I'm not.)
|
||||||
|
Patch9: mathgl-2.4.2.1-norebuild_l10n.patch
|
||||||
|
|
||||||
|
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
# mandatory packages
|
# mandatory packages
|
||||||
|
@ -339,6 +345,7 @@ done
|
||||||
%patch4 -p1 -b .no_octave
|
%patch4 -p1 -b .no_octave
|
||||||
%endif
|
%endif
|
||||||
%patch8 -p0 -b .freeglut
|
%patch8 -p0 -b .freeglut
|
||||||
|
%patch9 -p1 -b .norebuild_l10n
|
||||||
|
|
||||||
# Fix hardcoded Python version
|
# Fix hardcoded Python version
|
||||||
sed -i -e 's,3\.[0-9],%{python3_version},g' \
|
sed -i -e 's,3\.[0-9],%{python3_version},g' \
|
||||||
|
@ -431,6 +438,7 @@ rm -r %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/usr
|
||||||
# Serial
|
# Serial
|
||||||
make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install -p"
|
make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install -p"
|
||||||
%if 0%{?with_octave}
|
%if 0%{?with_octave}
|
||||||
|
rm -f %{buildroot}%{_datadir}/%{name}/mathgl.tar.gz
|
||||||
mkdir -p %{mgl_octarch_dir}
|
mkdir -p %{mgl_octarch_dir}
|
||||||
cp %{_target_platform}_serial/lang/%{octpkg}.tar.gz %{mgl_octarch_dir}/%{mgl_octarch_name}
|
cp %{_target_platform}_serial/lang/%{octpkg}.tar.gz %{mgl_octarch_dir}/%{mgl_octarch_name}
|
||||||
%octave_pkg_install
|
%octave_pkg_install
|
||||||
|
@ -586,7 +594,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mgllab.desktop
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files fonts
|
%files fonts
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/fonts/
|
||||||
|
|
||||||
%files common
|
%files common
|
||||||
%{_datadir}/pixmaps/*.png
|
%{_datadir}/pixmaps/*.png
|
||||||
|
@ -620,6 +628,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mgllab.desktop
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 02 2020 Dmitrij S. Kryzhevich <kryzhev@ispms.ru> - 2.4.4-3
|
||||||
|
- Remove octave tar.gz from -fonts subpackage.
|
||||||
|
- Disable rebuild of l10n. Fix rhbz #1808694.
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.4-2
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.4-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue