Author: lisu Date: Fri Mar 11 09:30:58 2011 GMT Module: packages Tag: DEVEL ---- Log message: - use system squirrel (patch), BR: squirrel-devel - unify cmake build - drop cmake options provided by cmake macro, BR: rpmbuild(macros) >= 1.600 - use __rm macro and drop obsoleted one
---- Files affected: packages/supertux: supertux.spec (1.12.2.6 -> 1.12.2.7) ---- Diffs: ================================================================ Index: packages/supertux/supertux.spec diff -u packages/supertux/supertux.spec:1.12.2.6 packages/supertux/supertux.spec:1.12.2.7 --- packages/supertux/supertux.spec:1.12.2.6 Mon Jul 19 18:54:03 2010 +++ packages/supertux/supertux.spec Fri Mar 11 10:30:52 2011 @@ -13,6 +13,7 @@ Source0: http://download.berlios.de/supertux/%{name}-%{version}.tar.bz2 # Source0-md5: f3f803e629ee51a9de0b366a036e393d Patch0: %{name}-desktop.patch +Patch1: %{name}-system_squirrel.patch URL: http://supertux.berlios.de/ BuildRequires: OpenAL-devel BuildRequires: OpenGL-devel @@ -23,6 +24,8 @@ BuildRequires: libstdc++-devel >= 5:3.2 BuildRequires: libvorbis-devel BuildRequires: physfs-devel >= 1.0.0 +BuildRequires: rpmbuild(macros) >= 1.600 +BuildRequires: squirrel-devel Requires: OpenGL BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -37,13 +40,14 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -install -d build +mkdir -p build cd build +export CFLAGS="%{rpmcflags} -I/usr/include/squirrel" +export CXXFLAGS="%{rpmcxxflags} -I/usr/include/squirrel" %cmake .. \ - -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DINSTALL_SUBDIR_BIN="bin" %{__make} @@ -55,9 +59,7 @@ DESTDIR=$RPM_BUILD_ROOT # the same as supertux.png -rm -f $RPM_BUILD_ROOT%{_pixmapsdir}/supertux.xpm - -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/messages.pot +%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/supertux.xpm %clean rm -rf $RPM_BUILD_ROOT @@ -108,6 +110,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12.2.7 2011/03/11 09:30:52 lisu +- use system squirrel (patch), BR: squirrel-devel +- unify cmake build +- drop cmake options provided by cmake macro, BR: rpmbuild(macros) >= 1.600 +- use __rm macro and drop obsoleted one + Revision 1.12.2.6 2010/07/19 16:54:03 lisu - remove unknown -DLIB_SUFFIX options, game can be build on 64 bits without it ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/supertux/supertux.spec?r1=1.12.2.6&r2=1.12.2.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
