---- vice-1.8/data/fonts/Makefile.am.orig Mon Mar 20 01:27:23 2000
-+++ vice-1.8/data/fonts/Makefile.in Sat Mar 30 10:15:21 2002
-@@ -7,7 +7,7 @@
+--- vice-1.12/data/fonts/Makefile.am.orig 2002-08-03 16:09:51.000000000 +0200
++++ vice-1.12/data/fonts/Makefile.am 2003-07-20 21:52:30.000000000 +0200
+@@ -1,14 +1,13 @@
+ fontsdir = $(prefix)/lib/vice/fonts
- install:
+ fonts_DATA = \
+- cbm-directory-charset.fon \
+ vice-cbm.bdf
+
+-EXTRA_DIST = $(fonts_DATA)
++EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
+
+-install:
++install-data-hook:
@echo "Preparing fontdir..." ; \
- cd $(prefix)/lib/vice/fonts ; \
+ cd $(DESTDIR)$(prefix)/lib/vice/fonts ; \
+++ /dev/null
-diff -Nur vice-1.8.orig/configure.in vice-1.8/configure.in
---- vice-1.8.orig/configure.in Sun Jan 20 20:59:10 2002
-+++ vice-1.8/configure.in Sat Mar 30 11:00:32 2002
-@@ -96,6 +96,7 @@
-
- AM_CONDITIONAL(USE_MIDAS_SOUND, test x"$with_midas" = "xyes")
- AM_CONDITIONAL(HAVE_RS232, false)
-+ AM_CONDITIONAL(USE_VSID, false)
-
- dnl We always have a joystick and mouse on MSDOS.
- AC_DEFINE(HAS_JOYSTICK)
-@@ -112,7 +113,9 @@
-
- AC_DEFINE(HAS_JOYSTICK)
- AC_DEFINE(HAVE_MOUSE)
-+ AM_CONDITIONAL(USE_MIDAS_SOUND, false)
- AM_CONDITIONAL(HAVE_RS232, false)
-+ AM_CONDITIONAL(USE_VSID, false)
-
- AC_TRY_LINK([#include <windows.h>], [LARGE_INTEGER li; return (int) li.QuadPart],
- AC_DEFINE(HAS_LONGLONG_INTEGER),)
-@@ -129,7 +132,9 @@
-
- AC_DEFINE(HAS_JOYSTICK)
- AC_DEFINE(HAVE_MOUSE)
-+ AM_CONDITIONAL(USE_MIDAS_SOUND, false)
- AM_CONDITIONAL(HAVE_RS232, false)
-+ AM_CONDITIONAL(USE_VSID, false)
-
- else
-
-@@ -189,6 +194,7 @@
-
- dnl This is only possible on Unix (for now).
- AC_DEFINE(HAVE_RS232)
-+ AM_CONDITIONAL(USE_MIDAS_SOUND, false)
- AM_CONDITIONAL(HAVE_RS232, true)
-
- AC_DEFINE(USE_VSID)
-@@ -423,9 +429,9 @@
-
- dnl Test for libresid.a and resid/sid.h
- AC_CHECK_LIB(resid, resid_version_string,
-- AC_CHECK_HEADER(resid/sid.h,
-+ [AC_CHECK_HEADER(resid/sid.h,
- ,
-- AC_MSG_ERROR([reSID header file not found])),
-+ AC_MSG_ERROR([reSID header file not found])]),
- AC_MSG_ERROR([reSID library not found]))
-
- AC_DEFINE(HAVE_RESID)
-@@ -814,12 +820,12 @@
- [ AC_DEFINE(DWORD_IS_LONG)
- AC_MSG_RESULT(unsigned long) ], AC_MSG_RESULT(unsigned int))
-
-- x64_LDFLAGS="-mwindows"
-- x128_LDFLAGS="-mwindows"
-- xvic_LDFLAGS="-mwindows"
-- xpet_LDFLAGS="-mwindows"
-- xplus4_LDFLAGS="-mwindows"
-- xcbm2_LDFLAGS="-mwindows"
-+ x64LDFLAGS="-mwindows"
-+ x128LDFLAGS="-mwindows"
-+ xvicLDFLAGS="-mwindows"
-+ xpetLDFLAGS="-mwindows"
-+ xplus4LDFLAGS="-mwindows"
-+ xcbm2LDFLAGS="-mwindows"
-
- X64_WINRES="\$(top_builddir)/src/arch/win32/resc64.o"
- X128_WINRES="\$(top_builddir)/src/arch/win32/resc128.o"
-@@ -870,12 +876,12 @@
-
- fi
-
--AC_SUBST(x64_LDFLAGS)
--AC_SUBST(x128_LDFLAGS)
--AC_SUBST(xvic_LDFLAGS)
--AC_SUBST(xpet_LDFLAGS)
--AC_SUBST(xplus4_LDFLAGS)
--AC_SUBST(xcbm2_LDFLAGS)
-+AC_SUBST(x64LDFLAGS)
-+AC_SUBST(x128LDFLAGS)
-+AC_SUBST(xvicLDFLAGS)
-+AC_SUBST(xpetLDFLAGS)
-+AC_SUBST(xplus4LDFLAGS)
-+AC_SUBST(xcbm2LDFLAGS)
-
- AC_SUBST(X64_WINRES)
- AC_SUBST(X128_WINRES)
-@@ -975,7 +981,6 @@
- AC_SUBST(ARCH_INCLUDES)
- AC_SUBST(ARCH_LIBS)
- AC_SUBST(ARCH_DIR)
--AC_SUBST(LIBOBJS)
- AC_SUBST(SOUND_USS_OBJ)
- AC_SUBST(SOUND_SGI_OBJ)
- AC_SUBST(SOUND_HPUX_OBJ)
-diff -Nur vice-1.8.orig/src/Makefile.am vice-1.8/src/Makefile.am
---- vice-1.8.orig/src/Makefile.am Wed Nov 14 16:13:30 2001
-+++ vice-1.8/src/Makefile.am Sat Mar 30 10:58:13 2002
-@@ -206,7 +206,7 @@
- video_lib = $(top_builddir)/src/video/libvideo.a
- xcbm2_lib = $(top_builddir)/src/cbm2/libcbm2.a
-
--common_libs = $(rs232_ldadd) @ARCH_LIBS@ @LIBOBJS@ @READLINE@ @RESID_LIBS@ @SOUND_LIBS@
-+common_libs = $(rs232_ldadd) @ARCH_LIBS@ @READLINE@ @RESID_LIBS@ @SOUND_LIBS@
-
- bin_PROGRAMS = x64 x128 xvic xpet xplus4 xcbm2 c1541 petcat
-
-@@ -232,7 +232,7 @@
- x64_SOURCES = $(base_sources) $(maincpu_sources)
- x64_LDADD = $(x64_libs) @X_LIBS@
- x64_DEPENDENCIES = $(x64_libs)
--x64_LDFLAGS = @x64_LDFLAGS@
-+x64_LDFLAGS = @x64LDFLAGS@
-
- .PHONY: x64-all
- x64-all: \
-@@ -274,7 +274,7 @@
- x128_SOURCES = $(base_sources)
- x128_LDADD = $(x128_libs) @X_LIBS@
- x128_DEPENDENCIES = $(x128_libs)
--x128_LDFLAGS = @x128_LDFLAGS@
-+x128_LDFLAGS = @x128LDFLAGS@
-
- .PHONY: x128-all
- x128-all: \
-@@ -313,7 +313,7 @@
- xvic_SOURCES = $(base_sources) $(maincpu_sources)
- xvic_LDADD = $(xvic_libs) @X_LIBS@
- xvic_DEPENDENCIES = $(xvic_libs)
--xvic_LDFLAGS = @xvic_LDFLAGS@
-+xvic_LDFLAGS = @xvicLDFLAGS@
-
- .PHONY: xvic-all
- xvic-all: \
-@@ -347,7 +347,7 @@
- xpet_SOURCES = $(base_sources) $(maincpu_sources)
- xpet_LDADD = $(xpet_libs) @X_LIBS@
- xpet_DEPENDENCIES = $(xpet_libs)
--xpet_LDFLAGS = @xpet_LDFLAGS@
-+xpet_LDFLAGS = @xpetLDFLAGS@
-
- .PHONY: xpet-all
- xpet-all: \
-@@ -381,7 +381,7 @@
- xplus4_SOURCES = $(base_sources)
- xplus4_LDADD = $(xplus4_libs) @X_LIBS@
- xplus4_DEPENDENCIES = $(xplus4_libs)
--xplus4_LDFLAGS = @xplus4_LDFLAGS@
-+xplus4_LDFLAGS = @xplus4LDFLAGS@
-
- .PHONY: xplus4-all
- xplus4-all: \
-@@ -417,7 +417,7 @@
- xcbm2_SOURCES = $(base_sources)
- xcbm2_LDADD = $(xcbm2_libs) @X_LIBS@
- xcbm2_DEPENDENCIES = $(xcbm2_libs)
--xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
-+xcbm2_LDFLAGS = @xcbm2LDFLAGS@
-
- .PHONY: xcbm2-all
- xcbm2-all: \
-diff -Nur vice-1.8.orig/src/arch/unix/readline/Makefile.am vice-1.8/src/arch/unix/readline/Makefile.am
---- vice-1.8.orig/src/arch/unix/readline/Makefile.am Sun Sep 12 21:17:22 1999
-+++ vice-1.8/src/arch/unix/readline/Makefile.am Sat Mar 30 10:58:13 2002
-@@ -10,8 +10,6 @@
-
- noinst_LIBRARIES = libreadline.a
-
--EXTRA_DIST = README
--
- libreadline_a_SOURCES = \
- editline.c \
- editline.h \
--- /dev/null
+--- vice-1.12/configure.in.orig 2003-06-09 00:06:31.000000000 +0200
++++ vice-1.12/configure.in 2003-07-20 22:20:49.000000000 +0200
+@@ -210,119 +210,10 @@
+ dnl Add new languages here
+ ALL_LINGUAS="de fr it sv pl"
+
+-dnl These rules are solely for the distribution goal. While doing this
+-dnl we only have to keep exactly one list of the available catalogs
+-dnl in configure.in.
+-for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+-done
+-AC_SUBST(GMOFILES)
+-AC_SUBST(POFILES)
+-
+-if test x"$enable_nls" != x"no" ; then
+- AC_CHECK_HEADER(libintl.h,
+- [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+- [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+- gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+- if test "$gt_cv_func_gettext_libc" = "yes" \
+- || test "$gt_cv_func_gettext_libintl" = "yes"; then
+- AC_DEFINE(HAVE_GETTEXT)
+- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+- if test "$MSGFMT" != "no"; then
+- AC_CHECK_FUNCS(dcgettext)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [CATOBJEXT=.mo
+- DATADIRNAME=lib])
+- INSTOBJEXT=.mo
+- fi
+- USE_NLS=yes
+- AC_DEFINE(ENABLE_NLS)
+- AC_DEFINE(HAVE_LIBINTL_H)
+- AC_DEFINE_UNQUOTED(DATADIRNAME, "$DATADIRNAME")
+- dnl this is prefixed with PREFIX
+- AC_DEFINE(NLS_LOCALEDIR, PREFIX"/"DATADIRNAME"/locale")
+- else
+- AC_MSG_WARN([libintl.h not found, disabling NLS])
+- USE_NLS=no
+- fi
+- ])
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is no GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+- : ;
+- else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+- fi
+- fi
+-
+- dnl Test wether GMSGFMT is there. Should fix `make dist'.
+- if test "$GMSGFMT" = "" ; then
+- GMSGFMT=":"
+- fi
+-
+- # We need to process the po/ directory.
+- POSUB=po
+-
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+-
+- dnl Make all variables we use known to autoconf.
+- AC_SUBST(USE_INCLUDED_LIBINTL)
+- AC_SUBST(CATALOGS)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLDEPS)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(INTLOBJS)
+- AC_SUBST(POSUB)
+- AC_SUBST(GENCAT)
+-
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
+-
+- dnl currently no catgets support, can't check it.
+- GENCAT=
+- AC_SUBST(GENCAT)
+-else
+- AC_MSG_WARN([disabling NLS on user request])
+- USE_NLS=no
+-fi
+-
+-if test x"$USE_NLS" = x"" ; then
+- USE_NLS=no
+-fi
+-if test "$MSGFMT" = "no" ; then
+- dnl Fallback to shipped .gmo
+- dnl Those should work on x86 linux systems.
+- AC_MSG_WARN([msgfmt not found, falling back to default catalogs (x86/Linux)])
+- CATOBJEXT=".gmo"
+-fi
+-AC_SUBST(CATOBJEXT)
+-AC_SUBST(USE_NLS)
+-AC_SUBST(NLS_LOCALEDIR)
++AM_GNU_GETTEXT
++AC_CHECK_HEADERS(libintl.h)
++AC_DEFINE_UNQUOTED(DATADIRNAME, "$DATADIRNAME")
++AC_DEFINE(NLS_LOCALEDIR, PREFIX"/"DATADIRNAME"/locale")
+
+ dnl Check for a perl interpreter.
+ AC_PATH_PROG(PERL, perl)
Summary: Commodore emulator
Summary(pl): Emulator Commodore
Name: vice
-Version: 1.11
+Version: 1.12
Release: 1
License: GPL
Group: Applications/Emulators
Source0: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz
-# Source0-md5: 580817b28097b0897e48463d4fc510aa
+# Source0-md5: 2d761503025a84758b289564e390c7c8
Patch0: %{name}-info.patch
Patch1: %{name}-DESTDIR.patch
-Patch2: %{name}-acamfixes.patch
+Patch2: %{name}-gettext.patch
URL: http://viceteam.bei.t-online.de/
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: XFree86-devel
%setup -q
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
%build
-install %{_datadir}/automake/config.* .
-#rm -f missing
-#{__gettextize}
-#%%{__aclocal}
-#%%{__autoconf}
-#%%{__autoheader}
-#%%{__automake}
-#cd src/resid
-#%%{__autoconf}
-#cd ../..
-%configure2_13 \
+%{__gettextize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd src/resid
+%{__autoconf}
+cd ../..
+%configure \
--enable-autobpp \
--with-sdl \
--with-x \
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
%postun
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS Chan* FEEDBACK NEWS README
%attr(0755,root,root) %{_bindir}/*
projects / packages / vice.git / commitdiff