From 89be135877952b931c3cb6d736a55eb69f6038d9 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 12 2020 14:15:33 +0000 Subject: Workaround RPM problems when replacing a directory with a symbolic link https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1787079 --- diff --git a/python-notebook.spec b/python-notebook.spec index c021c49..92f17f5 100644 --- a/python-notebook.spec +++ b/python-notebook.spec @@ -12,7 +12,7 @@ Version: 6.0.2 # upstream version, like 1.2.3rc1 %global uversion %{version}%{tag} -Release: 3%{tag}%{?dist} +Release: 4%{tag}%{?dist} Summary: A web-based notebook environment for interactive computing License: BSD URL: http://jupyter.org @@ -166,6 +166,16 @@ export TMPDIR=$(pwd)/.tmp nosetests-3 -v --exclude-dir notebook/tests/selenium +# This was previously unbundled, but no more +# See https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/ +%pretrans -n python3-%{pypi_name} -p +path = "%{python3_sitelib}/%{pypi_name}/static/components/moment" +st = posix.stat(path) +if st and st.type == "link" then + os.remove(path) +end + + %files -n python3-%{pypi_name} %doc README.md %license LICENSE @@ -182,6 +192,9 @@ nosetests-3 -v --exclude-dir notebook/tests/selenium %changelog +* Thu Mar 12 2020 Miro Hrončok - 6.0.2-4 +- Workaround RPM problems when replacing a directory with a symbolic link (#1787079) + * Thu Jan 30 2020 Fedora Release Engineering - 6.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild