Author: tagoh
Update of /cvs/pkgs/rpms/knm_new-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4331
Modified Files:
knm_new-fonts.spec
Log Message:
* Thu Mar 26 2009 Akira TAGOH <[email protected]> - 1.1-5
- Clean up a spec file.
- Rebuild to correct autoprovides (#491966)
Index: knm_new-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knm_new-fonts/devel/knm_new-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- knm_new-fonts.spec 25 Feb 2009 11:40:21 -0000 1.3
+++ knm_new-fonts.spec 26 Mar 2009 09:37:35 -0000 1.4
@@ -1,21 +1,23 @@
-%define fontdir %{_datadir}/fonts/%{name}
+%define fontname knm_new
%define catalogue %{_sysconfdir}/X11/fontpath.d
-Name: knm_new-fonts
+Name: %{fontname}-fonts
Version: 1.1
Release: 4%{?dist}
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mkfontdir
+
+Summary: 12x12 JIS X 0208 Bitmap font
+Group: User Interface/X
+License: GPL+
+
## the following upstream URL is a dead link anymore.
#URL: http://www.din.or.jp/~storm/fonts/
#Source0: http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
Source0: knm_new.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+BuildRequires: mkfontdir fontpackages-devel
-
-Summary: 12x12 JIS X 0208 Bitmap font
-License: GPL+
-Group: User Interface/X
+Requires: fontpackages-filesystem
Conflicts: fonts-japanese <= 0.20061016-11.fc8
Provides: knm_new = 1.1-16
Obsoletes: knm_new <= 1.1-16
@@ -34,32 +36,32 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{fontdir}
-install -d $RPM_BUILD_ROOT%{catalogue}
+install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
+install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}
-install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/
+install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/
-%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir}
+%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{_fontdir}
# Install catalogue symlink
-%{__ln_s} -f %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+%{__ln_s} -f %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{fontname}
%clean
rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root, -)
+%_font_pkg *.pcf.gz
%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
-%dir %{fontdir}
-%{fontdir}/*.pcf.gz
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%{catalogue}/*
%changelog
+* Thu Mar 26 2009 Akira TAGOH <[email protected]> - 1.1-5
+- Clean up a spec file.
+- Rebuild to correct autoprovides (#491966)
+
* Wed Feb 25 2009 Fedora Release Engineering <[email protected]>
- 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
_______________________________________________
Fedora-fonts-bugs-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list
