rpms/elice/devel .cvsignore, 1.3, 1.4 elice.spec, 1.2, 1.3 sources, 1.3, 1.4

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/elice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15990

Modified Files:
	.cvsignore elice.spec sources 
Log Message:
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.313-1
- New upstream release 0.313



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Jul 2008 21:15:23 -0000	1.3
+++ .cvsignore	14 Sep 2008 20:24:19 -0000	1.4
@@ -1 +1,2 @@
-elice-0.289.tar.gz
+elice-0.313.tar.gz
+labytools-20080914.tar.gz


Index: elice.spec
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/elice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elice.spec	30 Jul 2008 21:15:23 -0000	1.2
+++ elice.spec	14 Sep 2008 20:24:20 -0000	1.3
@@ -1,11 +1,14 @@
 Name:           elice
-Version:        0.289
+Version:        0.313
 Release:        1%{?dist}
 Summary:        Elice is a PureBasic to C++ translator / compiler
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://clueonic.org/elice/archive/
 Source0:        http://clueonic.org/elice/archive/elice-%{version}.tar.gz
+# Tools needed to pack lostlabyrinth resources, traditionaly part of elice
+# These can now only be found in lostlaby svn
+Source1:        labytools-20080914.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ruby ruby-racc
 Requires:       ruby(abi) = 1.8
@@ -21,28 +24,31 @@
 
 
 %prep
-%setup -q
-# remove included prebuild elice binary
-rm elice
+%setup -c -q -a 1
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %{name} buildlaby/pack_sounds \
-  buildlaby/pack_graphics
+pushd %{name}-%{version}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %{name} buildlaby/PackerGraphics \
+  buildlaby/PackerSound
+popd
 
 
 %check
+pushd %{name}-%{version}
 make check
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
-install -m 755 buildlaby/pack_sounds \
+pushd %{name}-%{version}
+make install prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
+install -m 755 buildlaby/PackerSound \
   $RPM_BUILD_ROOT%{_bindir}/lostlabyrinth_pack_sounds
-install -m 755 buildlaby/pack_graphics \
+install -m 755 buildlaby/PackerGraphics \
   $RPM_BUILD_ROOT%{_bindir}/lostlabyrinth_pack_graphics
+popd
 
 
 %clean
@@ -51,12 +57,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING GPL-2 PACKFORMAT
+%doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/lostlabyrinth_pack_*
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.313-1
+- New upstream release 0.313
+
 * Wed Jul 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.289-1
 - New upstream release 0.289
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Jul 2008 21:15:23 -0000	1.3
+++ sources	14 Sep 2008 20:24:20 -0000	1.4
@@ -1 +1,2 @@
-9b7e24b97689417069c2099123613b03  elice-0.289.tar.gz
+b17209d9bd04f0d2850ade7d2b58bc7c  elice-0.313.tar.gz
+fbceec0a5b0f4dd24f2dd699444142a8  labytools-20080914.tar.gz