[fonts-KOI8-R] Use rpm macros
Parag Nemade
pnemade at fedoraproject.org
Fri Feb 20 08:21:17 UTC 2015
commit 0814095896fedb79a31ec16415defd1da4d9b5f3
Author: Parag Nemade <pnemade at redhat.com>
Date: Fri Feb 20 13:12:14 2015 +0530
Use rpm macros
fonts-KOI8-R.spec | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/fonts-KOI8-R.spec b/fonts-KOI8-R.spec
index b80eadd..233782d 100644
--- a/fonts-KOI8-R.spec
+++ b/fonts-KOI8-R.spec
@@ -1,5 +1,6 @@
-%define ISONAME KOI8-R
-%define catalogue /etc/X11/fontpath.d
+%global ISONAME KOI8-R
+%global catalogue %{_sysconfdir}/X11/fontpath.d
+
Name: fonts-%{ISONAME}
Version: 1.0
Release: 20%{?dist}
@@ -61,27 +62,27 @@ cp %{SOURCE1} ./Makefile
make all
%install
-DSTFONT=$RPM_BUILD_ROOT/usr/share/fonts/%{ISONAME}
+DSTFONT=$RPM_BUILD_ROOT%{_datadir}/fonts/%{ISONAME}
make install PREFIX=$RPM_BUILD_ROOT \
FONTDIR=$DSTFONT
mkdir -p $RPM_BUILD_ROOT%{catalogue}
-ln -sf /usr/share/fonts/%{ISONAME}/misc $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-misc
-ln -sf /usr/share/fonts/%{ISONAME}/75dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-75dpi
-ln -sf /usr/share/fonts/%{ISONAME}/100dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-100dpi
+ln -sf %{_datadir}/fonts/%{ISONAME}/misc $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-misc
+ln -sf %{_datadir}/fonts/%{ISONAME}/75dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-75dpi
+ln -sf %{_datadir}/fonts/%{ISONAME}/100dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-100dpi
%files
%doc doc Cyrillic/COPYRIGHT
-%dir /usr/share/fonts/%{ISONAME}
+%dir %{_datadir}/fonts/%{ISONAME}
%{catalogue}/%{ISONAME}-misc
-/usr/share/fonts/%{ISONAME}/misc
+%{_datadir}/fonts/%{ISONAME}/misc
%files 75dpi
%{catalogue}/%{ISONAME}-75dpi
-/usr/share/fonts/%{ISONAME}/75dpi
+%{_datadir}/fonts/%{ISONAME}/75dpi
%files 100dpi
%{catalogue}/%{ISONAME}-100dpi
-/usr/share/fonts/%{ISONAME}/100dpi
+%{_datadir}/fonts/%{ISONAME}/100dpi
%changelog
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-20
More information about the scm-commits
mailing list