rpms/thibault-fonts/devel thibault-fonts-essays1743-fontconfig.conf, NONE, 1.1 thibault-fonts-isabella-fontconfig.conf, NONE, 1.1 thibault-fonts-rockets-fontconfig.conf, NONE, 1.1 thibault-fonts-staypuft-fontconfig.conf, NONE, 1.1 import.log, 1.1, 1.2 thibault-fonts.spec, 1.2, 1.3 69-essays1743.conf, 1.1, NONE 69-isabella.conf, 1.1, NONE 69-rockets.conf, 1.1, NONE 69-staypuft.conf, 1.1, NONE

Lyos Gemini Norezel lyosnorezel at fedoraproject.org
Mon Jan 12 02:03:51 UTC 2009 

Author: lyosnorezel

Update of /cvs/pkgs/rpms/thibault-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3254/devel

Modified Files:
	import.log thibault-fonts.spec 
Added Files:
	thibault-fonts-essays1743-fontconfig.conf 
	thibault-fonts-isabella-fontconfig.conf 
	thibault-fonts-rockets-fontconfig.conf 
	thibault-fonts-staypuft-fontconfig.conf 
Removed Files:
	69-essays1743.conf 69-isabella.conf 69-rockets.conf 
	69-staypuft.conf 
Log Message:



--- NEW FILE thibault-fonts-essays1743-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-essays1743.conf

     Define settings for Essays1743 fonts

     © 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
<alias binding="same"><family>Sans</family><accept><family>Essays1743</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-isabella-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-isabella.conf

     Define settings for Isabella fonts

     © 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>Isabella</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-rockets-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-rockets.conf

     Define settings for Rockets fonts

     © 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>Rockets</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-staypuft-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-staypuft.conf

     Define settings for StayPuft fonts

     © 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>StayPuft</family></accept></alias>
</fontconfig>



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Aug 2008 07:41:04 -0000	1.1
+++ import.log	12 Jan 2009 02:03:20 -0000	1.2
@@ -1 +1,2 @@
 thibault-fonts-0_1-1_fc9:HEAD:thibault-fonts-0.1-1.fc9.src.rpm:1217662070
+thibault-fonts-0_1-3_fc11:HEAD:thibault-fonts-0.1-3.fc11.src.rpm:1231725737


Index: thibault-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thibault-fonts.spec	6 Sep 2008 19:47:30 -0000	1.2
+++ thibault-fonts.spec	12 Jan 2009 02:03:20 -0000	1.3
@@ -1,79 +1,112 @@
-%define fontname	thibault
-%define fontdir		%{_datadir}/fonts/%{fontname}
-%define fontconfdir	%{_sysconfdir}/fonts/conf.d
-%define conf1		69-essays1743.conf
-%define conf2		69-isabella.conf
-%define conf3		69-rockets.conf
-%define conf4		69-staypuft.conf
-
-Name:		%{fontname}-fonts
-Version:	0.1
-Release:	2%{?dist}
-Summary:	Thibault.org font collection
-
-Group:		User Interface/X
-License:	LGPLv2+
-URL:		http://www.thibault.org/fonts
-Source0:	http://thibault.org/fonts/essays/Essays1743-1.0-ttf.tar.gz
-Source1:	http://www.thibault.org/fonts/isabella/Isabella.tar.gz
-Source2:	http://www.thibault.org/fonts/rockets/Rockets-ttf.tar.gz
-Source3:	http://www.thibault.org/fonts/staypuft/StayPuft.tar.gz
-Source4:	69-essays1743.conf
-Source5:	69-isabella.conf
-Source6:	69-rockets.conf
-Source7:	69-staypuft.conf
+%define fontname        thibault
+%define conf1           69-essays1743.conf
+%define conf2           69-isabella.conf
+%define conf3           69-rockets.conf
+%define conf4           69-staypuft.conf
+
+%define common_desc \
+A collection of fonts from thibault.org, including Isabella, Essays1743, StayPuft, and Rockets.
+
+Name:           %{fontname}-fonts
+Version:        0.1
+Release:        3%{?dist}
+
+Summary:        Thibault.org font collection
+Group:          User Interface/X
+License:        LGPLv2+
+
+URL:            http://www.thibault.org/fonts
+Source0:        http://thibault.org/fonts/essays/Essays1743-1.0-ttf.tar.gz
+Source1:        http://www.thibault.org/fonts/isabella/Isabella.tar.gz
+Source2:        http://www.thibault.org/fonts/rockets/Rockets-ttf.tar.gz
+Source3:        http://www.thibault.org/fonts/staypuft/StayPuft.tar.gz
+Source4:        %{name}-essays1743-fontconfig.conf
+Source5:        %{name}-isabella-fontconfig.conf
+Source6:        %{name}-rockets-fontconfig.conf
+Source7:        %{name}-staypuft-fontconfig.conf
 
 #Not included due to legal concerns
 #Engadget: A sort of modernistic font done to match the logo of http://www.engadget.com
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires:	fontforge >= 20061025-1
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontforge >= 20061025-1
 
 %description
