diff options
| author | Ron Olson <tachoknight@gmail.com> | 2019-03-15 10:12:47 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2019-03-15 10:12:47 -0500 |
| commit | 6935682642ccb1f5693a0995287a551acf002e1d (patch) | |
| tree | 83a140349ed1d61aa6ad8d06b1f229ff40a4f630 | |
| parent | f6ca0db8a53bf6f9721bd239e77e5b86868d0804 (diff) | |
| download | swift-lang-6935682642ccb1f5693a0995287a551acf002e1d.tar.gz swift-lang-6935682642ccb1f5693a0995287a551acf002e1d.tar.xz swift-lang-6935682642ccb1f5693a0995287a551acf002e1d.zip | |
Works with python3-sphinx after Fedora 30
| -rw-r--r-- | swift-lang.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index 30f1d89..f7f9d7e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -24,11 +24,11 @@ Source10: https://github.com/apple/swift-llbuild/archive/swift-%{swifttag} Source11: https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz Source12: https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz Source13: swift-lang.conf -Source14: swift-lang-runtime.conf +Source14: swift-lang-runtime.conf Patch0: change-lldb-location.patch -Patch1: no-ninja-build.patch -Patch2: clangloc.patch +Patch1: no-ninja-build.patch +Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch Patch4: gettid.patch Patch5: swift-unwrapped.patch @@ -53,14 +53,19 @@ BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel BuildRequires: libicu-devel +# python2-sphinx was removed after f30 +%if 0%{?fedora} > 30 +BuildRequires: python3-sphinx +%else BuildRequires: python2-sphinx +%endif BuildRequires: ninja-build Requires: glibc-devel Requires: clang -Requires: ncurses-devel -Requires: ncurses-compat-libs -Requires: %{name}-runtime = %{version}-%{release} +Requires: ncurses-devel +Requires: ncurses-compat-libs +Requires: %{name}-runtime = %{version}-%{release} ExclusiveArch: x86_64 aarch64 @@ -224,6 +229,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Fri Mar 14 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 +- python2-sphinx was removed from Fedora after 30 so it will use the python3 + version * Thu Mar 14 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 - Fixed issues introduced by upstream changes * Mon Mar 11 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 |