packages: paintown/paintown.spec - bleh. remove patch2 - when you want to u...
shadzik
shadzik at pld-linux.org
Fri Jun 12 10:23:29 CEST 2009
Author: shadzik Date: Fri Jun 12 08:23:29 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- bleh. remove patch2
- when you want to use scons, BR it and remove cmake BR
- restored cmake bahvior - scons sucks
---- Files affected:
packages/paintown:
paintown.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/paintown/paintown.spec
diff -u packages/paintown/paintown.spec:1.7 packages/paintown/paintown.spec:1.8
--- packages/paintown/paintown.spec:1.7 Fri Jun 12 10:07:34 2009
+++ packages/paintown/paintown.spec Fri Jun 12 10:23:20 2009
@@ -5,15 +5,14 @@
Summary(pl.UTF-8): Paintown - gra zręcznościowa podobna do Streets of Rage lub Teenage Mutants inja Turtles
Name: paintown
Version: 3.2
-Release: 0.1
+Release: 1.1
License: GPL v2
Group: X11/Applications/Games
Source0: http://dl.sourceforge.net/paintown/%{name}-%{version}.tar.gz
# Source0-md5: f4c323e3fa6f2a9065923fe40b559be3
Patch0: %{name}-keyboard-fix.patch
Patch1: %{name}-stdio.patch
-Patch2: %{name}-verbose-makefile.patch
-Patch3: %{name}-string.patch
+Patch2: %{name}-string.patch
URL: http://paintown.sourceforge.net
BuildRequires: allegro-devel >=4.1
BuildRequires: cmake
@@ -41,20 +40,23 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%{__sed} -i 's at set(CXXFLAGS.*@set(CXXFLAGS="%{rpmcxxflags}")@g' CMakeLists.txt
RPMCXXFLAGS=$(echo %{rpmcxxflags} | sed "s@ \$@@ ; s@\([^ ]*\)@'\1'@g ; s@ @, at g")
%{__sed} -i "s@^cppflags = .*@cppflags = [ ${RPMCXXFLAGS} ]@" SConstruct
%build
-scons
+install -d build
+cd build
+%cmake \
+ ..
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-cp build/paintown .
install -d $RPM_BUILD_ROOT%{_bindir}
-./install.sh -d $RPM_BUILD_ROOT%{_datadir}/%{name} -b $RPM_BUILD_ROOT%{_bindir}
-sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__make} -C build install
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,6 +75,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2009/06/12 08:23:20 shadzik
+- bleh. remove patch2
+- when you want to use scons, BR it and remove cmake BR
+- restored cmake bahvior - scons sucks
+
Revision 1.7 2009/06/12 08:07:34 uzsolt
- 3.2 (paintown-string.patch)
- python-devel BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paintown/paintown.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list