rpms/scummvm-tools/devel .cvsignore, 1.4, 1.5 scummvm-tools.spec, 1.5, 1.6 sources, 1.4, 1.5

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/scummvm-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30355

Modified Files:
	.cvsignore scummvm-tools.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Jan 2010 10:19:57 -0000	1.4
+++ .cvsignore	4 May 2010 20:10:22 -0000	1.5
@@ -1 +1 @@
-scummvm-tools-1.0.0.tar.bz2
+scummvm-tools-1.1.1.tar.bz2


Index: scummvm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/scummvm-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- scummvm-tools.spec	7 Jan 2010 10:19:57 -0000	1.5
+++ scummvm-tools.spec	4 May 2010 20:10:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		scummvm-tools
-Version:	1.0.0
+Version:	1.1.1
 Release:	1%{?dist}
 Summary:	Tools for scummVM / S.C.U.M.M scripting language
 
@@ -29,9 +29,13 @@ These tools are most useful to developer
 
 %prep
 %setup -q -n %{name}-%{version}
-sed -i -e "s/-O //g" -e "s/-fno-exceptions//g" Makefile
 
 %build
+# No rpm configure because scummvm's configure isn't a real configure and thus
+# doesn't understand some of the options %%configure passes. This includes
+# -libdir, so rpmlint's complaints should be ignored.
+./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
+	--datadir=%{_datadir}
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
 make %{?_smp_mflags}
 
@@ -39,26 +43,30 @@ make %{?_smp_mflags}
 rm -rf ${RPM_BUILD_ROOT}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-make install DESTDIR=${RPM_BUILD_ROOT}%{_bindir}
-(cd ${RPM_BUILD_ROOT}%{_bindir} ; for i in * ; do mv $i scummvm-$i ; done)
+make install DESTDIR=${RPM_BUILD_ROOT}
+(cd ${RPM_BUILD_ROOT}%{_bindir} ; for i in `ls *|grep -v scummvm` ; do mv $i scummvm-$i ; done)
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	%{SOURCE1}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_bindir}/*
+%{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Tue May 04 2010 Lucian Langa <cooly at gnome.eu.org> - 1.1.1-1
+- new upstream release
+
 * Thu Nov 26 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0.0-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Jan 2010 10:19:57 -0000	1.4
+++ sources	4 May 2010 20:10:23 -0000	1.5
@@ -1 +1 @@
-6bbe24c7774f63d9ec0a4670ed32b8b6  scummvm-tools-1.0.0.tar.bz2
+3d747434cbb5fb768b16a5b80ed39220  scummvm-tools-1.1.1.tar.bz2