X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=console-tools.spec;h=1b3ef23c02116a31c899f7471579dd4cc7b8c28f;hb=0b5a63bd8576b685f0558ecd73b856e9379ab356;hp=fb881f1ad054383f19e2d83cd09642384dcabc25;hpb=3658854dbea49bbd8efebae10a6b4fec13698ec5;p=packages%2Fconsole-tools.git

diff --git a/console-tools.spec b/console-tools.spec
index fb881f1..1b3ef23 100644
--- a/console-tools.spec
+++ b/console-tools.spec
@@ -1,39 +1,52 @@
 Summary:	Linux console utilities
 Summary(pl):	Narzêdzia do obs³ugi konsoli
 Name:		console-tools
-Version:	0.2.0
-Release:	2
-Copyright:	GPL
-Group:		Utilities/Console
-Group(pl):	Narzêdzia/Konsola
-Source0:	ftp://sunsite.unc.edu/pub/Linux/system/keyboards/%{name}-%{version}.tar.gz
-Source1:	console-init.tar.gz
+Version:	0.3.3
+Release:	10
+Epoch:		1
+License:	GPL
+Group:		Applications/Console
+Source0:	http://altern.org/ydirson/soft/lct/dev/%{name}-%{version}.tar.gz
+Source1:	console.init
+Source2:	console.sysconfig
+Source3:	console.sh
+Patch0:		%{name}-man_compat.patch
+Patch1:		%{name}-no_bash.patch
+Patch2:		%{name}-acm.patch
+Patch3:		%{name}-readacm.patch
+Patch4:		%{name}-psfgettable.patch
+Patch5:		%{name}-resizecons.patch
+Patch6:		%{name}-amfix.patch
+URL:		http://altern.org/ydirson/en/lct/
 Prereq:		/sbin/chkconfig
 BuildRequires:	sgml-tools
 BuildRequires:	jade
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	gettext-devel
+Requires:	console-data
+Requires:	localedb-src
 Obsoletes:	kbd
 Provides:	kbd
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 console-tools are utilities for handling console fonts and keyboard
-maps. 
-It is derived from kbd-0.94.tar.gz, with many bug-fixes and
-enhancements. 
-The data files are now part of a new package (console-data).
+maps. It is derived from kbd-0.99.tar.gz, with many bug-fixes and
+enhancements. The data files are now part of a new package
+(console-data).
 
 %description -l pl
-Console-tools to narzêdzia zajmuj±ce siê fontami i mapami klawiatury 
-na konsoli. 
-Pakiet wywodzi siê z kbd-0.94.tar.gz, poprawiaj±c wiele b³êdów
-i wprowadzaj±c rozszerzenia. 
-Pliki danych s± teraz czê¶ci± nowego pakietu (console-data).
+Console-tools to narzêdzia zajmuj±ce siê fontami i mapami klawiatury
+na konsoli. Pakiet wywodzi siê z kbd-0.99.tar.gz, poprawiaj±c wiele
+b³êdów i wprowadzaj±c rozszerzenia. Pliki danych s± teraz czê¶ci±
+nowego pakietu (console-data).
 
 %package devel
 Summary:	Header files
 Summary(pl):	Pliki nag³ówkowe
-Group:		Development
-Group(pl):	Programowanie
+Group:		Development/Libraries
 Requires:	%{name} = %{version}
 
 %description devel
@@ -45,8 +58,7 @@ Pliki nag
 %package static
 Summary:	Static libraries
 Summary(pl):	Biblioteki statyczne
-Group:		Libraries
-Group(pl):	Biblioteki
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -56,38 +68,46 @@ Console-tools static libraries.
 Biblioteki statyczne console-tools.
 
 %prep
-%setup -q -a1 
+%setup  -q
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
+rm -f missing
+gettextize --copy --force
+libtoolize --copy --force
+aclocal
+autoconf
+automake -a -c -f
 %configure \
 	--enable-kbd-compat
-make 
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,profile.d}
 
-make install-strip prefix=$RPM_BUILD_ROOT/usr \
-	bindir=$RPM_BUILD_ROOT/%{_bindir} \
-	mandir=$RPM_BUILD_ROOT/%{_mandir} \
-	libdir=$RPM_BUILD_ROOT/%{_libdir} \
-	includedir=$RPM_BUILD_ROOT/%{_includedir}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-cp -a etc $RPM_BUILD_ROOT
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/console
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 
-for i in loadunimap mapscrn saveunimap savefont setfont; do
-	rm -f $RPM_BUILD_ROOT%{_mandir}/man8/$i.8
-	echo .so kbd-compat.8 > $RPM_BUILD_ROOT%{_mandir}/man8/$i.8
-done
-
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*so.*.*
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
-	README NEWS BUGS doc/README.* doc/*.txt \
+gzip -9nf README NEWS BUGS doc/README.* doc/*.txt \
 	doc/{dvorak,file-formats,contrib}/*
 
 %find_lang %{name}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
+/sbin/ldconfig
 /sbin/chkconfig --add console
 
 %preun
@@ -95,18 +115,18 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del console
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc {README,NEWS,BUGS}.gz doc/README.*
-%doc doc/{dvorak,file-formats,contrib}
+%doc doc/{dvorak,contrib}
+%doc doc/*.txt.gz
 
-%attr(754,root,root) %config /etc/rc.d/init.d/console
+%attr(754,root,root) /etc/rc.d/init.d/console
+%attr(755,root,root) /etc/profile.d/console.sh
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/console
 
-%attr(755,root,root) /etc/profile.d/console.sh
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
@@ -114,11 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*.html doc/*.txt.gz
-
+%doc doc/file-formats/{TMPL,cp,cpi,psf,raw,xpsf-draft*}.gz
 %{_includedir}/lct
 %attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*.la
 
 %files static
-%defattr(644,root,root)
+%defattr(644,root,root,755)
 %{_libdir}/lib*.a