Dnia 05-02-2005, sob o godzinie 16:21 +0100, Jan Meizner napisał(a):
> ...wrzuciłeś czy wyrzuciłeś? A ogólnie to ;) ...
> 1) Co z tymi logami się stało - z diffa wynika, że nic jeśl dobrze widzę
> (możana się pogubić)...
To było tak ze jakimś chyba w stanie pomroczności jasnej sprawdzalem
obecnaosc vice.spec na cvs'ie i wyszlo tak ze napisalem speca od podstaw
wiec logi w nim byly czyste. Teraz jak sie dowiedzialem co jest grane
dodalem tamte.
> 2) diff -u
Wlasnie mi to jakos dziwnie wyglądało i sie glowilem czy to sie
zaaplikuje :d
> 3) co robi ten bezwarunkowy BR: kernel-headers?
> Cytat z pld-devel-pl:
> "Nie umieszczamy "BuildRequires: kernel-headers" w pakietach z samymi
> programami user-space (sam pakiet glibc-devel wymaga właściwych
> nagłówków jądra). Taka zależność powinna pojawiać się tylko
> w pakietach zawierających moduły jądra, i to warunkowo, czyli jako:
> %{?with_dist_kernel:BuildRequires: kernel-headers} "
> ...to jest moduł jądra? , wątpie...a jak by było to bcond.
No tutaj to powiem tak. Nie wiem jak te wasze buildery sa zorganizowane
ale u mnie moze tego spoko nie byc a nagłówki potrzebne. Zahaszowalem.
Jak potem nie bedzie joystick dzialal to nie moja wina a jeszcze chyba
looka za soundcard.h Młody jestem nie znam sie.
--
l00natyk <[EMAIL PROTECTED]>
Plasticine Revolution Front
Index: SPECS/vice.spec
===================================================================
RCS file: /cvsroot/SPECS/vice.spec,v
retrieving revision 1.35
diff -u -r1.35 vice.spec
--- SPECS/vice.spec 20 Sep 2004 22:37:51 -0000 1.35
+++ SPECS/vice.spec 6 Feb 2005 01:49:10 -0000
@@ -1,100 +1,122 @@
# $Revision: 1.35 $, $Date: 2004/09/20 22:37:51 $
#
-# Conditional build:
-%bcond_without gnome # without GNOME support
+####################################################################
#
-Summary: Commodore emulator
-Summary(pl): Emulator Commodore
+# without gnomeui is's very ugly and annoying, you can try it :P
+#
+# TODO:
+#
+# - nice vice.desktop
+# - put emulators to separate packages
+#
+####################################################################
+%bcond_without gnome # without gnome user interface
+%bcond_without ffmpeg # without ffmpeg
+%bcond_with xaw3d # Xaw3d will replace standard Xaw interface
+%bcond_with sdl # build with SDL_sound
+%bcond_with full # enable fullscreen
+Summary: VICE, the Versatile Commodore Emulator
+Summary(pl): Pakiet emulatorów Commodore
Name: vice
-Version: 1.13
-Release: 2
+Version: 1.15
+Release: 3.0
License: GPL
Group: Applications/Emulators
Source0: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz
-# Source0-md5: 6e7bfc52bc273ebeb057c7cb21357c5b
-Patch0: %{name}-info.patch
-Patch1: %{name}-DESTDIR.patch
-Patch2: %{name}-gettext.patch
-Patch3: %{name}-home_etc.patch
-URL: http://viceteam.bei.t-online.de/
-BuildRequires: SDL-devel >= 1.2.0
-BuildRequires: XFree86-devel
-BuildRequires: autoconf
-BuildRequires: automake
+# Source0-md5: da91ecf6b8d6bf95d3a9c33929b466b4
+URL: http://www.viceteam.org/
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%{!?without_gnome:BuildRequires: libgnomeui-devel}
+%{!?without_ffmpeg:BuildRequires: ffmpeg-devel}
+%{?with_xaw3d:BuildRequires: Xaw3d-devel}
+%{?with_sdl:BuildRequires: SDL_sound-devel}
+#BuildRequires: kernel-headers
+BuildRequires: perl
+BuildRequires: gettext-devel
BuildRequires: bison
-BuildRequires: esound-devel
BuildRequires: flex
-BuildRequires: gettext-devel
-%{?with_gnome:BuildRequires: gnome-libs-devel}
-BuildRequires: libpng-devel
BuildRequires: readline-devel
-BuildRequires: texinfo
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: imlib-devel
+BuildRequires: rpmbuild(macros) >= 1.118
%description
-VICE is a Versatile Commodore Emulator, i.e. a program that runs on a
-Unix, MS-DOS, Win95/NT, OS/2, RiscOS or BeOS machine and executes
-programs intended for the old 8-bit Commodore computers. The current
-version emulates the C64, the C128 (80 column screen is included now),
-the VIC20, all the PET models (except the SuperPET 9000, which is out
-of line anyway) and the CBM-II (aka C610).
+VICE is a set of accurate emulators for the Commodore 64, 128, VIC20,
+PET, Plus4 and CBM-II 8-bit computers, all of which run under the X
+Window System.
%description -l pl
-VICE jest wszechstronnym emulatorem 8-bitowego komputera Commodore.
-Aktualna wersja emuluje C64, C128 (wraz z trybem pracy 80 kolumnowym),
-VIC20, wszystkie modele PET (poza SuperPET 9000) oraz CBM-II (C610).
+Vice jest znakomitym pakietem emulującym rodzinę komputerów Commodore
+działającym pod X-Windows. Emuluje maszyny Commodore 64, 128, VIC20,
+PET, Plus4, CBM-II.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-%{__gettextize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd src/resid
-%{__autoconf}
-cd ../..
+CFLAGS="%{rpmcflags} -DNO_REGPARM"
%configure \
- --enable-autobpp \
- --with-sdl \
- --enable-fullscreen \
- %{?with_gnome:--enable-gnomeui} \
- --enable-nls \
- --without-xaw3d \
- --without-included-gettext \
- --with-x
+ %{!?with_sdl:--without-sdl} \
+ %{!?without_gnome:--enable-gnomeui} \
+ %{!?without_ffmpeg:--enable-ffmpeg} \
+ %{!?with_xaw3d:--without-xaw3d} \
+ %{?with_xaw3d:--with-xaw3d} \
+ %{?with_sdl:--enable-sdl} \
+ %{?with_full:--enable-fullscreen}
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_prefix}/{bin,lib/vice}
+install -d $RPM_BUILD_ROOT%{_prefix}/{share/man/man1,share/info}
+install -d $RPM_BUILD_ROOT%{_datadir}/locale/{pl,de,fr,it,sv,\
+pl/LC_MESSAGES,\
+de/LC_MESSAGES,\
+fr/LC_MESSAGES,\
+it/LC_MESSAGES,\
+sv/LC_MESSAGES}
+cp man/* $RPM_BUILD_ROOT%{_mandir}/man1/
+cp doc/vice.info* $RPM_BUILD_ROOT%{_datadir}/info/
+cp src/x* $RPM_BUILD_ROOT%{_bindir}/
+cp src/c1541 $RPM_BUILD_ROOT%{_bindir}/
+cp src/petcat $RPM_BUILD_ROOT%{_bindir}/
+cp po/pl.gmo $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/vice.mo
+cp po/de.gmo $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/vice.mo
+cp po/fr.gmo $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/vice.mo
+cp po/it.gmo $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/vice.mo
+cp po/sv.gmo $RPM_BUILD_ROOT%{_datadir}/locale/sv/LC_MESSAGES/vice.mo
+cp src/arch/unix/vsid $RPM_BUILD_ROOT%{_bindir}/
+cp -r data/* $RPM_BUILD_ROOT%{_prefix}/lib/vice/
+mkfontdir $RPM_BUILD_ROOT%{_prefix}/lib/vice/fonts
+rm -r $RPM_BUILD_ROOT/*/*/*/*/Makefile*
+rm -r $RPM_BUILD_ROOT/*/*/*/Makefile*
+gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/*
+gzip -9 $RPM_BUILD_ROOT%{_datadir}/info/*
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%files -f %{name}.lang
+%files
%defattr(644,root,root,755)
-%doc AUTHORS Chan* FEEDBACK NEWS README
-%attr(0755,root,root) %{_bindir}/*
-%{_libdir}/vice
-%{_mandir}/man?/*
-%{_infodir}/*.info*
+%doc AUTHORS FEEDBACK INSTALL README doc/html/vice* doc/html/index.html doc/html/images/* doc/html/plain/*
+%attr(755,root,root) %{_bindir}/x64
+%attr(755,root,root) %{_bindir}/x128
+%attr(755,root,root) %{_bindir}/xplus4
+%attr(755,root,root) %{_bindir}/xvic
+%attr(755,root,root) %{_bindir}/xpet
+%attr(755,root,root) %{_bindir}/xcbm2
+%attr(755,root,root) %{_bindir}/c1541
+%attr(755,root,root) %{_bindir}/petcat
+%attr(755,root,root) %{_bindir}/vsid
+%{_prefix}/lib/vice/
+%{_mandir}/man1/*
+%{_datadir}/info/vice.info*
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vice.mo
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vice.mo
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vice.mo
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/vice.mo
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/vice.mo
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