-A collection of fonts from thibault.org, 
-including Isabella, Essays1743, StayPuft, 
-and Rockets.
-
-%package essays1743
-Group:	 User Interface/X
-Summary: Thibault.org Montaigne's Essays typeface font
-License: LGPLv2+
+%common_desc
+
+%package common
+Summary:        Common files for thibault (documentation…)
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
+%package  essays1743
+
+Summary:  Thibault.org Montaigne's Essays typeface font
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description essays1743
+%common_desc
+
 A font by John Stracke, based on the
 typeface used in a 1743 English
-translation of Montaigne's Essays. 
+translation of Montaigne's Essays.
+
+%_font_pkg -n essays1743 -f %{conf1} Essays1743*.ttf
+
+%package  isabella
 
-%package isabella
-Group:	 User Interface/X
 Summary: Thibault.org Isabella Breviary calligraphic font
-License: LGPLv2
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description isabella
+%common_desc
+
 This font is called Isabella because it is based on the
 calligraphic hand used in the Isabella Breviary, made around 1497, in
 Holland, for Isabella of Castille, the first queen of united Spain.
 
-%package rockets
-Group:	 User Interface/X
-Summary: Thibault.org font, vaguely space themed
-License: LGPLv2
+%_font_pkg -n isabella -f %{conf2} Isabella*.ttf
+
+%package  rockets
+
+Summary:  Thibault.org font, vaguely space themed
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description rockets
+%common_desc
+
 This font is called Rockets because it's vaguely space
 themed.  The A is, more or less, a 1950s SF rocket; the O is meant to
 be Earth, with the Americas visible.  The other capitals are based on
 curves from either A or O, to keep the theme consistent.
 
-%package staypuft
-Group:	 User Interface/X
+%_font_pkg -n rockets -f %{conf3} Rockets*.ttf
+
+%package  staypuft
+
 Summary: Thibault.org font, rounded and marshmellowy
-License: LGPLv2
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description staypuft
+%common_desc
+
 A rounded marshmellow type font. Good for frivolous things
 like banners, and birthday cards.
 
+%_font_pkg -n staypuft -f %{conf4} StayPuft*.ttf
+
 %prep
 mkdir -p isabella staypuft
 tar xvzf %{SOURCE0}
@@ -102,100 +135,69 @@
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 644 *.ttf $RPM_BUILD_ROOT%{fontdir}
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE7} %{buildroot}%{fontconfdir}/
+install -m 0755 -d %{buildroot}%{_fontdir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%post essays1743
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun essays1743
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf1}
 
-%files essays1743
-%defattr(644,root,root,755)
-%doc Essays1743/COPYING Essays1743/README
-%dir %{fontdir}/
-%{fontdir}/Essays1743*.ttf
-%config(noreplace) %{fontconfdir}/%{conf1}
-
-%post isabella
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun isabella
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf2}
 
-%files isabella
-%defattr(644,root,root,755)
-%doc isabella/COPYING.LIB isabella/README.txt
-%dir %{fontdir}/
-%{fontdir}/Isabella.ttf
-%config(noreplace) %{fontconfdir}/%{conf2}
-
-%post rockets
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun rockets
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf3}
 
-%files rockets
-%defattr(644,root,root,755)
-%doc rockets/COPYING.LIB rockets/README.txt
-%dir %{fontdir}/
-%{fontdir}/Rockets.ttf
-%config(noreplace) %{fontconfdir}/%{conf3}
-
-%post staypuft
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun staypuft
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE7} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf4}
+
+for fconf in %{conf1} \
+                %{conf2} \
+                %{conf3} \
+                %{conf4} ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
+done
 
-%files staypuft
-%defattr(644,root,root,755)
+%clean
+rm -fr %{buildroot}
+
+%files common
+%defattr(0644,root,root,0755)
+%doc Essays1743/COPYING Essays1743/README
+%doc isabella/COPYING.LIB isabella/README.txt
+%doc rockets/COPYING.LIB rockets/README.txt
 %doc staypuft/COPYING.LIB staypuft/README.txt
-%dir %{fontdir}/
-%{fontdir}/StayPuft.ttf
-%config(noreplace) %{fontconfdir}/%{conf4}
+%dir %{_fontdir}/
+%{_fontdir}/Essays1743*.ttf
+%dir %{_fontdir}/
+%{_fontdir}/Isabella.ttf
+%dir %{_fontdir}/
+%{_fontdir}/Rockets.ttf
+%dir %{_fontdir}/
+%{_fontdir}/StayPuft.ttf
 
 %changelog
+
 #thibault
+* Sun Jan 11 2009 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-3
+- Modified spec file to comply with new policy changes.
+
 * Sat Sep 06 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-2
 - Rebuild for new fontforge release.
 
 * Fri Jul 18 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-- Fixed minor issues found during review. 
+- Fixed minor issues found during review.
 
 * Mon Jul 15 2008 Matt Domsch <mdomsch at fedoraproject.org>
 - Rewrote spec file to comply with fedora's policies
 
-* Thu Jul 10 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 
+* Thu Jul 10 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
 - Removed the Engadget font due to legal concerns
 
 * Wed Jul 09 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>


--- 69-essays1743.conf DELETED ---


--- 69-isabella.conf DELETED ---


--- 69-rockets.conf DELETED ---


--- 69-staypuft.conf DELETED ---

More information about the fedora-extras-commits mailing list