#3 Fix flatpak build
Merged a year ago by than. Opened a year ago by yselkowitz.
rpms/ yselkowitz/kcalc rawhide  into  rawhide

file modified
+4 -12
@@ -1,8 +1,3 @@ 

- # docbook-related build busted on flatpak, omit for now -- rdieter

- %if 0%{?flatpak}

- %global no_docbook 1

- %endif

- 

  Name:    kcalc 

  Summary: Scientific Calculator 

  Version: 22.12.2
@@ -78,15 +73,9 @@ 

  %prep

  %autosetup -p1

  

- %if 0%{?no_docbook}

- sed -i.nodoc -e 's|^add_subdirectory(doc)|#add_subdirectory(doc)|g' CMakeLists.txt && \

- mv doc doc.no_docbook

- rm -rfv po/*/docs

- %endif

- 

  

  %build

- %cmake_kf5

+ %cmake_kf5 %{?flatpak:-DINSTALL_ICONS=ON}

  

  %cmake_build

  
@@ -111,6 +100,9 @@ 

  %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml

  %{_kf5_datadir}/kconf_update/%{name}*

  %{_kf5_datadir}/config.kcfg/%{name}.kcfg

+ %if 0%{?flatpak}

+ %{_kf5_datadir}/icons/hicolor/*/*/accessories-calculator.*

+ %endif

  

  

  %changelog

Docbook is now buildable in flatpaks, but we do need the icons (as in the Flathub build) for the rename-icon operation.

Please also merge into f38 branch, but no revbump or new build is needed (as only a flatpak build is affected).

Pull-Request has been merged by than

a year ago
Metadata