#6 epel9: Fix CMakeLists to use noarch cmake package install path
Merged 5 months ago by tdawson. Opened 5 months ago by carlwgeorge.
rpms/ carlwgeorge/breeze-icon-theme epel9-cmake-noarch-fix  into  epel9

file modified
+9 -3
@@ -9,7 +9,7 @@ 

  Name:    breeze-icon-theme

  Summary: Breeze icon theme

  Version: 5.108.0

- Release: 1%{?dist}

+ Release: 2%{?dist}

  

  # http://techbase.kde.org/Policies/Licensing_Policy

  License: LGPLv3+
@@ -64,7 +64,7 @@ 

  

  %package     devel

  Summary:     Breeze icon theme development files

- Requires:    %{name}%{?_isa} = %{version}-%{release}

+ Requires:    %{name} = %{version}-%{release}

  %description devel

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

  developing applications that use %{name}.
@@ -77,6 +77,9 @@ 

  sed -i -e "s|%{version}|%{kf5_version}|g" CMakeLists.txt

  %endif

  

+ # Fix FTI for -devel package

+ sed -e 's|\${KDE_INSTALL_CMAKEPACKAGEDIR}|%{_datadir}/cmake|g' -i CMakeLists.txt

+ 

  

  %build

  %cmake_kf5
@@ -155,7 +158,7 @@ 

  %exclude %{_datadir}/icons/breeze-dark/breeze-icons-dark.rcc

  

  %files devel

- %{_kf5_libdir}/cmake/KF5BreezeIcons/

+ %{_datadir}/cmake/KF5BreezeIcons/

  

  %files rcc

  %{_datadir}/icons/breeze/breeze-icons.rcc
@@ -163,6 +166,9 @@ 

  

  

  %changelog

+ * Wed Oct 04 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.108.0-2

+ - Fix CMakeLists to use noarch cmake package install path

+ 

  * Sun Jul 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.108.0-1

  - 5.108.0

  

This PR cherry-picks a few commits from the rawhide branch to the epel9 branch. These are needed to resolve rhbz#2252367. I went with cherry-picking instead of a fast-forward merge because I don't know if it's appropriate to update this package from 5.108.0 to 5.110.0 in EPEL. If a fast-forward merge is preferred, please close this PR and do that instead.

Thank you for this. I overlooked this as I concentrated on some of the harder kde packages that wouldn't install.

This cherry-pick is perfect. We can't update just one package, we have to do the whole bunch, and I'd prefer doing that in epel9-next so we can test it better before going into EPEL 9.

I'll merge and build this.

Pull-Request has been merged by tdawson

5 months ago