7:45 a.m.
Author: thl
Update of /cvs/free/rpms/BasiliskII/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv614
Modified Files:
.cvsignore sources
Added Files:
BasiliskII-1.0-gcc43.patch BasiliskII-1.0-nostrip.patch
BasiliskII.spec BasiliskII.spec~
Log Message:
sync with devel (after importing from freshrpms there)
BasiliskII-1.0-gcc43.patch:
--- NEW FILE BasiliskII-1.0-gcc43.patch ---
diff -up BasiliskII-1.0/src/Unix/sys_unix.cpp~ BasiliskII-1.0/src/Unix/sys_unix.cpp
--- BasiliskII-1.0/src/Unix/sys_unix.cpp~ 2008-10-18 20:01:47.000000000 +0200
+++ BasiliskII-1.0/src/Unix/sys_unix.cpp 2008-10-18 20:01:47.000000000 +0200
@@ -23,6 +23,7 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <errno.h>
+#include <limits.h>
#ifdef HAVE_AVAILABILITYMACROS_H
#include <AvailabilityMacros.h>
BasiliskII-1.0-nostrip.patch:
--- NEW FILE BasiliskII-1.0-nostrip.patch ---
diff -up BasiliskII-1.0/src/Unix/Makefile.in.nostrip BasiliskII-1.0/src/Unix/Makefile.in
--- BasiliskII-1.0/src/Unix/Makefile.in.nostrip 2006-04-19 08:55:54.000000000 +0200
+++ BasiliskII-1.0/src/Unix/Makefile.in 2008-10-18 20:12:57.000000000 +0200
@@ -28,7 +28,7 @@ CPUSRCS = @CPUSRCS@
BLESS = @BLESS@
EXEEXT = @EXEEXT@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
SLIRP_CFLAGS = @SLIRP_CFLAGS@
--- NEW FILE BasiliskII.spec ---
%define date 20060501
%define inv_date 01052006
%define mon_version 3.2
%define desktop_vendor rpmforge
%define _with_banks 1
Summary: 68k Macintosh emulator
Name: BasiliskII
Version: 1.0
Release: 0.%{date}.3%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://gwenole.beauchesne.info/projects/basilisk2/
Source0:
http://gwenole.beauchesne.info/projects/basilisk2/files/BasiliskII_src_%{...
Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
Source2: BasiliskII.png
Patch0: BasiliskII-1.0-nostrip.patch
Patch1: BasiliskII-1.0-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
BuildRequires: desktop-file-utils, readline-devel
BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
%{?_with_sdl:BuildRequires: SDL-devel}
%description
Basilisk II is an Open Source 68k Macintosh emulator. That is, it enables
you to run 68k MacOS software on you computer, even if you are using a
different operating system. However, you still need a copy of MacOS and
a Macintosh ROM image to use Basilisk II.
Available rebuild options :
--with : sdl banks
--without : mon
%prep
%setup -q -a 1
%patch0 -p1 -b .nostrip
%patch1 -p1 -b .gcc43
iconv -f ISO_8859-1 -t UTF8 README > README.tmp
touch -r README README.tmp; mv README.tmp README
iconv -f ISO_8859-1 -t UTF8 ChangeLog > ChangeLog.tmp
touch -r ChangeLog ChangeLog.tmp; mv ChangeLog.tmp ChangeLog
%build
pushd src/Unix
%configure \
--datadir=%{_sysconfdir} \
%{?_with_banks:--enable-addressing="banks"} \
%{!?_with_banks:--enable-jit-compiler} \
%{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
%{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
%{__make} %{?_smp_mflags}
popd
%install
%{__rm} -rf %{buildroot}
%makeinstall -C src/Unix \
datadir="%{buildroot}%{_sysconfdir}"
chmod +x %{buildroot}%{_sysconfdir}/%{name}/tunconfig
# Create the system menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=Basilisk II
Comment=68k Macintosh Emulator
Exec=BasiliskII
Icon=BasiliskII.png
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/BasiliskII.png
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc ChangeLog COPYING README TECH TODO
%dir %{_sysconfdir}/BasiliskII/
%config(noreplace) %{_sysconfdir}/BasiliskII/fbdevices
%config(noreplace) %{_sysconfdir}/BasiliskII/keycodes
%{_sysconfdir}/BasiliskII/tunconfig
%{_bindir}/BasiliskII
%{_datadir}/pixmaps/BasiliskII.png
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_mandir}/man1/BasiliskII.1*
%changelog
* Sat Oct 18 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.0-0.20060501.3
- Updated release of cxmon to 3.2
- Fix compilation with latest stdlibc++
- Regenerate Patch0, nuke _default_patch_fuzz 2
- Fixup desktop file Categories, so that Basilisk will show up under the
Emulators menu where it belongs
- Make rpmlint like this package
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info -
1.0-0.20060501.2
- rebuild for RPM Fusion
- _default_patch_fuzz 2
- remove support for building against XFree86
* Wed Mar 7 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.20060501.1
- Update to 01052006.
- Update URL and source locations.
* Wed Mar 22 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.5
- Add missing modular X build requirements.
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.4
- Release bump to drop the disttag number in FC5 build.
* Thu Jan 12 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.3
- Add modular xorg build switch, and make it the default.
* Thu Dec 1 2005 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122
- Update to 20051122 snapshot.
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
* Fri Apr 1 2005 Matthias Saou <http://freshrpms.net/> 1.0-0.20050322
- Update to latest snapshot.
- Add a menu entry.
- Addressing of "banks" type is still required.
- SDL still doesn't display properly.
- Add cxmon support, can be disabled with --without mon.
- Add readline-devel build dependency.
- Disable binary stripping on make install to get a useful debuginfo package.
* Mon Dec 13 2004 Matthias Saou <http://freshrpms.net/> 1.0-0.20041109
- Update to latest BasilikII JIT snapshot.
- Override datadir to sysconfdir as it makes more sense to have configuration
files there.
- Force addressing to older "banks" on FC3 as other don't work :-(
* Sat Feb 15 2003 Dag Wieers <dag(a)wieers.com> - 0.9.20020115-0
- Initial package. (using DAR)
--- NEW FILE BasiliskII.spec~ ---
%define _default_patch_fuzz 2
%define date 20060501
%define inv_date 01052006
%define mon_version 3.1
%define desktop_vendor rpmforge
%define _with_banks 1
Summary: 68k Macintosh emulator
Name: BasiliskII
Version: 1.0
Release: 0.%{date}.2%{?dist}
License: GPL
Group: Applications/Emulators
URL: http://gwenole.beauchesne.info/projects/basilisk2/
Source0:
http://gwenole.beauchesne.info/projects/basilisk2/files/BasiliskII_src_%{...
Source1: http://wwwthep.physik.uni-mainz.de/~cbauer/cxmon-%{mon_version}.tar.gz
Source2: BasiliskII.png
Patch: BasiliskII-1.0-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
BuildRequires: desktop-file-utils, readline-devel
BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
%{?_with_sdl:BuildRequires: SDL-devel}
%description
Basilisk II is an Open Source 68k Macintosh emulator. That is, it enables
you to run 68k MacOS software on you computer, even if you are using a
different operating system. However, you still need a copy of MacOS and
a Macintosh ROM image to use Basilisk II.
Available rebuild options :
--with : sdl banks
--without : mon
%prep
%setup -a 1
%patch -p1 -b .nostrip
%build
pushd src/Unix
%configure \
--datadir=%{_sysconfdir} \
%{?_with_banks:--enable-addressing="banks"} \
%{!?_with_banks:--enable-jit-compiler} \
%{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
%{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
%{__make} %{?_smp_mflags}
popd
%install
%{__rm} -rf %{buildroot}
%makeinstall -C src/Unix \
datadir="%{buildroot}%{_sysconfdir}"
# Create the system menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=Basilisk II
Comment=68k Macintosh Emulator
Exec=BasiliskII
Icon=BasiliskII.png
Terminal=false
Type=Application
Categories=Application;Utility;
Encoding=UTF-8
EOF
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/BasiliskII.png
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc ChangeLog COPYING README TECH TODO
%dir %{_sysconfdir}/BasiliskII/
%config %{_sysconfdir}/BasiliskII/fbdevices
%config %{_sysconfdir}/BasiliskII/keycodes
%config %{_sysconfdir}/BasiliskII/tunconfig
%{_bindir}/BasiliskII
%{_datadir}/pixmaps/BasiliskII.png
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_mandir}/man1/BasiliskII.1*
%changelog
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info -
1.0-0.20060501.2
- rebuild for RPM Fusion
- _default_patch_fuzz 2
- remove support for building against XFree86
* Wed Mar 7 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.20060501.1
- Update to 01052006.
- Update URL and source locations.
* Wed Mar 22 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.5
- Add missing modular X build requirements.
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.4
- Release bump to drop the disttag number in FC5 build.
* Thu Jan 12 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122.3
- Add modular xorg build switch, and make it the default.
* Thu Dec 1 2005 Matthias Saou <http://freshrpms.net/> 1.0-0.20051122
- Update to 20051122 snapshot.
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
* Fri Apr 1 2005 Matthias Saou <http://freshrpms.net/> 1.0-0.20050322
- Update to latest snapshot.
- Add a menu entry.
- Addressing of "banks" type is still required.
- SDL still doesn't display properly.
- Add cxmon support, can be disabled with --without mon.
- Add readline-devel build dependency.
- Disable binary stripping on make install to get a useful debuginfo package.
* Mon Dec 13 2004 Matthias Saou <http://freshrpms.net/> 1.0-0.20041109
- Update to latest BasilikII JIT snapshot.
- Override datadir to sysconfdir as it makes more sense to have configuration
files there.
- Force addressing to older "banks" on FC3 as other don't work :-(
* Sat Feb 15 2003 Dag Wieers <dag(a)wieers.com> - 0.9.20020115-0
- Initial package. (using DAR)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:43:54 -0000 1.1
+++ .cvsignore 19 Oct 2008 07:45:09 -0000 1.2
@@ -0,0 +1,3 @@
+BasiliskII_src_01052006.tar.bz2
+BasiliskII.png
+cxmon-3.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:43:54 -0000 1.1
+++ sources 19 Oct 2008 07:45:09 -0000 1.2
@@ -0,0 +1,3 @@
+dfe9e088649133485bae28a713979481 BasiliskII_src_01052006.tar.bz2
+d82f6d88e98f6a200af96643eeef80ab BasiliskII.png
+8fb95c58f6c04eace6ae84d0c7b79ca1 cxmon-3.2.tar.gz