- updated to 0.0.24

[packages/fonts-OTF-Cantarell.git] / fonts-OTF-Cantarell.spec

diff --git a/fonts-OTF-Cantarell.spec b/fonts-OTF-Cantarell.spec
index 2683964227d380112802c8f100d5aebdfac4c6b6..b116991776671a8c08863cad835b354f86ab2434 100644 (file)
--- 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
+Version:       0.0.24
 Release:       1
-License:       OFL
+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: d478535ce3800967a98c8e9bf30c074e
 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
@@ -52,7 +53,7 @@ fontpostinst OTF
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README
-%{_sysconfdir}/fonts/conf.avail/31-cantarell.conf
+%doc COPYING NEWS README
+%{_datadir}/fontconfig/conf.avail/31-cantarell.conf
 %{_sysconfdir}/fonts/conf.d/31-cantarell.conf
 %{_otffontsdir}/Cantarell-*.otf