rpms/charis-fonts/devel charis-fonts.spec,1.5,1.6
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Tue Aug 28 20:18:31 UTC 2007
Author: nim
Update of /cvs/extras/rpms/charis-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25707/devel
Modified Files:
charis-fonts.spec
Log Message:
dejavu spec sync + License fix
Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- charis-fonts.spec 21 Jun 2007 06:19:55 -0000 1.5
+++ charis-fonts.spec 28 Aug 2007 20:17:58 -0000 1.6
@@ -1,16 +1,16 @@
%define fontname charis
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts
+%define fontdir %{_datadir}/fonts/%{fontname}/
+%define fontconfdir %{_sysconfdir}/fonts/conf.d/
%define archivename CharisSIL%{version}
Name: %{fontname}-fonts
Version: 4.100
-Release: 2%{?alphatag}%{?dist}
+Release: 3%{?alphatag}%{?dist}
Summary: Charis SIL fonts
Group: User Interface/X
-License: SIL Open Font License
+License: OFL
URL: http://scripts.sil.org/CharisSILFont
# Actual download URL
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}.zip&filename=%{archivename}.zip
@@ -46,8 +46,8 @@
install -m 0644 -p *.ttf %{buildroot}%{fontdir}
# Fontconfig tweaks
-install -m 0755 -d %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/60-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{fontconfdir}
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}60-%{fontname}.conf
%clean
@@ -55,15 +55,15 @@
%post
-if [ -x /usr/bin/fc-cache ]; then
- /usr/bin/fc-cache /usr/share/fonts
+if [ -x %{_bindir}/fc-cache ]; then
+ %{_bindir}/fc-cache %{fontdir}
fi
%postun
if [ "$1" = "0" ]; then
- if [ -x /usr/bin/fc-cache ]; then
- /usr/bin/fc-cache /usr/share/fonts
+ if [ -x %{_bindir}/fc-cache ]; then
+ %{_bindir}/fc-cache %{fontdir}
fi
fi
@@ -72,13 +72,18 @@
%defattr(0644,root,root,0755)
%doc *.txt *.pdf
-%config(noreplace) %{fontconfdir}/conf.d/60-%{fontname}.conf
+%config(noreplace) %{fontconfdir}60-%{fontname}.conf
%dir %{fontdir}
%{fontdir}/*.ttf
%changelog
+* Tue Aug 28 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+⺠4.100-3
+â Sync with dejavu spec
+â Licence++
+
* Thu Jun 21 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
⺠4.100-2
â Fix URL (bug #245101)
More information about the scm-commits
mailing list