diff --git a/libfltk.spec b/libfltk.spec index c5c9a69..3688bff 100644 --- a/libfltk.spec +++ b/libfltk.spec @@ -1,13 +1,15 @@ +%define pkgver %(echo %version | tr _ -) +%define dirver %(echo %version | cut -d_ -f1) Name: libfltk -Version: 1.3.3 -Release: 2mamba +Version: 1.3.4_2 +Release: 1mamba Summary: A cross-platform C++ GUI toolkit Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.fltk.org/index.php -Source: http://fltk.org/pub/fltk/%{version}/fltk-%{version}-source.tar.gz +Source: http://fltk.org/pub/fltk/%{dirver}/fltk-%{pkgver}-source.tar.gz Patch0: %{name}-1.1.9-gcc44.patch Patch1: libfltk-1.3.3-font_missing_export.patch License: GPL @@ -60,9 +62,9 @@ FLTK provides modern GUI functionality without the bloat and supports 3D graphic This package contains the Checkers and Sudoku FLTK games. %prep -%setup -q -n fltk-%{version} +%setup -q -n fltk-%{pkgver} #%patch0 -p1 -%patch1 -p0 +#%patch1 -p0 %build %configure \ @@ -77,8 +79,10 @@ This package contains the Checkers and Sudoku FLTK games. %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall install-desktop -install -d %{buildroot}%{_datadir}/applications +%makeinstall + +# install-desktop +#install -d %{buildroot}%{_datadir}/applications %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -110,31 +114,34 @@ install -d %{buildroot}%{_datadir}/applications %{_libdir}/libfltk_images.so %dir %{_includedir}/FL %{_includedir}/FL/* -%{_datadir}/applications/fluid.desktop -%{_datadir}/icons/hicolor/*/apps/fluid.png -%{_datadir}/mimelnk/application/x-fluid.desktop +#%{_datadir}/applications/fluid.desktop +#%{_datadir}/icons/hicolor/*/apps/fluid.png +#%{_datadir}/mimelnk/application/x-fluid.desktop %{_mandir}/man3/* %{_mandir}/cat3/* -%files -n fltk-games -%defattr(-,root,root) -%{_bindir}/blocks -%{_bindir}/checkers -%{_bindir}/sudoku -%{_datadir}/applications/blocks.desktop -%{_datadir}/applications/checkers.desktop -%{_datadir}/applications/sudoku.desktop -%{_datadir}/icons/hicolor/*/apps/blocks.png -%{_datadir}/icons/hicolor/*/apps/checkers.png -%{_datadir}/icons/hicolor/*/apps/sudoku.png -%{_mandir}/cat6/blocks.6* -%{_mandir}/cat6/sudoku.* -%{_mandir}/cat6/checkers.* -%{_mandir}/man6/blocks.6* -%{_mandir}/man6/sudoku.* -%{_mandir}/man6/checkers.* +#%files -n fltk-games +#%defattr(-,root,root) +#%{_bindir}/blocks +#%{_bindir}/checkers +#%{_bindir}/sudoku +#%{_datadir}/applications/blocks.desktop +#%{_datadir}/applications/checkers.desktop +#%{_datadir}/applications/sudoku.desktop +#%{_datadir}/icons/hicolor/*/apps/blocks.png +#%{_datadir}/icons/hicolor/*/apps/checkers.png +#%{_datadir}/icons/hicolor/*/apps/sudoku.png +#%{_mandir}/cat6/blocks.6* +#%{_mandir}/cat6/sudoku.* +#%{_mandir}/cat6/checkers.* +#%{_mandir}/man6/blocks.6* +#%{_mandir}/man6/sudoku.* +#%{_mandir}/man6/checkers.* %changelog +* Sun Jul 29 2018 Silvan Calarco 1.3.4_2-1mamba +- update to 1.3.4_2 + * Sat Mar 21 2015 Silvan Calarco 1.3.3-2mamba - add missing exported symbol for FlightGear to build