8 changed files with 102 additions and 129 deletions
--- a/.fltk.metadata
+++ b/.fltk.metadata
@ -1 +0,0 @@
-8753055c01f91e5295570324d8af2c5bdd7a2943 fltk-1.3.8-source.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,2 @@
+SOURCES/fltk-1.3.4-1-source.tar.gz
 /fltk-1.3.4-1-source.tar.gz
-/fltk-1.3.5-source.tar.gz
-/fltk-1.3.6-source.tar.gz
-/fltk-1.3.8-source.tar.gz
--- a/fltk-1.3.4-fltk_config.patch
+++ b/fltk-1.3.4-fltk_config.patch
@ -1,8 +1,7 @@
-Index: fltk-1.3.6/fltk-config.in
-===================================================================
--- fltk-1.3.6.orig/fltk-config.in
-+++ fltk-1.3.6/fltk-config.in
-@@ -42,8 +42,8 @@ CXX="@CXX@"
+diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
+--- fltk-1.3.4-1/fltk-config.in.fltk_config	2016-01-30 20:49:56.000000000 -0600
+++ fltk-1.3.4-1/fltk-config.in	2017-03-04 12:29:28.910316677 -0600
+@@ -44,8 +44,8 @@ CXX="@CXX@"
 
 # flags for C++ compiler:
 ARCHFLAGS="@ARCHFLAGS@"
@ -13,7 +12,7 @@ Index: fltk-1.3.6/fltk-config.in
 LDFLAGS="@LDFLAGS@"
 LDLIBS="@LIBS@"
 OPTIM="@OPTIM@"
-@@ -226,7 +226,7 @@ if test "$BINARY_DIR" != ""; then
+@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then
     includes="-I$BINARY_DIR $includes"
 fi
 
@ -22,7 +21,7 @@ Index: fltk-1.3.6/fltk-config.in
     libs=-L$libdir
 else
     libs=
-@@ -234,23 +234,23 @@ fi
+@@ -236,28 +236,28 @@ fi
 
 # Calculate needed libraries
 LDSTATIC="$libdir/libfltk.a $LDLIBS"
@ -34,9 +33,9 @@ Index: fltk-1.3.6/fltk-config.in
     LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
 fi
 if test x$use_gl = xyes; then
-    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIBS@ $LDLIBS"
+-    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
 +    LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
-     LDSTATIC="$libdir/libfltk_gl.a @GLLIBS@ $LDSTATIC"
+     LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
 fi
 if test x$use_images = xyes; then
 -    LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
@ -50,3 +49,10 @@ Index: fltk-1.3.6/fltk-config.in
     LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
 fi
 
+-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
+-LDSTATIC="$LDFLAGS $LDSTATIC"
+LDLIBS="$libs $LDLIBS"
+#LDSTATIC="$LDFLAGS $LDSTATIC"
+ 
+ # Answer to user requests
+ if test -n "$echo_help"; then
--- a/fltk-1.3.4-x-fluid_mimetype.patch
+++ b/fltk-1.3.4-x-fluid_mimetype.patch
@ -0,0 +1,21 @@
+diff -up fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype fltk-1.3.4-1/fluid/Makefile
+--- fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype	2016-07-17 14:51:54.000000000 -0500
+++ fltk-1.3.4-1/fluid/Makefile	2017-03-04 12:42:00.573346286 -0600
+@@ -84,7 +84,7 @@ install-linux:
+ 		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ 	done
+ 	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
+-	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
+	#$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
+ 
+ install-osx:
+ 	echo Installing Fluid in $(DESTDIR)/Applications...
+@@ -104,7 +104,7 @@ uninstall:
+ uninstall-linux:
+ 	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
+ 	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
+-	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
+	#$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
+ 
+ uninstall-osx:
+ 	$(RM) -r $(DESTDIR)/Applications/fluid.app
--- a/fltk-cmake.patch
+++ b/fltk-cmake.patch
@ -1,13 +0,0 @@
-Index: fltk-1.3.6/CMake/setup.cmake
-===================================================================
--- fltk-1.3.6.orig/CMake/setup.cmake
-+++ fltk-1.3.6/CMake/setup.cmake
-@@ -62,7 +62,7 @@ if (WIN32 AND NOT CYGWIN)
- elseif (APPLE AND NOT OPTION_APPLE_X11)
-   set (FLTK_CONFIG_PATH FLTK.framework/Resources/CMake)
- else ()
-  set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
-+  set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk CACHE FILEPATH "Install location for cmake files.")
- endif (WIN32 AND NOT CYGWIN)
- 
- include(TestBigEndian)
--- a/fltk.spec
+++ b/fltk.spec
@ -1,46 +1,49 @@
 #global		snap r9671

+# TODO:
+# *  port .spec to use cmake
+
 # 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:	1%{?dist}
+Version:	1.3.4
+Release:	5%{?dist}

 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
+Group:		System Environment/Libraries
 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
+Source0:        http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz
 %endif

-Source1:        fltk-config.sh
+Source1: fltk-config.sh

-Patch0:         fltk-cmake.patch
+## FIXME/TODO: upstream these asap -- Rex
 # add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
-Patch1:         fltk-1.3.4-fltk_config.patch
+Patch1:        	fltk-1.3.4-fltk_config.patch
+
+## upstream patches
+
+## upstreamable patches
+Patch100: fltk-1.3.4-x-fluid_mimetype.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: libjpeg-devel
 BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(gl) pkgconfig(glu)
+BuildRequires: pkgconfig(gl) pkgconfig(glu) 
 BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(sm)
-BuildRequires: pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
+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: xorg-x11-utils
+BuildRequires: zlib-devel
+BuildRequires: autoconf

 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
@ -52,13 +55,9 @@ It provides modern GUI functionality without the bloat, and supports
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: libstdc++-devel
-Requires: pkgconfig(fontconfig)
 Requires: pkgconfig(gl) pkgconfig(glu)
 Requires: pkgconfig(ice) pkgconfig(sm)
 Requires: pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
-Requires: pkgconfig(libjpeg)
-Requires: pkgconfig(libpng)
-Requires: pkgconfig(zlib)
 %description devel
 %{summary}.

@ -78,26 +77,41 @@ Requires: %{name}-devel

 %prep
 %if 0%{?snap:1}
-%autosetup -p1 -n fltk-1.3.x-%{snap}
+%setup -q -n fltk-1.3.x-%{snap}
 %else
-%autosetup -p1
+%setup -q  -n fltk-%{version}-1
 %endif

+%patch1 -p1 -b .fltk_config
+%patch100 -p1 -b .x-fluid_mimetype
+
+# verbose build output
+sed -i.silent '\,^.SILENT:,d' makeinclude.in
+autoconf
+

 %build
-%cmake -DFLTK_CONFIG_PATH:PATH=%{_libdir}/cmake/fltk \
-       -DOpenGL_GL_PREFERENCE=GLVND \
-       -DOPTION_BUILD_HTML_DOCUMENTATION:BOOL=ON \
-       -DOPTION_BUILD_PDF_DOCUMENTATION:BOOL=OFF \
-       -DOPTION_BUILD_SHARED_LIBS:BOOL=ON
+# set DSOFLAGS too, used to link shlibs (LDFLAGS used only for static libs)
+%{?__global_ldflags:DSOFLAGS="%{__global_ldflags}" ; export DSOFLAGS}

-%cmake_build
+%configure \
+  --with-links \
+  --with-optim="%{optflags}" \
+  --disable-localjpeg \
+  --disable-localzlib \
+  --disable-localpng \
+  --enable-shared \
+  --enable-threads \
+  --enable-xdbe \
+  --enable-xinerama \
+  --enable-xft

-make docs -C %{_vpath_builddir}
+make %{?_smp_mflags}


 %install
-%cmake_install
+make install DESTDIR=$RPM_BUILD_ROOT
+make install-linux -C fluid DESTDIR=$RPM_BUILD_ROOT

 # we only apply this hack to multilib arch's
 %ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
@ -107,34 +121,42 @@ mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
 %endif

+# docs
+rm -rf __docs
+mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
+
+## unpackaged files
+# errant docs
+rm -rv $RPM_BUILD_ROOT%{_mandir}/cat*
+

 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop


-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig

 %files
 %doc ANNOUNCEMENT CHANGES CREDITS README
 %license COPYING
-%{_libdir}/libfltk.so.1.3*
-%{_libdir}/libfltk_forms.so.1.3*
-%{_libdir}/libfltk_gl.so.1.3*
-%{_libdir}/libfltk_images.so.1.3*
+%{_libdir}/libfltk.so.1.3
+%{_libdir}/libfltk_forms.so.1.3
+%{_libdir}/libfltk_gl.so.1.3
+%{_libdir}/libfltk_images.so.1.3

 %files devel
-%doc %{_vpath_builddir}/documentation/html
+%doc __docs/*
 %{_bindir}/fltk-config
 %{?arch:%{_bindir}/fltk-config-%{arch}}
 %{_includedir}/FL/
+%{_includedir}/Fl
 %{_libdir}/libfltk.so
 %{_libdir}/libfltk_forms.so
 %{_libdir}/libfltk_gl.so
 %{_libdir}/libfltk_images.so
-%{_libdir}/cmake/fltk/
 %{_mandir}/man1/fltk-config.1*
 %{_mandir}/man3/fltk.3*
-%{_mandir}/man6/*.6*

 %files static
 %{_libdir}/libfltk.a
@ -146,70 +168,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
 %{_bindir}/fluid
 %{_mandir}/man1/fluid.1*
 %{_datadir}/applications/fluid.desktop
-%{_datadir}/mime/packages/fluid.xml
 %{_datadir}/icons/hicolor/*/*/*


 %changelog
-* Fri Dec 17 2021 Jan Grulich <jgrulich@redhat.com> - 1.3.8-1
- 1.3.8
-  Resolves: bz#2025415
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.6-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 29 2021 Jan Grulich <jgrulich@redhat.com> - 1.3.6-1
- 1.3.6
-  Resolves: bz#1976712
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.5-11
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 21 2021 Adam Jackson <ajax@redhat.com> - 1.3.5-9
- Remove BuildRequires xprop entirely. If present, the configure script will call
-  it looking for a property on the root window that Fedora's X server does not
-  set, and which would not work anyway since there is no X server running in the
-  buildroot, so we can just remove the dependency.
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-8
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 1.3.5-7
- BuildRequires xprop not xorg-x11-server-utils
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu May 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-5
- restore fltk_config.patch lost in last (cmake) merge
-
-* Mon May 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-4
- merge cmake PR
- spec cosmetics
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Mar 03 2019 Richard Shaw <hobbes1069@gmail.com> - 1.3.5-1
- Update to 1.3.5.
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.3.4-6
- use %%make_build %%make_install %%ldconfig_scriptlets
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (fltk-1.3.8-source.tar.gz) = 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb
+SHA512 (fltk-1.3.4-1-source.tar.gz) = 0be1c8e6bb7a8c7ef484941a73868d5e40b90e97a8e5dc747bac2be53a350621975406ecfd4a9bcee8eeb7afd886e75bf7a6d6478fd6c56d16e54059f22f0891
				`@ -1 +0,0 @@`
				`8753055c01f91e5295570324d8af2c5bdd7a2943 fltk-1.3.8-source.tar.gz`