packages: vice/vice.spec, vice/vice-fonts.patch (NEW), vice/vice-link.patch...
qboosh
qboosh at pld-linux.org
Mon Feb 21 19:12:47 CET 2011
Author: qboosh Date: Mon Feb 21 18:12:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added fonts patch to avoid installing fonts in builder's home
- added link patch to avoid -lnsl -lbsd and other junk
- install bdf and ttf fonts in proper dirs
- handle esd and pulse options/bconds with up to date defaults (esd off, pulse on)
---- Files affected:
packages/vice:
vice.spec (1.59 -> 1.60) , vice-fonts.patch (NONE -> 1.1) (NEW), vice-link.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vice/vice.spec
diff -u packages/vice/vice.spec:1.59 packages/vice/vice.spec:1.60
--- packages/vice/vice.spec:1.59 Wed Feb 2 18:40:24 2011
+++ packages/vice/vice.spec Mon Feb 21 19:12:41 2011
@@ -1,8 +1,9 @@
# $Revision$, $Date$
-# TODO:
-# - on installation in tries to copy /usr/share/fonts/misc/CBM.ttf to
-# $HOME/.fonts, which is obviously wrong and requires preinstalled vice;
-# FIX data/fonts/Makefile.am
+#
+# Conditional build:
+%bcond_with esd # EsounD support
+%bcond_without pulseaudio # pulseaudio support
+#
Summary: Versatile Commodore Emulator
Summary(pl.UTF-8): Uniwersalny emulator Commodore
Name: vice
@@ -21,6 +22,8 @@
Patch0: %{name}-info.patch
Patch1: %{name}-gettext.patch
Patch2: %{name}-home_etc.patch
+Patch3: %{name}-fonts.patch
+Patch4: %{name}-link.patch
URL: http://www.viceteam.org/
BuildRequires: OpenGL-GLX-devel
BuildRequires: SDL-devel >= 1.2.0
@@ -28,16 +31,20 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
+%{?with_esd:BuildRequires: esound-devel}
BuildRequires: flex
+BuildRequires: ffmpeg-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: gtk+2-devel >= 1:2.0
+BuildRequires: gtkglext-devel
BuildRequires: lame-libs-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: perl-base
BuildRequires: pkgconfig
+%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
BuildRequires: readline-devel
BuildRequires: texinfo
BuildRequires: xorg-app-bdftopcf
@@ -70,6 +77,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%{__perl} -i -pe 's@\$\(VICEDIR\)/fonts@%{_fontsdir}/misc@' data/fonts/Makefile.am
%build
@@ -84,13 +93,16 @@
%configure \
--libdir=%{_datadir} \
--enable-autobpp \
- --with-sdl \
--enable-fullscreen \
--enable-gnomeui \
--enable-nls \
- --without-xaw3d \
+ %{?with_pulseaudio:--with-pulse} \
+ --with-sdl \
+ --with-x \
+ %{!?with_esd:--without-esd} \
--without-included-gettext \
- --with-x
+ --without-xaw3d
+
# contains some C++ code included as "old" library (.a), so libtool can't detect it
%{__make} \
CCLD="%{__cxx}"
@@ -104,8 +116,8 @@
DESTDIR=$RPM_BUILD_ROOT \
VICEDIR="%{_datadir}/%{name}"
-rm -f doc/html/{Makefile*,texi2html}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/vice/doc
+%{__rm} doc/html/{Makefile*,texi2html}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/vice/doc
# ?
#ln -sf %{_docdir}/%{name}-%{version}/html $RPM_BUILD_ROOT%{_datadir}/vice/doc
@@ -122,29 +134,53 @@
done
cd ../../../..
+install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
+mv $RPM_BUILD_ROOT%{_fontsdir}/{misc,TTF}/CBM.ttf
+
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
+fontpostinst TTF
fontpostinst misc
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
%postun
+fontpostinst TTF
fontpostinst misc
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog FEEDBACK NEWS README doc/iec-bus.txt doc/mon.txt doc/html
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/c1541
+%attr(755,root,root) %{_bindir}/cartconv
+%attr(755,root,root) %{_bindir}/petcat
+%attr(755,root,root) %{_bindir}/vsid
+%attr(755,root,root) %{_bindir}/x128
+%attr(755,root,root) %{_bindir}/x64
+%attr(755,root,root) %{_bindir}/x64dtv
+%attr(755,root,root) %{_bindir}/xcbm2
+%attr(755,root,root) %{_bindir}/xpet
+%attr(755,root,root) %{_bindir}/xplus4
+%attr(755,root,root) %{_bindir}/xvic
%{_datadir}/vice
-%{_fontsdir}/misc/*
-%{_mandir}/man?/*
-%{_infodir}/*.info*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_fontsdir}/misc/vice-cbm.bdf
+%{_fontsdir}/TTF/CBM.ttf
+%{_mandir}/man1/c1541.1*
+%{_mandir}/man1/petcat.1*
+%{_mandir}/man1/vice.1*
+%{_infodir}/vice.info*
+%{_desktopdir}/vice-*.desktop
+%{_pixmapsdir}/c128icon.xpm
+%{_pixmapsdir}/c64dtvicon.xpm
+%{_pixmapsdir}/c64icon.xpm
+%{_pixmapsdir}/cbm2icon.xpm
+%{_pixmapsdir}/peticon.xpm
+%{_pixmapsdir}/plus4icon.xpm
+%{_pixmapsdir}/vic20icon.xpm
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -152,6 +188,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.60 2011/02/21 18:12:41 qboosh
+- added fonts patch to avoid installing fonts in builder's home
+- added link patch to avoid -lnsl -lbsd and other junk
+- install bdf and ttf fonts in proper dirs
+- handle esd and pulse options/bconds with up to date defaults (esd off, pulse on)
+
Revision 1.59 2011/02/02 17:40:24 sparky
- added TODO
================================================================
Index: packages/vice/vice-fonts.patch
diff -u /dev/null packages/vice/vice-fonts.patch:1.1
--- /dev/null Mon Feb 21 19:12:47 2011
+++ packages/vice/vice-fonts.patch Mon Feb 21 19:12:41 2011
@@ -0,0 +1,24 @@
+--- vice-2.2/data/fonts/Makefile.am.orig 2011-02-20 15:01:38.490973392 +0100
++++ vice-2.2/data/fonts/Makefile.am 2011-02-20 21:21:36.078979259 +0100
+@@ -6,21 +6,3 @@
+
+ EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
+
+-install: install-data-am
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir, please wait..." ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ if test "x${HOME}" != "x" ; then \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fc-cache ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ else \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ echo '$$HOME not set... giving up.' ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fi \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ else \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ echo 'fc-cache not available... giving up.' ; \
+- at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fi
+- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \
+- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \
+- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
+- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ rm vice-cbm.bdf ; \
+- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ mkfontdir .
================================================================
Index: packages/vice/vice-link.patch
diff -u /dev/null packages/vice/vice-link.patch:1.1
--- /dev/null Mon Feb 21 19:12:47 2011
+++ packages/vice/vice-link.patch Mon Feb 21 19:12:41 2011
@@ -0,0 +1,38 @@
+--- vice-2.2/configure.in.orig 2011-02-21 16:41:42.186971716 +0100
++++ vice-2.2/configure.in 2011-02-21 18:43:03.414973392 +0100
+@@ -1106,19 +1106,6 @@
+
+ if test x"$UNIX_NETWORK_HEADERS_PRESENT" = "xyes"; then
+
+- dnl Check for possible extra needed network libraries
+- AC_CHECK_LIB(nsl, gethostbyname,[ NETPLAY_LIBS="-lnsl $NETPLAY_LIBS";
+- LIBS="-lnsl $LIBS"],,)
+- AC_CHECK_LIB(socket, gethostbyname,[ NETPLAY_LIBS="-lsocket $NETPLAY_LIBS";
+- LIBS="-lsocket $LIBS"],,)
+- AC_CHECK_LIB(bsd, gethostbyname,[ NETPLAY_LIBS="-lbsd $NETPLAY_LIBS";
+- LIBS="-lbsd $LIBS"],,)
+- AC_CHECK_LIB(net, gethostbyname,[ NETPLAY_LIBS="-lnet $NETPLAY_LIBS";
+- LIBS="-lnet $LIBS"],,)
+- AC_CHECK_LIB(inet, gethostbyname,[ NETPLAY_LIBS="-linet $NETPLAY_LIBS";
+- LIBS="-linet $LIBS"],,)
+- AC_CHECK_LIB(watt, gethostbyname,[ NETPLAY_LIBS="-lwatt $NETPLAY_LIBS";
+- LIBS="-lwatt $LIBS"],,)
+
+ dnl Check for needed functions
+ UNIX_NETWORK_FUNCS_PRESENT=yes
+@@ -2040,15 +2027,6 @@
+ LINK_X_LIBS="$GTK_LIBS $GTKGL_LIBS $LINK_X_LIBS"
+ else
+ AC_DEFINE(USE_COLOR_MANAGEMENT,,[Enable new color management code.])
+- dnl instead of assuming that libsocket needs libnsl, we
+- dnl will check the existance of libnsl first.
+-
+- AC_CHECK_LIB(nsl, gethostbyname,[ X_LIBS="-lnsl $X_LIBS";
+- LINK_X_LIBS="-lnsl $LINK_X_LIBS"],,$X_LIBS)
+- AC_CHECK_LIB(socket, gethostbyname,[ X_LIBS="-lsocket $X_LIBS";
+- LINK_X_LIBS="-lsocket $LINK_X_LIBS"],,$X_LIBS)
+- AC_CHECK_LIB(bsd, gethostbyname,[ X_LIBS="-lbsd $X_LIBS";
+- LINK_X_LIBS="-lbsd $LINK_X_LIBS"],,$X_LIBS)
+ if test x"$ac_cv_lib_ICE_IceConnectionNumber" != "xyes"; then
+ unset ac_cv_lib_ICE_IceConnectionNumber
+ fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vice/vice.spec?r1=1.59&r2=1.60&f=u
More information about the pld-cvs-commit
mailing list