#4 Exclude doc package from flatpak build
Merged 4 years ago by otaylor. Opened 4 years ago by sbergmann.
rpms/ sbergmann/libtommath flatpak  into  master

file modified
+10 -1
@@ -7,9 +7,11 @@ 

  

  Source0:        https://github.com/libtom/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz

  

+ BuildRequires:  libtool

+ 

+ %if ! 0%{?flatpak}

  BuildRequires:  ghostscript

  BuildRequires:  libtiff-tools

- BuildRequires:  libtool

  BuildRequires:  texlive-dvips-bin

  BuildRequires:  ghostscript-tools-dvipdf

  BuildRequires:  texlive-latex-bin-bin
@@ -19,6 +21,7 @@ 

  BuildRequires:  tex(cmr10.tfm)

  BuildRequires:  tex(fancyhdr.sty)

  BuildRequires:  tex(hyphen.tex)

+ %endif

  

  %description

  A free open source portable number theoretic multiple-precision integer library
@@ -34,6 +37,7 @@ 

  The %{name}-devel package contains libraries and header files for developing

  applications that use %{name}.

  

+ %if ! 0%{?flatpak}

  %package        doc

  Summary:        Documentation files for %{name}

  BuildArch:      noarch
@@ -42,6 +46,7 @@ 

  

  %description    doc

  The %{name}-doc package contains PDF documentation for using %{name}.

+ %endif

  

  %prep

  %setup -q
@@ -56,7 +61,9 @@ 

  %build

  %set_build_flags

  %make_build V=1 CFLAGS="$CFLAGS -I./" -f makefile.shared

+ %if ! 0%{?flatpak}

  make V=1 -f makefile poster manual docs

+ %endif

  

  %install

  %make_install V=1 CFLAGS="$CFLAGS -I./" PREFIX=%{_prefix} LIBPATH=%{_libdir} -f makefile.shared
@@ -75,8 +82,10 @@ 

  %{_libdir}/*.so

  %{_libdir}/pkgconfig/*.pc

  

+ %if ! 0%{?flatpak}

  %files doc

  %doc doc/bn.pdf doc/poster.pdf doc/tommath.pdf

+ %endif

  

  %changelog

  * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2

The problem is that the BuildRequires ghostscript.spec in turn has a

Requires: %{_bindir}/dvips

which would expand to non-existent /app/bin/dvips when libtommath is built as a
flatpak (as a dependency of building libreoffice as a flatpak), which would
break the build. The easiest fix appears to be to just not build docs for the
flatpak case.

Ideally this would go into all from master down to f31. But just master is fine for now, too.

Pull-Request has been merged by otaylor

4 years ago

I've merged this to master to f31, f32, and master. Hopefully will not be controversial, but let us know if you want this adjusted in any way. Thanks!