rpms/BasiliskII/devel BasiliskII-1.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 BasiliskII-1.0-nostrip.patch, 1.1, 1.2 BasiliskII.spec, 1.4, 1.5 sources, 1.2, 1.3

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/BasiliskII/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23706

Modified Files:
	.cvsignore BasiliskII-1.0-nostrip.patch BasiliskII.spec 
	sources 
Added Files:
	BasiliskII-1.0-gcc43.patch 
Log Message:
* Sat Oct 18 2008 Hans de Goede <j.w.r.degoede at 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


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>


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Oct 2008 13:57:38 -0000	1.2
+++ .cvsignore	18 Oct 2008 19:35:32 -0000	1.3
@@ -1,3 +1,3 @@
 BasiliskII_src_01052006.tar.bz2
 BasiliskII.png
-cxmon-3.1.tar.gz
+cxmon-3.2.tar.gz

BasiliskII-1.0-nostrip.patch:

Index: BasiliskII-1.0-nostrip.patch
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII-1.0-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasiliskII-1.0-nostrip.patch	18 Oct 2008 13:57:38 -0000	1.1
+++ BasiliskII-1.0-nostrip.patch	18 Oct 2008 19:35:32 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naupr BasiliskII-1.0.orig/src/Unix/Makefile.in BasiliskII-1.0/src/Unix/Makefile.in
---- BasiliskII-1.0.orig/src/Unix/Makefile.in	2004-11-15 01:07:54.000000000 +0100
-+++ BasiliskII-1.0/src/Unix/Makefile.in	2005-04-02 21:17:21.000000000 +0200
+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@
@@ -9,4 +9,4 @@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  
- ## Files
+ SLIRP_CFLAGS = @SLIRP_CFLAGS@


Index: BasiliskII.spec
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasiliskII.spec	18 Oct 2008 16:53:09 -0000	1.4
+++ BasiliskII.spec	18 Oct 2008 19:35:32 -0000	1.5
@@ -1,22 +1,21 @@
-%define _default_patch_fuzz 2
-
 %define date 20060501
 %define inv_date 01052006
-%define mon_version 3.1
+%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}.2%{?dist}
-License: GPL
+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_%{inv_date}.tar.bz2
-Source1: http://wwwthep.physik.uni-mainz.de/~cbauer/cxmon-%{mon_version}.tar.gz
+Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
 Source2: BasiliskII.png
-Patch: BasiliskII-1.0-nostrip.patch
+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
@@ -35,8 +34,13 @@
 
 
 %prep
-%setup -a 1
-%patch -p1 -b .nostrip
+%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
@@ -55,6 +59,7 @@
 %{__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
@@ -65,8 +70,7 @@
 Icon=BasiliskII.png
 Terminal=false
 Type=Application
-Categories=Application;Utility;
-Encoding=UTF-8
+Categories=Game;Emulator;
 EOF
 
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
@@ -86,9 +90,9 @@
 %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
+%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
@@ -96,6 +100,14 @@
 
 
 %changelog
+* Sat Oct 18 2008 Hans de Goede <j.w.r.degoede at 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


Index: sources
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Oct 2008 13:57:38 -0000	1.2
+++ sources	18 Oct 2008 19:35:32 -0000	1.3
@@ -1,3 +1,3 @@
 dfe9e088649133485bae28a713979481  BasiliskII_src_01052006.tar.bz2
 d82f6d88e98f6a200af96643eeef80ab  BasiliskII.png
-1620e21161dba7c506b82353bf9ea483  cxmon-3.1.tar.gz
+8fb95c58f6c04eace6ae84d0c7b79ca1  cxmon-3.2.tar.gz