packages: hatari/hatari.spec - cmake hacks not to override our optflags - p...

[qboosh]

Author: qboosh                       Date: Sun Feb 20 13:56:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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)

---- Files affected:
packages/hatari:
   hatari.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/hatari/hatari.spec
diff -u packages/hatari/hatari.spec:1.20 packages/hatari/hatari.spec:1.21
--- packages/hatari/hatari.spec:1.20	Mon Jun 14 15:25:20 2010
+++ packages/hatari/hatari.spec	Sun Feb 20 14:56:27 2011
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-#
-# 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
@@ -16,10 +13,11 @@
 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
@@ -47,11 +45,8 @@
 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}
 
@@ -70,9 +65,14 @@
 %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
@@ -83,6 +83,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2011/02/20 13:56:27  qboosh
+- 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)
+
 Revision 1.20  2010/06/14 13:25:20  lisu
 - up to 1.4.0
 - switch to cmake build system (TODO)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hatari/hatari.spec?r1=1.20&r2=1.21&f=u