X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cmatrix.spec;h=30d77962c72f0ff90c1d847718fc88b91f586006;hb=919416b8006490394af7c2349ce4e497dd0b4209;hp=5b628088ef4c4892c03daf03dceb8e5a0b06f27d;hpb=76eb580b6dc6e4768869cba948f1489bee060bfd;p=packages%2Fcmatrix.git

diff --git a/cmatrix.spec b/cmatrix.spec
index 5b62808..30d7796 100644
--- a/cmatrix.spec
+++ b/cmatrix.spec
@@ -1,15 +1,20 @@
 Summary:	CMatrix - show a scrolling 'Matrix' like screen in Linux (curses based)
+Summary(pl):	CMatrix - pokazuje efekt spadaj±cych znaków znany z filmu "Matrix"
 Name:		cmatrix
-Version:	1.1b
-Release:	3
-License:	GPL
-Group:		Utilities/Console
-Group(pl):	Narzêdzia/Konsola
+Version:	1.2a
+Release:	4
+License:	GPL v2
+Group:		Applications/Terminal
 Source0:	http://www.asty.org/cmatrix/dist/%{name}-%{version}.tar.gz
-Patch0:		cmatrix-DESTDIR.patch
+# Source0-md5:	ebfb5733104a258173a9ccf2669968a1
+Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-setfont-consolechars-choice.patch
 URL:		http://www.asty.org/cmatrix/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	ncurses-devel >= 5.0
-Prereq:		/usr/X11R6/bin/mkfontdir
+Requires(post,postun):	/usr/X11R6/bin/mkfontdir
+Requires:	kbd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -18,31 +23,45 @@ What is CMatrix? :-)
 CMatrix is a program I wrote one evening because I didn't want to have
 to run Wind*ws to see the cool scrolling lines from 'The Matrix', my
 fave movie. If you haven't seen this movie and you are a fan of
-computers or sci-fi in general, go see this movie!!! I have seen it
-twice, and I'm pondering seeing it again before it comes out on VHS.
+computers or sci-fi in general, go see this movie!!!
+
+%description -l pl
+What is CMatrix? :-)
+
+CMatrix zosta³ napisany w jeden wieczór by¶ nie musia³ uruchamiaæ M$
+Wind*ws, aby zobaczyæ na konsoli interesuj±c efekt spadaj±cych znaków
+znany z filmu "Matrix". Je¿eli nie widzia³e¶ tego filmu, a jeste¶
+fanem komputerów i sci-fi w ogólno¶ci - biegnij zobaczyæ ten film!!
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-automake
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses"
-LDFLAGS="-s"
-export CFLAGS LDFLAGS
-%configure
+rm -f missing
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+%configure \
+	--with-setfont
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_datadir}/{consolefonts,fonts/misc},%{_bindir}} \
+	$RPM_BUILD_ROOT%{_mandir}/man1
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	Xmiscfontsdir=/usr/share/fonts/misc
+install cmatrix $RPM_BUILD_ROOT%{_bindir}
+install cmatrix.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install mtx.pcf $RPM_BUILD_ROOT%{_datadir}/fonts/misc
+install matrix.psf.gz $RPM_BUILD_ROOT%{_datadir}/consolefonts
 
-gzip -9nf NEWS README README.fonts TODO \
-	$RPM_BUILD_ROOT%{_mandir}/man1/* \
-	$RPM_BUILD_ROOT%{_datadir}/fonts/misc/*
+gzip -9nf $RPM_BUILD_ROOT%{_datadir}/fonts/misc/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
 cd %{_datadir}/fonts/misc/;
@@ -52,12 +71,10 @@ cd %{_datadir}/fonts/misc/;
 cd %{_datadir}/fonts/misc/;
 /usr/X11R6/bin/mkfontdir
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc NEWS README TODO ChangeLog
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/fonts/misc/*
+%{_datadir}/consolefonts/*
 %{_mandir}/man1/*