Accepting request 1251848 from X11:Utilities

OBS-URL: https://build.opensuse.org/request/show/1251848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slop?expand=0&rev=8

slop-glew_config_compat.patch

@@ -0,0 +1,34 @@
+From b8263adf2af85c53ceda77d28756baf7b1a9c5e4 Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Mon, 10 Mar 2025 15:50:43 +0100
+Subject: [PATCH] Work around incompatibility between CMake and glew
+
+CMake FindGLEW.cmake module and glew CMake config files are incompatible and cause
+build errors.
+To work around the issue, we first look for the glew config files and fall back to
+CMake's module.
+---
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5dac0a..4326b74 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,12 @@ find_package(X11 REQUIRED)
+ find_package(XExt REQUIRED)
+ 
+ if ( SLOP_OPENGL )
+-  find_package(GLEW REQUIRED)
++  find_package(glew CONFIG)
++  if(glew_FOUND)
++    set(GLEW_LIBRARIES GLEW::glew)
++  else()
++    find_package(GLEW REQUIRED)
++  endif()
+   find_package(OpenGL REQUIRED)
+   find_package(GLX REQUIRED)
+   find_package(XRender REQUIRED)
+-- 
+2.48.1
+

slop.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 10 14:56:28 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add build fix for factory:
+  * slop-glew_config_compat.patch
+- Spec cleanup
+
 -------------------------------------------------------------------
 Mon Apr 25 14:10:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

slop.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package slop
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,17 +26,19 @@ License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Other
 URL:            https://github.com/naelstrof/slop
 Source0:        https://github.com/naelstrof/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE
+Patch0:         slop-glew_config_compat.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gengetopt
 BuildRequires:  glm-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(imlib2)
 BuildRequires:  pkgconfig(xrandr)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 slop (Select Operation) queries for a selection from the user and prints
@@ -64,25 +66,22 @@ Requires:       %{lname} = %{version}
 Header files for the slop library.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake
-make %{?_smp_mflags}
+%cmake_build
 
 %install
-pushd build/
-%make_install
-popd
+%cmake_install
 
-%post   -n %{lname} -p /sbin/ldconfig
-%postun -n %{lname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{lname}
 
 %files
 %license COPYING
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/*.1%{?ext_man}
 
 %files -n %{lname}
 %{_libdir}/libslopy.so.7*