From 37c83202d0bef12248f4034c9226835ae217852f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Feb 2011 13:56:27 +0000 Subject: [PATCH] - cmake hacks not to override our optflags - pass BUILD_SHARED_LIBS=OFF to override default setting from rpm-build-macros (libs should be linked in hatari executable; they are not installed anyway) Changed files: hatari.spec -> 1.21 --- hatari.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hatari.spec b/hatari.spec index 26e6be5..c417788 100644 --- a/hatari.spec +++ b/hatari.spec @@ -1,6 +1,3 @@ -# -# TODO: try to pass our CFLAGS and LDFLAGS -# Summary: hatari - an Atari ST and STE emulator for Linux Summary(pl.UTF-8): hatari - emulator Atari ST i STE dla Linuksa Name: hatari @@ -15,10 +12,11 @@ Patch1: %{name}-python_init.patch Patch2: %{name}-desktop.patch URL: http://hatari.sourceforge.net/ BuildRequires: SDL-devel >= 1.2.0 -BuildRequires: cmake +BuildRequires: cmake >= 2.6 BuildRequires: libpng-devel BuildRequires: pkgconfig BuildRequires: readline-devel +BuildRequires: rpmbuild(macros) >= 1.577 BuildRequires: sed >= 4.0 BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel @@ -46,11 +44,8 @@ Atari ST i STE. install -d build cd build %cmake .. \ - -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 -%endif + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" %{__make} @@ -69,9 +64,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc readme.txt doc/*.txt python-ui/{README,TODO} -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/atari-hd-image.sh +%attr(755,root,root) %{_bindir}/hatari +%attr(755,root,root) %{_bindir}/hatari-console.py +%attr(755,root,root) %{_bindir}/hatariui +%attr(755,root,root) %{_bindir}/hmsa +%attr(755,root,root) %{_bindir}/zip2st.sh %{_datadir}/%{name} -%{_mandir}/man1/hatari*.1* +%{_mandir}/man1/hatariui.1* %lang(fr) %{_mandir}/fr/man1/hatari.1* %{_desktopdir}/hatariui.desktop %{_iconsdir}/hicolor/32x32/apps/hatari-icon.png -- 2.44.0