rpms/scummvm/devel scummvm-0.9.0-gcc41.patch, NONE, 1.1 scummvm-0.9.0-nostrip.patch, NONE, 1.1 scummvm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Nov 8 09:26:27 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17717/devel
Modified Files:
.cvsignore sources
Added Files:
scummvm-0.9.0-gcc41.patch scummvm-0.9.0-nostrip.patch
scummvm.spec
Log Message:
auto-import scummvm-0.9.1-1 on branch devel from scummvm-0.9.1-1.src.rpm
scummvm-0.9.0-gcc41.patch:
--- NEW FILE scummvm-0.9.0-gcc41.patch ---
diff -Naupr scummvm-0.9.0.orig/common/array.h scummvm-0.9.0/common/array.h
--- scummvm-0.9.0.orig/common/array.h 2006-06-21 23:16:01.000000000 +0200
+++ scummvm-0.9.0/common/array.h 2006-10-29 18:26:41.000000000 +0100
@@ -48,11 +48,7 @@ public:
_data[i] = array._data[i];
}
-#ifdef __SYMBIAN32__
~Array()
-#else
- ~Array<T>()
-#endif
{
if (_data)
delete [] _data;
diff -Naupr scummvm-0.9.0.orig/common/list.h scummvm-0.9.0/common/list.h
--- scummvm-0.9.0.orig/common/list.h 2006-06-21 23:16:01.000000000 +0200
+++ scummvm-0.9.0/common/list.h 2006-10-29 18:28:48.000000000 +0100
@@ -129,11 +129,7 @@ public:
insert(begin(), list.begin(), list.end());
}
-#ifndef __SYMBIAN32__
- ~List<T>()
-#else
~List()
-#endif
{
clear();
delete _anchor;
scummvm-0.9.0-nostrip.patch:
--- NEW FILE scummvm-0.9.0-nostrip.patch ---
diff -Naupr scummvm-0.9.0.orig/Makefile scummvm-0.9.0/Makefile
--- scummvm-0.9.0.orig/Makefile 2006-06-21 23:19:07.000000000 +0200
+++ scummvm-0.9.0/Makefile 2006-10-29 18:56:40.000000000 +0100
@@ -45,7 +45,7 @@ config.mak: $(srcdir)/configure
install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
--- NEW FILE scummvm.spec ---
Name: scummvm
Version: 0.9.1
Release: 1%{?dist}
Summary: Interpreter for several adventure games
Group: Applications/Emulators
License: GPL
URL: http://scummvm.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
####### Icons extracted from icons/scummvm.ico with the gimp
Source1: scummvm-icons.tar.gz
Patch0: scummvm-0.9.0-gcc41.patch
Patch1: scummvm-0.9.0-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel nasm
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
ScummVM is an implementation of the SCUMM (Script Creation Utility for
Maniac Mansion) engine used in various Lucas Arts games such as Monkey
Island and Day of the Tentacle. At this time ScummVM should be considered
ALPHA software, as it's still under heavy development. Be aware that while
many games will work with few major bugs, crashes can happen. Also note
that saved games can, and probably will, be incompatible between releases.
Also ScummVM is capable of playing several non-SCUMM games.
%prep
%setup -q -a 1
%patch0 -p1 -b .gcc41
%patch1 -p1 -b .nostrip
sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
dists/%{name}.desktop
%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.
# The disables are so that these don't accidently get build in when rebuilding
# on a system with the necesarry deps installed
./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
--datadir=%{_datadir} --disable-mpeg2 --disable-mad --disable-fluidsynth
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -D -p -m 0644 gui/themes/modern.ini \
$RPM_BUILD_ROOT%{_datadir}/%{name}/modern.ini
install -D -p -m 0644 gui/themes/modern.zip \
$RPM_BUILD_ROOT%{_datadir}/%{name}/modern.zip
# Remove doc files we want to include with %doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
dists/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
install -m 644 %{name}-16x16.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -m 644 %{name}-32x32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -m 644 %{name}-48x48.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
install -m 644 %{name}-128x128.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
* Sat Nov 4 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- New upstream release 0.9.1
- Prepare for inclusion into FE
- Remove mp3 support (the same files are also available in ogg format)
- Remove mpeg2 video support (problem, but only for one game I will
request upstream to add theora support)
* Sun Oct 29 2006 Matthias Saou <http://freshrpms.net/> 0.9.0-1
- Update to 0.9.0.
- Spec file cleanup.
- Add datadir patch from upstream in order to include themes.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Mon Feb 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.8.2-0.lvn.1
- version upgrade
* Mon Jan 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.8.1-0.lvn.1
- version upgrade
* Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.8.0-0.lvn.2
- fix #693 (desktop entry)
- beautify desktop-file-install
* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.8.0-0.lvn.1
- version upgrade
* Mon Jun 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.1-0.lvn.3
- add --disable--mt32emu switch to fix build with gcc4
* Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.1-0.lvn.2
- fix x86_64 build
* Thu Mar 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.1-0.lvn.1
- Version Upgrade
* Tue Feb 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.0-0.lvn.3
- add nasm <-> x86_64
* Tue Feb 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.0-0.lvn.2
- fixed #371 (bild on non ix86 - David Woodhouse)
* Fri Dec 24 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.0-0.lvn.1
- added AUTHORS and TODO
* Thu Dec 23 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- added off. 0.7.0 sources
* Sun Dec 19 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- upgrade to 0.7.0 cvs (20041219), prep. for 0.7.0
- added more BuildRequires
- if without-alsa is defined actually disable alsa via configure
* Thu Nov 25 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.6.1b-0.lvn.1
-upgrade to 0.6.1b
* Thu May 27 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.6.0-0.lvn.1
- upgrade to 0.6.0
* Thu Oct 02 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.5.1-0.fdr.6
- removed #--- lines
* Tue Sep 16 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.5.1-0.fdr.5
- added ${RPM_OPT_FLAGS}
* Mon Sep 08 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.5.1-0.fdr.4
- added libvorbis-devel
* Tue Sep 02 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.5.1-0.fdr.3
- upgrade to new minor version
* Wed Aug 06 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.5.0-0.fdr.2
- upgrade to new major version
* Fri Aug 01 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.4.1-0.fdr.1
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Nov 2006 09:24:57 -0000 1.1
+++ .cvsignore 8 Nov 2006 09:25:57 -0000 1.2
@@ -0,0 +1,2 @@
+scummvm-0.9.1.tar.bz2
+scummvm-icons.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Nov 2006 09:24:57 -0000 1.1
+++ sources 8 Nov 2006 09:25:57 -0000 1.2
@@ -0,0 +1,2 @@
+30a82ad466bae223875e66ee14b94904 scummvm-0.9.1.tar.bz2
+b20d750de2c88e8aefea364afae1776c scummvm-icons.tar.gz
More information about the fedora-extras-commits
mailing list