rpms/VLGothic-fonts/devel VLGothic-fonts.spec,1.10,1.11

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12994

Modified Files:
	VLGothic-fonts.spec 
Log Message:
- move monospace font to main package and obsolete monospace subpackage
- rename sans subpackage to proportional and obsolete sans subpackage
- use a separate font dir for the proportional font subpackage
- add fc-cache scriptlets
- drop the docs subpackage
- use fontname, fontdir, and fontconfdir macros
- improve summaries and descriptions
- do not require fontconfig
- do not obsolete or provide VLGothic anymore



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VLGothic-fonts.spec	12 Jan 2008 02:31:32 -0000	1.10
+++ VLGothic-fonts.spec	17 Jan 2008 05:35:04 -0000	1.11
@@ -1,59 +1,51 @@
-Name: VLGothic-fonts
+%define fontname VLGothic
+%define fontdir %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d
+
+Name: %{fontname}-fonts
 Version: 20071215
-Release: 1%{?dist}
-Summary: VLGothic the Japanese TrueType font
+Release: 2%{?dist}
+Summary: Japanese TrueType font
 
 License: mplus and BSD
 Group: User Interface/X
 URL: http://dicey.org/vlgothic
-Source0: http://vinelinux.org/~daisuke/vlgothic/VLGothic-%{version}.tar.bz2
+Source0: http://vinelinux.org/~daisuke/vlgothic/%{fontname}-%{version}.tar.bz2
 Source1: 59-VLGothic-sans.conf
 Source2: 59-VLGothic-monospace.conf
-BuildRoot: %{_tmppath}/VLGothic-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-
-Requires: fontconfig
-Obsoletes: VLGothic < %{version}-%{release}
-Provides: VLGothic = %{version}-%{release}
-Requires: %{name}-docs = %{version}-%{release}
-Requires: %{name}-sans = %{version}-%{release}
-Requires: %{name}-monospace = %{version}-%{release}
+Obsoletes: %{name}-monospace < 20071215-2
 
 %description
-VLGothic is a Japanese TrueType font from Vine Linux project.
-The most grphys are taken from M+ font and sazanami mincho font, 
-but there are some fixes applied by the project.
-
-%package docs
-Summary: Documents for VLGothic-fonts
-Group: Documentation
+VLGothic provides Japanese TrueType fonts from the Vine Linux project.
+Most of the glyphs are taken from the M+ and Sazanami Gothic fonts, 
+but some have also been improved by the project.
 
-%description docs
-The VLGothic-fonts-docs package contains documentation for VLGothic font.
+The main package provides the monospace VLGothic font.
 
-%package sans
-Summary: Sans glyphs of VLGothic-fonts
-Group: User Interface/X
-Requires: %{name}-docs = %{version}-%{release}
-Obsoletes: VLGothic < %{version}-%{release}
+%description -l ja
+VLゴシックフォントファミリは、 M+ FONTS PROJECT による M+1C および M+1M フォントを
+英数字、かな、および一部の漢字に使用し、不足部分として Electronic Font Open Laboratory
+による さざなみゴシックフォント をベースに Project Vine が改変し漢字部に使用した
+ゴシック体の日本語 TrueType フォントです。
 
-%description sans
-The VLGothic-fonts-sans package contains sans glyphs of VLGothic fonts.
 
-%package monospace
-Summary: Monospace glyphs of VLGothic-fonts
+%package proportional
+Summary: Proportional Japanese TrueType font
 Group: User Interface/X
-Requires: %{name}-docs = %{version}-%{release}
-Obsoletes: VLGothic < %{version}-%{release}
+Obsoletes: %{name}-sans < 20071215-2
 
-%description monospace
-The VLGothic-fonts-monospace package contains monospace glyphs of VLGothic fonts.
+%description proportional
+This provides the VLGothic font with proportional glyphs for some non-Japanese
+characters.
 
 %prep
-%setup -q -n VLGothic
+%setup -q -n %{fontname}
 
 
 %build
+%{nil}
 
 
 %install
@@ -63,14 +55,36 @@
 install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
 install -p -m644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/fonts/VLGothic
-mv *.ttf ${RPM_BUILD_ROOT}/%{_datadir}/fonts/VLGothic
-
-%post sans
-rm -f /etc/fonts/conf.d/59-VLGothic.conf
+mkdir -p ${RPM_BUILD_ROOT}/%{fontdir}
+mkdir -p ${RPM_BUILD_ROOT}/%{fontdir}-proportional
+install -p -m644 VL-Gothic-Regular.ttf ${RPM_BUILD_ROOT}/%{fontdir}
+install -p -m644 VL-PGothic-Regular.ttf ${RPM_BUILD_ROOT}/%{fontdir}-proportional
+
+
+%post
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache -f %{fontdir} || :
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache -f %{fontdir} || :
+  fi
+fi
+
+%post proportional
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache -f %{fontdir}-proportional || :
+fi
+
+%postun proportional
+if [ "$1" = "0" ]; then
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache -f %{fontdir}-proportional || :
+  fi
+fi
 
-%post monospace
-rm -f /etc/fonts/conf.d/59-VLGothic.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -78,23 +92,30 @@
 
 %files
 %defattr(-,root,root,-)
+%doc README* LICENSE*
+%dir %{fontdir}
+%config(noreplace) %{_sysconfdir}/fonts/conf.d/59-VLGothic-monospace.conf
+%{fontdir}/VL-Gothic-Regular.ttf
 
-%files monospace
-%dir %{_datadir}/fonts/VLGothic
-%config %{_sysconfdir}/fonts/conf.d/59-VLGothic-monospace.conf
-%{_datadir}/fonts/VLGothic/VL-Gothic-Regular.ttf
-
-%files sans
-%dir %{_datadir}/fonts/VLGothic
-%config %{_sysconfdir}/fonts/conf.d/59-VLGothic-sans.conf
-%{_datadir}/fonts/VLGothic/VL-PGothic-Regular.ttf
-
-%files docs
-%defattr(-,root,root,-)
+%files proportional
 %doc README* LICENSE*
+%dir %{fontdir}-proportional
+%config(noreplace) %{_sysconfdir}/fonts/conf.d/59-VLGothic-sans.conf
+%{fontdir}-proportional/VL-PGothic-Regular.ttf
 
 
 %changelog
+* Thu Jan 17 2008 Jens Petersen <petersen at redhat.com> - 20071215-2
+- move monospace font to main package and obsolete monospace subpackage
+- rename sans subpackage to proportional and obsolete sans subpackage
+- use a separate font dir for the proportional font subpackage
+- add fc-cache scriptlets
+- drop the docs subpackage
+- use fontname, fontdir, and fontconfdir macros
+- improve summaries and descriptions
+- do not require fontconfig
+- drop VLGothic obsoletes and provides
+
 * Sat Jan 12 2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20071215-1
 - Update to 20071215
 
@@ -124,7 +145,7 @@
 - Now config files are replaced by every updating.
 
 * Wed Nov 29 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20061026-4
-- Fix the misstyped dist tag.
+- Fix the mistyped dist tag.
 
 * Sat Nov 18 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.