X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fonts-OTF-Cantarell.spec;h=c44bff9aa469f64cd5713ffcefac111dc64b365f;hb=8355959f2d2f658d214fadc826b594ae4b663c5d;hp=84ecb93735816fe5d98e6bf0de12e505b6f902bf;hpb=2552432f0269d8bf002ec995f024250ebab278a4;p=packages%2Ffonts-OTF-Cantarell.git

diff --git a/fonts-OTF-Cantarell.spec b/fonts-OTF-Cantarell.spec
index 84ecb93..c44bff9 100644
--- a/fonts-OTF-Cantarell.spec
+++ b/fonts-OTF-Cantarell.spec
@@ -1,16 +1,17 @@
 Summary:	Cantarell fonts
 Summary(pl.UTF-8):	Fonty Cantarell
 Name:		fonts-OTF-Cantarell
-Version:	0.0.9
-Release:	2
+Version:	0.0.21
+Release:	1
 License:	OFL v1.1
 Group:		Fonts
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-%{version}.tar.xz
-# Source0-md5:	606275190e4c1927ce4b4cfdb55363a2
+# Source0-md5:	a84a5e87e5cc77db624ba1ca3138b83f
 URL:		http://abattis.org/cantarell/
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires(post,postun):	fontpostinst
+Requires:	fontconfig >= 1:2.10.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,12 +35,12 @@ Jest to rodzina krojów bezszeryfowych Humanist.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_otffontsdir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
+install -d $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 cp -a otf/*.otf $RPM_BUILD_ROOT%{_otffontsdir}
-cp fontconfig/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
-ln -s ../conf.avail/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+cp fontconfig/31-cantarell.conf $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
+ln -s %{_datadir}/fontconfig/conf.avail/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +54,6 @@ fontpostinst OTF
 %files
 %defattr(644,root,root,755)
 %doc COPYING NEWS README
-%{_sysconfdir}/fonts/conf.avail/31-cantarell.conf
+%{_datadir}/fontconfig/conf.avail/31-cantarell.conf
 %{_sysconfdir}/fonts/conf.d/31-cantarell.conf
 %{_otffontsdir}/Cantarell-*.otf