Attachment 1974058 Details for Bug 2193288 – The .spec file difference from Copr build 5897230 to 6142575

[patch] The .spec file difference from Copr build 5897230 to 6142575

spec-from-5897230-to-6142575.diff (text/plain), 4.84 KB, created by Fedora Review Service on 2023-07-05 03:44:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2023-07-05 03:44:14 UTC

Size: 4.84 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/5897230
>+++ https://copr.fedorainfracloud.org/coprs/build/6142575
>@@ -1,46 +1,49 @@
> %bcond_without python
>+
> %ifarch %{java_arches}
> %bcond_without java
> %else
> %bcond_with java
> %endif
>+
> # most of the tests failed, disabled for now
> # https://koji.fedoraproject.org/koji/taskinfo?taskID=100720047
>-%bcond_with check
>+%bcond_with tests
>+
>+%global forgeurl https://github.com/f3d-app/f3d
>+Version:        2.1.0
>+%forgemeta
> 
> Name:           f3d
>-Version:        2.0.0
> Release:        %autorelease
> Summary:        Fast and minimalist 3D viewer
> 
>-License:        BSD-3-Clause AND MIT
>-URL:            https://github.com/f3d-app/f3d
>-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
>-# https://github.com/f3d-app/f3d/pull/782
>-Patch0:         f3d-fix-cmake-config.patch
>+License:        BSD-3-Clause
>+URL:            %{forgeurl}
>+Source0:        %{forgesource}
>+
>+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
>+ExcludeArch: %{ix86}
> 
> BuildRequires:  gcc-c++
> BuildRequires:  cmake
> BuildRequires:  ninja-build
>+BuildRequires:  json-devel
>+BuildRequires:  cxxopts-devel
> BuildRequires:  vtk-devel
> BuildRequires:  lapack-devel
> # generate manpage
> BuildRequires:  help2man
>-BuildRequires:  chrpath
>-
>-# build error on i386 with enabling F3D_PLUGIN_BUILD_ASSIMP option
>-# https://src.fedoraproject.org/rpms/assimp/pull-request/6
>-# https://bugzilla.redhat.com/show_bug.cgi?id=1943862#c6
>-%ifnarch %{ix86}
> BuildRequires:  assimp-devel
>-%endif
> # imported target "draco::draco_static" references the file "/usr/lib64/libdraco.a" does not exist.
> # https://bugzilla.redhat.com/show_bug.cgi?id=2193023
> BuildRequires:  draco-static
> BuildRequires:  alembic-devel
> BuildRequires:  opencascade-devel
> BuildRequires:  imath-devel
>+
> BuildRequires:  desktop-file-utils
>+BuildRequires:  libappstream-glib
> 
> Requires:       hicolor-icon-theme
> Requires:       shared-mime-info
>@@ -73,35 +76,41 @@
> Provides:       python3-%{name} = %{version}-%{release}
> 
> %description    python3
>-The python3-%{name} package contains Python 3 bindings for %{name}.
>+This package contains Python 3 bindings for %{name}.
> %endif
> 
> %if %{with java}
> %package        java
> Summary:        Java bindings for the %{name}
>+BuildRequires:  javapackages-tools
> BuildRequires:  java-devel
>+Requires:       javapackages-tools
> Requires:       %{name}%{?_isa} = %{version}-%{release}
> 
> %description    java
>-The %{name}-java package contains Java bindings for %{name}.
>+This package contains Java bindings for %{name}.
> %endif
> 
> %prep
>-%autosetup -p1
>+%forgeautosetup -p1
>+
>+# remove bundled libraries of cxxopts and nlohmann_json
>+rm -rf external/
> 
> %build
> %cmake \
>     -GNinja \
>     -DCMAKE_BUILD_TYPE=Release \
>     -DF3D_PLUGINS_STATIC_BUILD=OFF \
>+    -DF3D_PLUGINS_INSTALL_DIR=%{_libdir}/f3d/plugins \
>+    -DF3D_USE_EXTERNAL_CXXOPTS=ON \
>+    -DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON \
>     -DF3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX=ON \
>     -DF3D_LINUX_GENERATE_MAN=ON \
>     -DF3D_MODULE_RAYTRACING=OFF \
>     -DF3D_MODULE_EXTERNAL_RENDERING=OFF  \
>     -DF3D_PLUGIN_BUILD_ALEMBIC=ON \
>-%ifnarch %{ix86}
>     -DF3D_PLUGIN_BUILD_ASSIMP=ON \
>-%endif
>     -DF3D_PLUGIN_BUILD_DRACO=ON \
>     -DF3D_PLUGIN_BUILD_EXODUS=ON \
>     -DF3D_PLUGIN_BUILD_OCCT=ON \
>@@ -114,6 +123,8 @@
> %if %{with check}
>     -DBUILD_TESTING=ON \
> %endif
>+    -DCMAKE_SKIP_INSTALL_RPATH=ON \
>+
> %cmake_build
> 
> %install
>@@ -126,18 +137,13 @@
> rm -r %{buildroot}%{_datadir}/doc/F3D
> rm %{buildroot}%{_libdir}/libVTKExtensions*.a
> 
>-# Binaries are not allowed to contain rpaths
>-chrpath --delete %{buildroot}%{_libdir}/libf3d.so
>-chrpath --delete %{buildroot}%{_libdir}/libf3d-plugin-*.so
>-chrpath --delete %{buildroot}%{python3_sitearch}/f3d.cpython-*.so
>-
>-
>-%if %{with check}
> %check
>+%if %{with tests}
> %ctest
>+%endif
> 
> desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
>-%endif
>+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
> 
> %files
> %license LICENSE.md
>@@ -151,18 +157,29 @@
> %{_datadir}/applications/f3d-plugin-*.desktop
> %{_datadir}/applications/f3d.desktop
> %{_datadir}/mime/packages/f3d-*.xml
>+%dir %{_datadir}/f3d
>+%dir %{_datadir}/f3d/configs
>+%dir %{_datadir}/f3d/configs/config.d
>+%dir %{_datadir}/f3d/configs/thumbnail.d
>+%dir %{_datadir}/f3d/plugins
> %{_datadir}/f3d/configs/config.d/*.json
> %{_datadir}/f3d/configs/thumbnail.d/*.json
> %{_datadir}/f3d/plugins/*.json
> %{_datadir}/thumbnailers/f3d-plugin-*.thumbnailer
>+
> %{_mandir}/man1/f3d.1.gz
> %{_metainfodir}/app.f3d.F3D.metainfo.xml
> 
>-%{_libdir}/libf3d.so
>-%{_libdir}/libf3d-plugin-*.so
>+%{_libdir}/libf3d.so.2*
>+%dir %{_libdir}/f3d
>+%dir %{_libdir}/f3d/plugins
>+%{_libdir}/f3d/plugins/libf3d-plugin-*.so
> 
> %files devel
>+%{_libdir}/libf3d.so
>+%dir %{_includedir}/f3d
> %{_includedir}/f3d/*.h
>+%dir %{_libdir}/cmake/f3d
> %{_libdir}/cmake/f3d/*.cmake
> %{_libdir}/cmake/f3d/*.in
>

Actions: View | Diff

Attachments on bug 2193288: 1963375 | 1974058