merge cmake PR

spec cosmetics
This commit is contained in:
Rex Dieter 2020-05-11 11:06:28 -05:00
parent 0191c85564
commit 76f53b61af

View File

@ -6,7 +6,7 @@
Summary: C++ user interface toolkit Summary: C++ user interface toolkit
Name: fltk Name: fltk
Version: 1.3.5 Version: 1.3.5
Release: 3%{?dist} Release: 4%{?dist}
# 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
@ -40,7 +40,6 @@ BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xproto)
BuildRequires: xorg-x11-utils BuildRequires: xorg-x11-utils
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: autoconf
%description %description
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit. FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
@ -81,21 +80,23 @@ Requires: %{name}-devel
%build %build
mkdir build && pushd build mkdir build
%cmake -DOPTION_BUILD_SHARED_LIBS=TRUE \ pushd build
-DFLTK_CONFIG_PATH=%{_libdir}/cmake/fltk \ %cmake .. \
-DFLTK_CONFIG_PATH:PATH=%{_libdir}/cmake/fltk \
-DOpenGL_GL_PREFERENCE=GLVND \ -DOpenGL_GL_PREFERENCE=GLVND \
-DOPTION_BUILD_HTML_DOCUMENTATION=ON \ -DOPTION_BUILD_HTML_DOCUMENTATION:BOOL=ON \
-DOPTION_BUILD_PDF_DOCUMENTATION=OFF \ -DOPTION_BUILD_PDF_DOCUMENTATION:BOOL=OFF \
../ -DOPTION_BUILD_SHARED_LIBS:BOOL=ON
%make_build popd
make docs %make_build -C build
make docs -C build
%install %install
pushd build %make_install -C build
%make_install
# we only apply this hack to multilib arch's # we only apply this hack to multilib arch's
%ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc %ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
@ -124,7 +125,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
%doc build/documentation/html %doc build/documentation/html
%{_bindir}/fltk-config %{_bindir}/fltk-config
%{?arch:%{_bindir}/fltk-config-%{arch}} %{?arch:%{_bindir}/fltk-config-%{arch}}
%{_datadir}/mime/packages/fluid.xml
%{_includedir}/FL/ %{_includedir}/FL/
%{_libdir}/libfltk.so %{_libdir}/libfltk.so
%{_libdir}/libfltk_forms.so %{_libdir}/libfltk_forms.so
@ -145,10 +145,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
%{_bindir}/fluid %{_bindir}/fluid
%{_mandir}/man1/fluid.1* %{_mandir}/man1/fluid.1*
%{_datadir}/applications/fluid.desktop %{_datadir}/applications/fluid.desktop
%{_datadir}/mime/packages/fluid.xml
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%changelog %changelog
* Mon May 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-4
- merge cmake PR
- spec cosmetics
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild