3:31 p.m.
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1514
Modified Files:
.cvsignore sources vice-1.19-datadir.patch vice.spec
Removed Files:
vice-1.20-monitor-crash.patch
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.4-1
- New upstream release 2.4 (rf#2610)
- Fixes xvic sound (rf#2578)
- Fixes fullscreen issues (rf#2352)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 20 Jul 2011 17:57:37 -0000 1.6
+++ .cvsignore 2 Mar 2013 15:31:08 -0000 1.7
@@ -1,4 +1,4 @@
vice-largeicons.tar.bz2
vice-miniicons.tar.bz2
vice-normalicons.tar.bz2
-vice-2.3.9.tar.gz
+vice-2.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 Jul 2011 17:57:37 -0000 1.6
+++ sources 2 Mar 2013 15:31:08 -0000 1.7
@@ -1,4 +1,4 @@
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
-a8f9cafb3a054c9a0d7aeb7f8af0c6c6 vice-2.3.9.tar.gz
+b017647a0c159bbe43cdb81762d1c577 vice-2.4.tar.gz
vice-1.19-datadir.patch:
vice-2.2/src/arch/sdl/archdep_unix.h | 2 +-
vice-2.2/src/arch/unix/archdep.h | 2 +-
vice-2.4.3/configure | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: vice-1.19-datadir.patch
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice-1.19-datadir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vice-1.19-datadir.patch 22 Jun 2010 10:34:07 -0000 1.4
+++ vice-1.19-datadir.patch 2 Mar 2013 15:31:08 -0000 1.5
@@ -22,3 +22,24 @@
#define LIBDIR PREFIX "/share/vice"
#else
#define LIBDIR PREFIX "/lib/vice"
+diff -up vice-2.4.3/configure~ vice-2.4.3/configure
+--- vice-2.4.3/configure~ 2013-02-26 20:45:36.000000000 +0100
++++ vice-2.4.3/configure 2013-03-02 15:13:00.479391490 +0100
+@@ -20700,7 +20700,7 @@ fi
+ ;;
+ linux*)
+ if test x"$host_cpu" = "xx86_64"; then
+- VICEDIR="$PREFIX/lib64/vice"
++ VICEDIR="$PREFIX/share/vice"
+ if false; then
+ ALTERNATE_DOCDIR_TRUE=
+ ALTERNATE_DOCDIR_FALSE='#'
+@@ -20710,7 +20710,7 @@ else
+ fi
+
+ else
+- VICEDIR="$PREFIX/lib/vice"
++ VICEDIR="$PREFIX/share/vice"
+ if false; then
+ ALTERNATE_DOCDIR_TRUE=
+ ALTERNATE_DOCDIR_FALSE='#'
Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vice.spec 7 Mar 2012 23:16:45 -0000 1.12
+++ vice.spec 2 Mar 2013 15:31:08 -0000 1.13
@@ -1,13 +1,11 @@
Name: vice
-Version: 2.3.9
-Release: 3%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPL
URL: http://vice-emu.sourceforge.net/
Source0: http://downloads.sourceforge.net/vice-emu/%{name}-%{version}.tar.gz
-# File from upstream missing from tarbal
-Source10: cartio.h
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
@@ -20,7 +18,6 @@
Patch1: vice-1.19-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
-Patch4: vice-1.20-monitor-crash.patch
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: libXrandr-devel
BuildRequires: giflib-devel libjpeg-devel libpng-devel
@@ -38,46 +35,58 @@
%prep
-%setup -q
+%setup -c -q
+pushd %{name}-%{version}
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .tmpnam
-%patch4 -p1 -z .mon
for i in man/*.1 doc/*.info*; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
mv $i.tmp $i
done
# not really needed, make sure these don't get used:
-rm -f src/lib/*/*.c src/lib/*/*.h
-# File from upstream missing from tarbal
-cp -a %{SOURCE10} src
+rm -f src/lib/libffmpeg/*.c src/lib/libffmpeg/*.h
+popd
+
+mv %{name}-%{version} %{name}-%{version}.gtk
+cp -a %{name}-%{version}.gtk %{name}-%{version}.sdl
+# for %doc
+ln -s %{name}-%{version}.gtk/doc doc
%build
-COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch"
-%configure --enable-sdlui $COMMON_FLAGS
-make %{?_smp_mflags}
-pushd src
- for i in x*; do
- mv $i ../$i.sdl
- done
+# --disable-ffmpeg since the ffmpeg code does not work with recent ffmpeg
+COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch
--disable-ffmpeg"
+
+pushd %{name}-%{version}.gtk
+ %configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
+ make %{?_smp_mflags}
popd
-make distclean
-%configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
-make %{?_smp_mflags} LD_FLAGS=-lX11
+pushd %{name}-%{version}.sdl
+ %configure --enable-sdlui $COMMON_FLAGS
+ make %{?_smp_mflags}
+popd
%install
+pushd %{name}-%{version}.gtk
make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name}
-for i in x*.sdl; do
- install -p -m 755 $i $RPM_BUILD_ROOT%{_bindir}
-done
-pushd data
- for i in */sdl_sym.vkm; do
- cp -a --parents $i $RPM_BUILD_ROOT%{_datadir}/%{name}
- done
popd
+
+pushd %{name}-%{version}.sdl
+ pushd src
+ for i in x*; do
+ install -p -m 755 $i $RPM_BUILD_ROOT%{_bindir}/$i.sdl
+ done
+ popd
+ pushd data
+ for i in */sdl_sym.vkm; do
+ cp -a --parents $i $RPM_BUILD_ROOT%{_datadir}/%{name}
+ done
+ popd
+popd
+
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# for some reason make install drops a .txt and .pdf in the infodir ... ?
@@ -92,9 +101,14 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
for i in x128.desktop x64.desktop xcbm-ii.desktop xpet.desktop xplus4.desktop \
xvic.desktop; do
+%if 0%{?fedora} <= 18
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_SOURCE_DIR/$i
+%else
+ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_SOURCE_DIR/$i
+%endif
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,8 +120,9 @@
cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
tar xvfj %{SOURCE9}
# remove "icon" from the icons name they are already in the icons dir.
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
+popd
%post
@@ -130,18 +145,23 @@
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog FEEDBACK README doc/iec-bus.txt
-%doc doc/html/*.html doc/html/images/* doc/html/plain/*
+%doc %{name}-%{version}.gtk/AUTHORS %{name}-%{version}.gtk/ChangeLog
+%doc %{name}-%{version}.gtk/FEEDBACK %{name}-%{version}.gtk/README
+%doc doc/iec-bus.txt doc/html/*.html doc/html/images doc/html/plain
%{_bindir}/*
%{_datadir}/%{name}
-%{_datadir}/applications/dribble-*.desktop
+%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%{_infodir}/%{name}.info*
%{_mandir}/man1/*.1.gz
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.4-1
+- New upstream release 2.4 (rf#2610)
+- Fixes xvic sound (rf#2578)
+- Fixes fullscreen issues (rf#2352)
+
* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.9-3
- Rebuilt for c++ ABI breakage
--- vice-1.20-monitor-crash.patch DELETED ---