SPECS: vice.spec - up to 2.0 - use $(VICEDIR) instead of $(prefix)/lib/vice...

[lisu]

Author: lisu                         Date: Thu Nov 27 08:38:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.0
- use $(VICEDIR) instead of $(prefix)/lib/vice 
	- use perl instead of FHS.patch to change fonts dir
	- VICEDIR gived upstream
- new BR: xorg-app-mkfontdir

---- Files affected:
SPECS:
   vice.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/vice.spec
diff -u SPECS/vice.spec:1.50 SPECS/vice.spec:1.51
--- SPECS/vice.spec:1.50	Mon Aug 13 11:29:14 2007
+++ SPECS/vice.spec	Thu Nov 27 09:38:37 2008
@@ -2,12 +2,12 @@
 Summary:	Versatile Commodore Emulator
 Summary(pl.UTF-8):	Uniwersalny emulator Commodore
 Name:		vice
-Version:	1.22
+Version:	2.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
-Source0:	http://www.viceteam.org/online/%{name}-%{version}.tar.gz
-# Source0-md5:	33204acbb74bafb12594d39b55888626
+Source0:	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz
+# Source0-md5:	e4af3962469cb2279429718946528f1d
 Source1:	%{name}-c128.desktop
 Source2:	%{name}-c64.desktop
 Source3:	%{name}-cbm2.desktop
@@ -15,9 +15,8 @@
 Source5:	%{name}-plus4.desktop
 Source6:	%{name}-vic20.desktop
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-FHS.patch
-Patch2:		%{name}-gettext.patch
-Patch3:		%{name}-home_etc.patch
+Patch1:		%{name}-gettext.patch
+Patch2:		%{name}-home_etc.patch
 URL:		http://www.viceteam.org/
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel >= 1.2.0
@@ -38,6 +37,7 @@
 BuildRequires:	readline-devel
 BuildRequires:	texinfo
 BuildRequires:	xorg-app-bdftopcf
+BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXrandr-devel
@@ -66,7 +66,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+perl -i -pe 's@\$\(VICEDIR\)/fonts@%{_fontsdir}/misc@' data/fonts/Makefile.am
 
 %build
 %{__gettextize}
@@ -97,12 +97,13 @@
 
 perl -i -pe 's/SUBDIRS = html\n//' doc/Makefile
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	VICEDIR="%{_datadir}/%{name}"
 
-gzip -9n $RPM_BUILD_ROOT%{_fontsdir}/misc/*
 rm -f doc/html/{Makefile*,texi2html}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/vice/doc
-ln -sf %{_docdir}/%{name}-%{version}/html $RPM_BUILD_ROOT%{_datadir}/vice/doc
+# ?
+#ln -sf %{_docdir}/%{name}-%{version}/html $RPM_BUILD_ROOT%{_datadir}/vice/doc
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
@@ -147,6 +148,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2008/11/27 08:38:37  lisu
+- up to 2.0
+- use $(VICEDIR) instead of $(prefix)/lib/vice
+	- use perl instead of FHS.patch to change fonts dir
+	- VICEDIR gived upstream
+- new BR: xorg-app-mkfontdir
+
 Revision 1.50  2007/08/13 09:29:14  lisu
 - 1.22
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vice.spec?r1=1.50&r2=1.51&f=u