|
@@ -1,35 +1,29 @@
|
|
%define _default_patch_fuzz 2
|
|
%define _default_patch_fuzz 2
|
|
|
|
|
|
-#define snap r6027
|
|
+%define snap r9625
|
|
#define _disable_static --disable-static
|
|
#define _disable_static --disable-static
|
|
|
|
|
|
Summary: C++ user interface toolkit
|
|
Summary: C++ user interface toolkit
|
|
Summary(ja): C++用の軽量GUIライブラリキット
|
|
Summary(ja): C++用の軽量GUIライブラリキット
|
|
Name: fltk
|
|
Name: fltk
|
|
-Version: 1.1.10
|
|
+Version: 1.3
|
|
-Release: 3%{?_dist_release}
|
|
+%if "%{?snap:1}" == "1"
|
|
|
|
+Release: 1.%{snap}%{?_dist_release}
|
|
|
|
+%else
|
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
+%endif
|
|
|
|
|
|
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
|
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
|
License: LGPLv2+ with exceptions
|
|
License: LGPLv2+ with exceptions
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
URL: http://www.fltk.org/
|
|
URL: http://www.fltk.org/
|
|
%if "%{?snap:1}" == "1"
|
|
%if "%{?snap:1}" == "1"
|
|
-Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
|
|
+Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.bz2
|
|
%else
|
|
%else
|
|
Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
|
|
Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
|
|
%endif
|
|
%endif
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
|
|
-## FIXME/TODO: upstream these asap -- Rex
|
|
|
|
-# omit extraneous bits from fltk-config --cflags|--libs (http://bugzilla.redhat.com/199656)
|
|
|
|
-Patch1: fltk-1.1.x-r5750-199656.patch
|
|
|
|
-Patch2: fltk-1.1.7-test.patch
|
|
|
|
-# libfltk_gl.so had undefined symbols
|
|
|
|
-Patch3: fltk-1.1.x-r5750-undefined.patch
|
|
|
|
-# nuke --rpath (#238284)
|
|
|
|
-Patch4: fltk-1.1.x-r5750-rpath.patch
|
|
|
|
-Patch5: fltk-1.1.8-fluid_desktop.patch
|
|
|
|
-
|
|
|
|
BuildRequires: libICE-devel libSM-devel
|
|
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: xorg-x11-proto-devel xorg-x11-utils
|
|
@@ -51,10 +45,9 @@ It provides modern GUI functionality without the bloat, and supports
|
|
Summary: Development files for %{name}
|
|
Summary: Development files for %{name}
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
Requires: %{name} = %{version}-%{release}
|
|
Requires: %{name} = %{version}-%{release}
|
|
-Requires: libstdc++34-devel
|
|
+Requires: libX11-devel
|
|
-Requires: libGL-devel libGLU-devel
|
|
+Requires: libXinerama-devel
|
|
-Requires: libXft-devel libXext-devel
|
|
+Requires: libXft-devel
|
|
-Requires: libX11-devel libSM-devel libICE-devel
|
|
|
|
%description devel
|
|
%description devel
|
|
%{summary}.
|
|
%{summary}.
|
|
|
|
|
|
@@ -68,24 +61,13 @@ Requires: %{name}-devel = %{version}-%{release}
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%if "%{?snap:1}" == "1"
|
|
%if "%{?snap:1}" == "1"
|
|
-%setup -q -n fltk-1.1.x-%{snap}
|
|
+%setup -q -n fltk-1.3.x-%{snap}
|
|
%else
|
|
%else
|
|
%setup -q
|
|
%setup -q
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%patch1 -p1 -b .199656
|
|
|
|
-%patch2 -p1 -b .test
|
|
|
|
-%patch3 -p1 -b .undefined
|
|
|
|
-%patch4 -p1 -b .rpath
|
|
|
|
-%patch5 -p1 -b .fluid_desktop
|
|
|
|
-
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
-
|
|
|
|
-# using --with-optim, so unset CFLAGS/CXXFLAGS
|
|
|
|
-export CFLAGS=" "
|
|
|
|
-export CXXFLAGS=" "
|
|
|
|
-
|
|
|
|
%configure \
|
|
%configure \
|
|
%{?_disable_static} \
|
|
%{?_disable_static} \
|
|
--with-optim="%{optflags}" \
|
|
--with-optim="%{optflags}" \
|
|
@@ -174,7 +156,6 @@ update-desktop-database >& /dev/null ||:
|
|
%doc __docs/*
|
|
%doc __docs/*
|
|
%{_bindir}/fltk-config
|
|
%{_bindir}/fltk-config
|
|
%{_includedir}/FL/
|
|
%{_includedir}/FL/
|
|
-%{_includedir}/Fl
|
|
|
|
%{_libdir}/libfltk.so
|
|
%{_libdir}/libfltk.so
|
|
%{_libdir}/libfltk_forms.so
|
|
%{_libdir}/libfltk_forms.so
|
|
%{_libdir}/libfltk_gl.so
|
|
%{_libdir}/libfltk_gl.so
|
|
@@ -193,12 +174,17 @@ update-desktop-database >& /dev/null ||:
|
|
%{_bindir}/fluid
|
|
%{_bindir}/fluid
|
|
%{_mandir}/man1/fluid.1*
|
|
%{_mandir}/man1/fluid.1*
|
|
%{_datadir}/applications/fluid.desktop
|
|
%{_datadir}/applications/fluid.desktop
|
|
|
|
+%{_datadir}/applications/fltk-fluid.desktop
|
|
%{_datadir}/icons/hicolor/*/*/*
|
|
%{_datadir}/icons/hicolor/*/*/*
|
|
# FIXME
|
|
# FIXME
|
|
%{_datadir}/mimelnk/*/*.desktop
|
|
%{_datadir}/mimelnk/*/*.desktop
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Jun 25 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.3-1.r9625
|
|
|
|
+- update to 1.3.x-r9625
|
|
|
|
+- remove old patches
|
|
|
|
+
|
|
* Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> - 1.1.10-3
|
|
* Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> - 1.1.10-3
|
|
- rebuilt with rpm-4.8.1-3
|
|
- rebuilt with rpm-4.8.1-3
|
|
|
|
|