X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffonts-TTF-DejaVu.git;a=blobdiff_plain;f=fonts-TTF-DejaVu.spec;h=3ad502caf663b9cbd22738ce3aef15d920f8f3f8;hp=ab4e039c94530beccebde77f42fe10455974cd51;hb=c9d8957c39181758ebb765c5246774234343324e;hpb=3cd86ffc1816b3631fee9b3449ef6d6e98c29235

diff --git a/fonts-TTF-DejaVu.spec b/fonts-TTF-DejaVu.spec
index ab4e039..3ad502c 100644
--- a/fonts-TTF-DejaVu.spec
+++ b/fonts-TTF-DejaVu.spec
@@ -1,14 +1,12 @@
-%define		_name	dejavu
-%define		_rel	1
-Summary:	Bitstream Vera True Type fonts fork with latin-ext-A characters
-Summary(pl.UTF-8):	Odłam fontów True Type Bitstream Vera ze znakami latin-ext-A
+Summary:	Bitstream Vera TrueType fonts fork with additional characters
+Summary(pl.UTF-8):	Odłam fontów TrueType Bitstream Vera z dodanymi znakami
 Name:		fonts-TTF-DejaVu
-Version:	2.14
+Version:	2.34
 Release:	1
 License:	distributable
 Group:		Fonts
-Source0:	http://dl.sourceforge.net/dejavu/%{_name}-ttf-%{version}.tar.bz2
-# Source0-md5:	d2907aaa7ba88473b1a2e1ee555cca15
+Source0:	http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-%{version}.tar.bz2
+# Source0-md5:	161462de16e2ca79873bc2b0d2e6c74c
 URL:		http://dejavu.sourceforge.net/wiki/index.php/Main_Page
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
@@ -26,13 +24,20 @@ DejaVu to zestaw fontów oparty na Bitstream Vera z dodanymi znakami
 wielu alfabetów.
 
 %prep
-%setup -q -n %{_name}-ttf-%{version}
+%setup -q -n dejavu-fonts-ttf-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_ttffontsdir}
+install -d $RPM_BUILD_ROOT{%{_ttffontsdir},%{_datadir}/fontconfig/conf.avail,/etc/fonts/conf.d}
 
-install *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+install ttf/*.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+
+cd fontconfig
+for fontconf in *conf ; do
+	install -m 0644 -p $fontconf $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
+	ln -s %{_datadir}/fontconfig/conf.avail/$fontconf \
+		$RPM_BUILD_ROOT/etc/fonts/conf.d/$fontconf
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,5 +50,9 @@ fontpostinst TTF
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS README NEWS
-%{_ttffontsdir}/*
+%doc AUTHORS BUGS LICENSE NEWS README
+%{_ttffontsdir}/DejaVu*.ttf
+%{_datadir}/fontconfig/conf.avail/20-unhint-small-dejavu-*.conf
+%{_datadir}/fontconfig/conf.avail/57-dejavu-*.conf
+/etc/fonts/conf.d/20-unhint-small-dejavu-*.conf
+/etc/fonts/conf.d/57-dejavu-*.conf