9:31 a.m.
Author: jwrdegoede
Update of /cvs/free/rpms/SheepShaver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12609
Modified Files:
SheepShaver.spec sources
Added Files:
cxmon-3.2-strfmt.patch
Removed Files:
BasiliskII-disk-scan-crash.patch
SheepShaver-configure-fix.patch SheepShaver-no-strip.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.1.20150516
- SheepShaver 2.4 git snapshot du-jour
- Fix FTBFS (rf#3634)
cxmon-3.2-strfmt.patch:
mon.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cxmon-3.2-strfmt.patch ---
diff -up cxmon-3.2/src/mon.cpp~ cxmon-3.2/src/mon.cpp
--- cxmon-3.2/src/mon.cpp~ 2010-02-21 12:58:33.000000000 +0100
+++ cxmon-3.2/src/mon.cpp 2015-05-16 11:00:16.619745081 +0200
@@ -868,7 +868,7 @@ static void help_or_hunt()
}
fprintf(monout, "x Quit mon\n"
"h This help text\n");
- fprintf(monout, cmd_help);
+ fprintf(monout, "%s", cmd_help);
}
Index: SheepShaver.spec
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/devel/SheepShaver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SheepShaver.spec 31 Aug 2014 12:52:44 -0000 1.14
+++ SheepShaver.spec 16 May 2015 09:31:42 -0000 1.15
@@ -1,22 +1,19 @@
-%define date 20130310
+%define date 20150516
%define mon_version 3.2
Summary: Power Macintosh emulator
Name: SheepShaver
-Version: 2.3
-Release: 0.13.%{date}%{?dist}
+Version: 2.4
+Release: 0.1.%{date}%{?dist}
License: GPLv2+
URL: http://sheepshaver.cebix.net/
# GRRR github, no url ...
Source0: macemu-master.zip
Source1: cxmon-3.2-cvs20130310.tar.gz
Source2: SheepShaver.png
-Patch0: SheepShaver-no-strip.patch
-Patch1: SheepShaver-configure-fix.patch
-# SheepShaver uses BasiliskII's sys_unix.cpp through a symlink
-Patch2: BasiliskII-disk-scan-crash.patch
-# Patch 10 because this is for Source1 rather then Source0
+# Patch 10+ because this is for Source1 rather then Source0
Patch10: cxmon-3.2-hide-symbols.patch
+Patch11: cxmon-3.2-strfmt.patch
BuildRequires: libtool gcc-c++ gtk2-devel
BuildRequires: desktop-file-utils readline-devel
BuildRequires: libXt-devel libXxf86vm-devel SDL-devel
@@ -37,11 +34,9 @@
%prep
%setup -q -a 1 -n macemu-master
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
pushd cxmon-%{mon_version}
%patch10 -p1
+%patch11 -p1
popd
chmod -x SheepShaver/src/kpx_cpu/src/mathlib/ieeefp.hpp
@@ -53,7 +48,9 @@
%configure --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
--with-mon=../../../cxmon-%{mon_version}/src \
--disable-xf86-dga --enable-sdl-audio --with-bincue
-make %{?_smp_mflags}
+DYNGEN_CFLAGS="$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector-strong//)"
+make %{?_smp_mflags} \
+ DYNGEN_CFLAGS="$DYNGEN_CFLAGS" DYNGEN_CXXFLAGS="$DYNGEN_CFLAGS"
popd
@@ -111,6 +108,10 @@
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.1.20150516
+- SheepShaver 2.4 git snapshot du-jour
+- Fix FTBFS (rf#3634)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 2.3-0.13.20130310
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -172,7 +173,7 @@
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
-* Sat Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
+* Thu Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
- Spec file cleanup, based on the .src.rpm from the SheepShaver website.
- Make cxmon support optionnal with --without mon.
- Add menu entry.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Mar 2013 23:16:20 -0000 1.4
+++ sources 16 May 2015 09:31:42 -0000 1.5
@@ -1,3 +1,3 @@
477d800bb4b36e90aa94c0d6810b8e53 cxmon-3.2-cvs20130310.tar.gz
22e17876d74a37e1a9f19d2150170cee SheepShaver.png
-1daf9f4ef843d0f3c6fb648c26bf0722 macemu-master.zip
+5afbe1c0a1e7b16ce503aad4ca14f298 macemu-master.zip
--- BasiliskII-disk-scan-crash.patch DELETED ---
--- SheepShaver-configure-fix.patch DELETED ---
--- SheepShaver-no-strip.patch DELETED ---