rpms/thibault-fonts/devel import.log, 1.2, 1.3 thibault-fonts.spec, 1.4, 1.5

[Lyos Gemini Norezel]

Author: lyosnorezel

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

Modified Files:
	import.log thibault-fonts.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Jan 2009 02:03:20 -0000	1.2
+++ import.log	2 Mar 2009 21:00:06 -0000	1.3
@@ -1,2 +1,3 @@
 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
+thibault-fonts-0_1-5_fc10:HEAD:thibault-fonts-0.1-5.fc10.src.rpm:1236027541


Index: thibault-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thibault-fonts.spec	25 Feb 2009 20:26:46 -0000	1.4
+++ thibault-fonts.spec	2 Mar 2009 21:00:06 -0000	1.5
@@ -1,15 +1,17 @@
-%define fontname        thibault
-%define conf1           69-essays1743.conf
-%define conf2           69-isabella.conf
-%define conf3           69-rockets.conf
-%define conf4           69-staypuft.conf
+%global fontname        thibault
+%global conf1           69-essays1743.conf
+%global conf2           69-isabella.conf
+%global conf3           69-rockets.conf
+%global conf4           69-staypuft.conf
 
 %define common_desc \
-A collection of fonts from thibault.org, including Isabella, Essays1743, StayPuft, and Rockets.
+A collection of fonts from thibault.org,\
+including Isabella, Essays1743, StayPuft,\
+and Rockets.
 
 Name:           %{fontname}-fonts
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Thibault.org font collection
 Group:          User Interface/X
@@ -28,7 +30,7 @@
 #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)
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -47,13 +49,14 @@
 
 This package consists of files used by other %{name} packages.
 
-%package  essays1743
+%package -n %{fontname}-essays1743-fonts
 
 Summary:  Thibault.org Montaigne's Essays typeface font
-Group:    User Interface/X
+
 Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-essays1743 < 0.1-4
 
-%description essays1743
+%description -n %{fontname}-essays1743-fonts
 %common_desc
 
 A font by John Stracke, based on the
@@ -62,13 +65,14 @@
 
 %_font_pkg -n essays1743 -f %{conf1} Essays1743*.ttf
 
-%package  isabella
+%package -n %{fontname}-isabella-fonts
 
 Summary: Thibault.org Isabella Breviary calligraphic font
-Group:    User Interface/X
+
 Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-isabella < 0.1-4
 
-%description isabella
+%description -n %{fontname}-isabella-fonts
 %common_desc
 
 This font is called Isabella because it is based on the
@@ -77,13 +81,14 @@
 
 %_font_pkg -n isabella -f %{conf2} Isabella*.ttf
 
-%package  rockets
+%package -n %{fontname}-rockets-fonts
 
 Summary:  Thibault.org font, vaguely space themed
-Group:    User Interface/X
+
 Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-rockets < 0.1-4
 
-%description rockets
+%description -n %{fontname}-rockets-fonts
 %common_desc
 
 This font is called Rockets because it's vaguely space
@@ -93,13 +98,14 @@
 
 %_font_pkg -n rockets -f %{conf3} Rockets*.ttf
 
-%package  staypuft
+%package -n %{fontname}-staypuft-fonts
 
 Summary: Thibault.org font, rounded and marshmellowy
-Group:    User Interface/X
+
 Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-staypuft < 0.1-4
 
-%description staypuft
+%description -n %{fontname}-staypuft-fonts
 %common_desc
 
 A rounded marshmellow type font. Good for frivolous things
@@ -147,6 +153,7 @@
 install -m 0644 -p %{SOURCE4} \
         %{buildroot}%{_fontconfig_templatedir}/%{conf1}
 
+
 install -m 0644 -p %{SOURCE5} \
         %{buildroot}%{_fontconfig_templatedir}/%{conf2}
 
@@ -173,21 +180,18 @@
 %doc isabella/COPYING.LIB isabella/README.txt
 %doc rockets/COPYING.LIB rockets/README.txt
 %doc staypuft/COPYING.LIB staypuft/README.txt
-%dir %{_fontdir}/
-%{_fontdir}/Essays1743*.ttf
-%dir %{_fontdir}/
-%{_fontdir}/Isabella.ttf
-%dir %{_fontdir}/
-%{_fontdir}/Rockets.ttf
-%dir %{_fontdir}/
-%{_fontdir}/StayPuft.ttf
 
 %changelog
+
+#thibault
+* Mon Mar 2 2009 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-5
+- Fixed errors in previous modifications.
+- Updated for latest policy changes.
+- Deleted erroneous edits made by jkeating.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
-#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.