rpms/fltk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fltk-config inconsistency on ARM (#733421)

Browse Source
This commit is contained in:
Rex Dieter 2011-08-25 13:10:15 -05:00
parent 3e8d009a99
commit c0d7d96199
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fltk-config.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash
exec fltk-config-$(arch) "$@"
exec fltk-config-$(uname -i) "$@"

15
fltk.spec
View File

@ -1,13 +1,11 @@
%global arch %(arch 2>/dev/null || echo undefined)
# TODO:
# * port .spec to use cmake
Summary: C++ user interface toolkit
Name: fltk
Version: 1.3.0
Release: 1%{?dist}
Release: 2%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@ -112,10 +110,13 @@ 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}*
# hack to make fltk-config multilib-safe
# we only apply this hack to multilib arch's
%ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
%global arch %(uname -i 2>/dev/null || echo undefined)
mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
$RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
%endif
# docs
rm -rf __docs
@ -160,9 +161,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files devel
%defattr(-,root,root,-)
%doc __docs/*
# fltk-config multilib-safe wrapper
%{_bindir}/fltk-config
%{_bindir}/fltk-config-%{arch}
%{?arch:%{_bindir}/fltk-config-%{arch}}
%{_includedir}/FL/
%{_includedir}/Fl
%{_libdir}/libfltk.so
@ -190,6 +190,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Thu Aug 25 2011 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-2
- fltk-config inconsistency on ARM (#733421)
* Fri Jun 24 2011 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-1
- 1.3.0 (final)
- --with-links