Author: lisu                         Date: Fri Apr  9 09:45:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start update to 0.6.0
- most options given as make paramaters
- nfy

---- Files affected:
packages/stone_soup:
   stone_soup.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/stone_soup/stone_soup.spec
diff -u packages/stone_soup/stone_soup.spec:1.15 
packages/stone_soup/stone_soup.spec:1.16
--- packages/stone_soup/stone_soup.spec:1.15    Fri Mar  5 16:54:26 2010
+++ packages/stone_soup/stone_soup.spec Fri Apr  9 11:45:12 2010
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without tiles           # build tiles version
+%bcond_with    tiles           # build tiles version
 #
 Summary:       stone soup :: crawl clone
 Summary(pl.UTF-8):     stone soup :: klon crawla
 Name:          stone_soup
-Version:       0.5.2
+Version:       0.6.0
 Release:       1
 License:       Nethack Like
 Group:         X11/Applications/Games
-Source0:       http://dl.sourceforge.net/crawl-ref/%{name}-%{version}-src.tbz2
-# Source0-md5: 48aca99f320b70c880363ddaca7da89a
+Source0:       http://dl.sourceforge.net/crawl-ref/%{name}-%{version}.tar.bz2
+# Source0-md5: f4ff3e148344fda6410933d35deb4ead
 Patch0:                %{name}-systemlua.patch
 Patch1:                %{name}-makefile.patch
 Patch2:                %{name}-systemsqlite3.patch
@@ -52,18 +52,22 @@
 społeczeństwo Crawla.
 
 %prep
-%setup -q -n %{name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q
+#%%patch0 -p1
+#%%patch1 -p1
+#%%patch2 -p1
+#%%patch3 -p1
 %if %{with tiles}
-%patch4 -p1
+#%%patch4 -p1
 %endif
 
 %build
+#cd source
 %{__make} -C source \
-       %{?with_tiles:MAKEFILE=makefile_tiles.unix} \
+       prefix="%{_prefix}" \
+       SAVEDIR="/var/games/stone_soup/" \
+       DATADIR="/usr/share/stone_soup/" \
+       %{?with_tiles:TILES="y"} \
        CXX="%{__cxx}" \
        OPTFLAGS="%{rpmcxxflags}" \
        LDFLAGS="%{rpmldflags}"
@@ -71,8 +75,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+#cd source
 %{__make} -C source install \
-       %{?with_tiles:MAKEFILE=makefile_tiles.unix} \
+       prefix="%{_prefix}" \
+       bin_prefix="bin" \
+       SAVEDIR="/var/games/stone_soup/" \
+       DATADIR="/usr/share/stone_soup/" \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -81,7 +89,8 @@
 %files
 %defattr(644,root,root,755)
 %doc CREDITS.txt README.* docs
-%attr(2755,root,games) %{_bindir}/stone_soup
+#%%attr(2755,root,games) %{_bindir}/stone_soup
+%attr(2755,root,games) %{_bindir}/crawl
 %{_datadir}/stone_soup
 %attr(775,root,games) %dir /var/games/stone_soup
 
@@ -91,6 +100,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/09 09:45:12  lisu
+- start update to 0.6.0
+- most options given as make paramaters
+- nfy
+
 Revision 1.15  2010/03/05 15:54:26  lisu
 - new URL
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup.spec?r1=1.15&r2=1.16&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to