1.3.0 (final)
with-links
This commit is contained in:
Rex Dieter
parent
1ccaa8a29f
commit
3e8d009a99
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
fltk-1.1.10-source.tar.bz2
|
||||
/fltk-1.3.0rc5-source.tar.gz
|
||||
/fltk-1.1.10-source.tar.bz2
|
||||
/fltk-1.3.0-source.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up fltk-1.3.0rc5/src/filename_list.cxx.gcc44 fltk-1.3.0rc5/src/filename_list.cxx
|
||||
--- fltk-1.3.0rc5/src/filename_list.cxx.gcc44 2011-01-05 17:50:10.000000000 +0100
|
||||
+++ fltk-1.3.0rc5/src/filename_list.cxx 2011-05-25 16:26:16.842727901 +0200
|
||||
@@ -119,7 +119,7 @@ int fl_filename_list(const char *d, dire
|
||||
// The vast majority of UNIX systems want the sort function to have this
|
||||
// prototype, most likely so that it can be passed to qsort without any
|
||||
// changes:
|
||||
- int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort);
|
||||
+ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
|
||||
#endif
|
||||
|
||||
#ifndef __APPLE__
|
||||
94
fltk.spec
94
fltk.spec
@ -1,11 +1,13 @@
|
||||
|
||||
%global arch %(arch 2>/dev/null || echo undefined)
|
||||
%global pre rc5
|
||||
|
||||
# TODO:
|
||||
# * port .spec to use cmake
|
||||
|
||||
Summary: C++ user interface toolkit
|
||||
Name: fltk
|
||||
Version: 1.3.0
|
||||
Release: 0.2.%{?pre}%{?dist}
|
||||
Release: 1%{?dist}
|
||||
|
||||
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
||||
License: LGPLv2+ with exceptions
|
||||
@ -15,7 +17,6 @@ URL: http://www.fltk.org/
|
||||
Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
|
||||
%else
|
||||
Source0: http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.gz
|
||||
#Source0: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10rc3/fltk-1.1.10rc3-source.tar.bz2
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -26,22 +27,17 @@ Patch1: fltk-1.1.9-fltk_config.patch
|
||||
# libfltk_gl.so had undefined symbols
|
||||
Patch3: fltk-1.1.x-r5750-undefined.patch
|
||||
Patch5: fltk-1.1.8-fluid_desktop.patch
|
||||
Patch7: fltk-1.1.9-scandir.patch
|
||||
Patch8: fltk-1.3.0-rh708185.patch
|
||||
|
||||
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
|
||||
BuildRequires: libICE-devel libSM-devel
|
||||
BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
|
||||
BuildRequires: xorg-x11-proto-devel xorg-x11-utils
|
||||
%else
|
||||
BuildRequires: xorg-x11-devel
|
||||
%endif
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libGL-devel libGLU-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libGL-devel libGLU-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
|
||||
BuildRequires: xorg-x11-proto-devel xorg-x11-utils
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%description
|
||||
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
|
||||
@ -50,38 +46,32 @@ It provides modern GUI functionality without the bloat, and supports
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libstdc++-devel
|
||||
Requires: libGL-devel libGLU-devel
|
||||
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
|
||||
Requires: libXft-devel libXext-devel
|
||||
Requires: libX11-devel libSM-devel libICE-devel
|
||||
%else
|
||||
Requires: xorg-x11-devel
|
||||
%endif
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libstdc++-devel
|
||||
Requires: libGL-devel libGLU-devel
|
||||
Requires: libXft-devel libXext-devel
|
||||
Requires: libX11-devel libSM-devel libICE-devel
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package static
|
||||
Summary: Static libraries for %{name}
|
||||
Group: Development/Libraries
|
||||
Summary: Static libraries for %{name}
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
%description static
|
||||
%{summary}.
|
||||
|
||||
%package fluid
|
||||
Summary: Fast Light User Interface Designer
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
Summary: Fast Light User Interface Designer
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-devel
|
||||
%description fluid
|
||||
%{summary}, an interactive GUI designer for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%if "%{?snap:1}" == "1"
|
||||
%setup -q -n fltk-1.1.x-%{snap}
|
||||
%if 0%{?snap:1}
|
||||
%setup -q -n fltk-1.3.x-%{snap}
|
||||
%else
|
||||
%setup -q -n fltk-%{version}%{?pre}
|
||||
%endif
|
||||
@ -89,10 +79,6 @@ Requires: %{name}-devel = %{version}-%{release}
|
||||
%patch1 -p1 -b .fltk_config
|
||||
%patch3 -p1 -b .undefined
|
||||
%patch5 -p1 -b .fluid_desktop
|
||||
# FIXME, why only needed for F-11+/gcc44 ?
|
||||
%if 0%{?fedora} > 10
|
||||
%patch7 -p1 -b .gcc44
|
||||
%endif
|
||||
%patch8 -p1 -b .rh708185
|
||||
|
||||
# verbose build output
|
||||
@ -106,6 +92,7 @@ export CFLAGS=" "
|
||||
export CXXFLAGS=" "
|
||||
|
||||
%configure \
|
||||
--with-links \
|
||||
--with-optim="%{optflags}" \
|
||||
--enable-largefile \
|
||||
--enable-shared \
|
||||
@ -118,15 +105,6 @@ 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
|
||||
|
||||
make install install-desktop DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
@ -134,11 +112,6 @@ make install install-desktop DESTDIR=$RPM_BUILD_ROOT
|
||||
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
|
||||
|
||||
# hack to make fltk-config multilib-safe
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
|
||||
$RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
|
||||
@ -155,16 +128,6 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
|
||||
|
||||
%check
|
||||
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
|
||||
%if 0%{?fedora} < 15
|
||||
make -C test
|
||||
%else
|
||||
# tests are largely busted on f15+, due to static-linking fail
|
||||
make -C test ||:
|
||||
%endif
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -201,6 +164,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
||||
%{_bindir}/fltk-config
|
||||
%{_bindir}/fltk-config-%{arch}
|
||||
%{_includedir}/FL/
|
||||
%{_includedir}/Fl
|
||||
%{_libdir}/libfltk.so
|
||||
%{_libdir}/libfltk_forms.so
|
||||
%{_libdir}/libfltk_gl.so
|
||||
@ -226,6 +190,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 24 2011 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-1
|
||||
- 1.3.0 (final)
|
||||
- --with-links
|
||||
|
||||
* Fri May 27 2011 Adam Tkac <atkac redhat com> - 1.3.0-0.2.rc5
|
||||
- fltk-config: don't emit unneeded -l<library> flags (#708185)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user