From 6ab01c0d48c027065c902e23c2c240db793a1ecc Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Aug 27 2022 21:02:17 +0000
Subject: Spec file modernization and fixes:


  Update to SPDX license tag
  Clean up spec file formatting
  Remove obsolete snapshot build support
  Migrate from uname -i to uname -m

---

diff --git a/fltk.spec b/fltk.spec
index bd2053a..837de0e 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,46 +1,37 @@
-#global		snap r9671
-
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-Summary:	C++ user interface toolkit
-Name:		fltk
-Version:	1.3.8
-Release:	3%{?dist}
+Name:		    fltk
+Version:	    1.3.8
+Release:	    4%{?dist}
+Summary:	    C++ user interface toolkit
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
-License:	LGPLv2+ with exceptions	
-URL:		http://www.fltk.org/
+License:	    LGPL-2.0-or-later with exceptions	
+URL:            http://www.fltk.org/
 
-%if "%{?snap:1}" == "1"
-Source0:        http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.bz2
-%else
 Source0:        http://fltk.org/pub/%{name}/%{version}/%{name}-%{version}-source.tar.gz
-%endif
-
 Source1:        fltk-config.sh
 
 Patch0:         fltk-cmake.patch
 # add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
 Patch1:         fltk-1.3.4-fltk_config.patch
 
-BuildRequires: gcc-c++
-BuildRequires: cmake
-BuildRequires: desktop-file-utils
-BuildRequires: doxygen
-BuildRequires: texlive-latex
-# fltk bug with pdf generation, investigate later
-#BuildRequires: texlive-epstopdf
-BuildRequires: pkgconfig(libjpeg)
-BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(gl) pkgconfig(glu) 
-BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(sm) 
-BuildRequires: pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) 
-BuildRequires: pkgconfig(xcursor)
-BuildRequires: pkgconfig(xproto)
-BuildRequires: pkgconfig(zlib)
-BuildRequires: make
+BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
+BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  texlive-latex
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(gl) pkgconfig(glu) 
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(sm) 
+BuildRequires:  pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) 
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
@@ -77,11 +68,7 @@ Requires: %{name}-devel
 
 
 %prep
-%if 0%{?snap:1}
-%autosetup -p1 -n fltk-1.3.x-%{snap}
-%else
 %autosetup -p1
-%endif
 
 
 %build
@@ -100,8 +87,8 @@ make docs -C %{_vpath_builddir}
 %cmake_install
 
 # we only apply this hack to multilib arch's
-%ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
-%global arch %(uname -i 2>/dev/null || echo undefined)
+%ifarch x86_64 %{ix86}
+%global arch %(uname -m 2>/dev/null || echo undefined)
 mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
    $RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
@@ -109,11 +96,12 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
 
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/fluid.desktop
 
 
 %ldconfig_scriptlets
 
+
 %files
 %doc ANNOUNCEMENT CHANGES CREDITS README
 %license COPYING
@@ -151,6 +139,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
 
 
 %changelog
+* Sat Aug 27 2022 Richard Shaw <hobbes1069@gmail.com> - 1.3.8-4
+- Spec file modernization and fixes:
+  Update to SPDX license tag
+  Clean up spec file formatting
+  Remove obsolete snapshot build support
+  Migrate from uname -i to uname -m
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild