.fltk.metadata

@@ -1 +1 @@
-0a2a40e34094b9758dc8552ffb32ae444bce8577 SOURCES/fltk-1.3.4-1-source.tar.gz
+8753055c01f91e5295570324d8af2c5bdd7a2943 SOURCES/fltk-1.3.8-source.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/fltk-1.3.4-1-source.tar.gz
+SOURCES/fltk-1.3.8-source.tar.gz

SOURCES/fltk-1.3.4-fltk_config.patch

@@ -1,7 +1,8 @@
-diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
+Index: fltk-1.3.6/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
+--- fltk-1.3.6.orig/fltk-config.in
-@@ -44,8 +44,8 @@ CXX="@CXX@"
++++ fltk-1.3.6/fltk-config.in
+@@ -42,8 +42,8 @@ CXX="@CXX@"
  
  # flags for C++ compiler:
  ARCHFLAGS="@ARCHFLAGS@"
@@ -12,7 +13,7 @@ diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
  LDFLAGS="@LDFLAGS@"
  LDLIBS="@LIBS@"
  OPTIM="@OPTIM@"
-@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then
+@@ -226,7 +226,7 @@ if test "$BINARY_DIR" != ""; then
      includes="-I$BINARY_DIR $includes"
  fi
  
@@ -21,7 +22,7 @@ diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
      libs=-L$libdir
  else
      libs=
-@@ -236,28 +236,28 @@ fi
+@@ -234,23 +234,23 @@ fi
  
  # Calculate needed libraries
  LDSTATIC="$libdir/libfltk.a $LDLIBS"
@@ -33,9 +34,9 @@ diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
      LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
  fi
  if test x$use_gl = xyes; then
--    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
+-    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIBS@ $LDLIBS"
 +    LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
-     LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
+     LDSTATIC="$libdir/libfltk_gl.a @GLLIBS@ $LDSTATIC"
  fi
  if test x$use_images = xyes; then
 -    LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
@@ -49,10 +50,3 @@ diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/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

SOURCES/fltk-1.3.4-x-fluid_mimetype.patch

@@ -1,21 +0,0 @@
-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

SOURCES/fltk-cmake.patch

@@ -0,0 +1,13 @@
+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)

SPECS/fltk.spec

@@ -1,39 +1,37 @@
 #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.4
+Version:	1.3.8
-Release:	5%{?dist}
+Release:	1%{?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/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz
+Source0:        http://fltk.org/pub/%{name}/%{version}/%{name}-%{version}-source.tar.gz
 %endif
 
 Source1:        fltk-config.sh
 
-## FIXME/TODO: upstream these asap -- Rex
+Patch0:         fltk-cmake.patch
 # add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
 Patch1:         fltk-1.3.4-fltk_config.patch
 
-## upstream patches
+BuildRequires: gcc-c++
-
+BuildRequires: cmake
-## upstreamable patches
-Patch100: fltk-1.3.4-x-fluid_mimetype.patch
-
 BuildRequires: desktop-file-utils
-BuildRequires: libjpeg-devel
+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)
@@ -41,9 +39,8 @@ BuildRequires: pkgconfig(sm)
 BuildRequires: pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
 BuildRequires: pkgconfig(xcursor)
 BuildRequires: pkgconfig(xproto)
-BuildRequires: xorg-x11-utils
+BuildRequires: pkgconfig(zlib)
-BuildRequires: zlib-devel
+BuildRequires: make
-BuildRequires: autoconf
 
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
@@ -55,9 +52,13 @@ 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}.
 
@@ -77,41 +78,26 @@ Requires: %{name}-devel
 
 %prep
 %if 0%{?snap:1}
-%setup -q -n fltk-1.3.x-%{snap}
+%autosetup -p1 -n fltk-1.3.x-%{snap}
 %else
-%setup -q  -n fltk-%{version}-1
+%autosetup -p1
 %endif
 
-%patch1 -p1 -b .fltk_config
-%patch100 -p1 -b .x-fluid_mimetype
-
-# verbose build output
-sed -i.silent '\,^.SILENT:,d' makeinclude.in
-autoconf
-
 
 %build
-# set DSOFLAGS too, used to link shlibs (LDFLAGS used only for static libs)
+%cmake -DFLTK_CONFIG_PATH:PATH=%{_libdir}/cmake/fltk \
-%{?__global_ldflags:DSOFLAGS="%{__global_ldflags}" ; export DSOFLAGS}
+       -DOpenGL_GL_PREFERENCE=GLVND \
+       -DOPTION_BUILD_HTML_DOCUMENTATION:BOOL=ON \
+       -DOPTION_BUILD_PDF_DOCUMENTATION:BOOL=OFF \
+       -DOPTION_BUILD_SHARED_LIBS:BOOL=ON
 
-%configure \
+%cmake_build
-  --with-links \
-  --with-optim="%{optflags}" \
-  --disable-localjpeg \
-  --disable-localzlib \
-  --disable-localpng \
-  --enable-shared \
-  --enable-threads \
-  --enable-xdbe \
-  --enable-xinerama \
-  --enable-xft
 
-make %{?_smp_mflags}
+make docs -C %{_vpath_builddir}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%cmake_install
-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
@@ -121,42 +107,34 @@ 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
 
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun -p /sbin/ldconfig
 
 %files
 %doc ANNOUNCEMENT CHANGES CREDITS README
 %license COPYING
-%{_libdir}/libfltk.so.1.3
+%{_libdir}/libfltk.so.1.3*
-%{_libdir}/libfltk_forms.so.1.3
+%{_libdir}/libfltk_forms.so.1.3*
-%{_libdir}/libfltk_gl.so.1.3
+%{_libdir}/libfltk_gl.so.1.3*
-%{_libdir}/libfltk_images.so.1.3
+%{_libdir}/libfltk_images.so.1.3*
 
 %files devel
-%doc __docs/*
+%doc %{_vpath_builddir}/documentation/html
 %{_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
@@ -168,10 +146,70 @@ 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