|
@@ -3,42 +3,50 @@
|
|
|
#define snap r9625
|
|
|
#define _disable_static --disable-static
|
|
|
|
|
|
-Summary: C++ user interface toolkit
|
|
|
+Summary: C++ user interface toolkit
|
|
|
Summary(ja): C++用の軽量GUIライブラリキット
|
|
|
-Name: fltk
|
|
|
-Version: 1.3.3
|
|
|
+Name: fltk
|
|
|
+Version: 1.3.4
|
|
|
+%define subversion 2
|
|
|
+
|
|
|
%if "%{?snap:1}" == "1"
|
|
|
-Release: 3.%{snap}%{?_dist_release}
|
|
|
+Release: 1.%{snap}%{?_dist_release}
|
|
|
%else
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
%endif
|
|
|
|
|
|
# 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/
|
|
|
+License: LGPLv2+ with exceptions
|
|
|
+Group: System Environment/Libraries
|
|
|
+URL: http://www.fltk.org/
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
|
|
|
%if "%{?snap:1}" == "1"
|
|
|
-Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.gz
|
|
|
+Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.gz
|
|
|
%else
|
|
|
-Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz
|
|
|
+Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-%{subversion}-source.tar.bz2
|
|
|
%endif
|
|
|
|
|
|
-Patch1: Fl_XFont_On_Demand.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
|
|
|
+
|
|
|
+## upstreamable patches
|
|
|
+Patch100: fltk-1.3.4-x-fluid_mimetype.patch
|
|
|
+
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: libICE-devel libSM-devel
|
|
|
-BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
|
|
|
+BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
|
|
|
BuildRequires: xorg-x11-proto-devel xorg-x11-utils
|
|
|
BuildRequires: libjpeg-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
-BuildRequires: libGL-devel libGLU-devel
|
|
|
+BuildRequires: libGL-devel libGLU-devel
|
|
|
BuildRequires: pkgconfig
|
|
|
BuildRequires: desktop-file-utils
|
|
|
-BuildRequires: man
|
|
|
+BuildRequires: man
|
|
|
|
|
|
%description
|
|
|
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
|
|
@@ -47,10 +55,10 @@ It provides modern GUI functionality without the bloat, and supports
|
|
|
|
|
|
|
|
|
%package devel
|
|
|
-Summary: Development files for %{name}
|
|
|
-Summary(ja): %{name} の開発用ファイル
|
|
|
-Group: Development/Libraries
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
+Summary: Development files for %{name}
|
|
|
+Summary(ja): %{name} の開発用ファイル
|
|
|
+Group: Development/Libraries
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
Requires: libX11-devel
|
|
|
Requires: libXinerama-devel
|
|
|
Requires: libXft-devel
|
|
@@ -59,22 +67,27 @@ Requires: libXft-devel
|
|
|
%{summary}.
|
|
|
|
|
|
%package fluid
|
|
|
-Summary: Fast Light User Interface Designer
|
|
|
-Group: Applications/Development
|
|
|
-Requires: %{name}-devel = %{version}-%{release}
|
|
|
+Summary: Fast Light User Interface Designer
|
|
|
+Group: Applications/Development
|
|
|
+Requires: %{name}-devel = %{version}-%{release}
|
|
|
|
|
|
%description fluid
|
|
|
-%{summary}, an interactive GUI designer for %{name}.
|
|
|
+%{summary}, an interactive GUI designer for %{name}.
|
|
|
|
|
|
|
|
|
%prep
|
|
|
%if "%{?snap:1}" == "1"
|
|
|
%setup -q -n fltk-1.3.x-%{snap}
|
|
|
%else
|
|
|
-%setup -q
|
|
|
+%setup -q -n %{name}-%{version}-%{subversion}
|
|
|
%endif
|
|
|
|
|
|
-%patch1
|
|
|
+%patch1 -p1 -b .fltk_config
|
|
|
+%patch100 -p1 -b .x-fluid_mimetype
|
|
|
+
|
|
|
+# verbose build output
|
|
|
+sed -i.silent '\,^.SILENT:,d' makeinclude.in
|
|
|
+autoconf
|
|
|
|
|
|
%build
|
|
|
%configure \
|
|
@@ -91,27 +104,15 @@ make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
-
|
|
|
-# Makefile hack for 64bitness
|
|
|
-%if "%{_lib}" != "lib"
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
|
|
-pushd $RPM_BUILD_ROOT%{_libdir}/..
|
|
|
-ln -s %{_lib} lib
|
|
|
-popd
|
|
|
-%endif
|
|
|
+rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-make install install-desktop DESTDIR=$RPM_BUILD_ROOT
|
|
|
+%make_install
|
|
|
+make install-linux -C fluid DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
-# omit examples/games:
|
|
|
+# omit examples/games:
|
|
|
make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
|
|
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
|
|
|
|
|
|
-# Makefile hack for 64bitness
|
|
|
-%if "%{_lib}" != "lib"
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/../lib
|
|
|
-%endif
|
|
|
-
|
|
|
desktop-file-install \
|
|
|
--delete-original \
|
|
|
--vendor="%{name}" \
|
|
@@ -184,14 +185,16 @@ update-desktop-database >& /dev/null ||:
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_bindir}/fluid
|
|
|
%{_mandir}/man1/fluid.1*
|
|
|
-#{_datadir}/applications/fluid.desktop
|
|
|
%{_datadir}/applications/fltk-fluid.desktop
|
|
|
%{_datadir}/icons/hicolor/*/*/*
|
|
|
-# FIXME
|
|
|
-%{_datadir}/mimelnk/*/*.desktop
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Sep 02 2018 Toshiaki Ara <ara_t@384.jp> - 1.3.4-1
|
|
|
+- update to 1.3.4-2
|
|
|
+- remove old patch
|
|
|
+- add patches from Fedora
|
|
|
+
|
|
|
* Mon Oct 24 2016 Toshiaki Ara <ara_t@384.jp> - 1.3.3-3
|
|
|
- add patch1: Fl_XFont_On_Demand.patch
|
|
|
- fixed: undefined reference to 'Fl_XFont_On_Demand::value()'
|