rpms/tetex-font-kerkis/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-font-kerkis.spec, 1.7, 1.8 kerkis-test.tex, 1.1, NONE

[Sarantis Paskalis (sarantis)]

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698/FC-4

Modified Files:
	.cvsignore sources tetex-font-kerkis.spec 
Removed Files:
	kerkis-test.tex 
Log Message:
auto-import tetex-font-kerkis-2.0-7 on branch FC-4 from tetex-font-kerkis-2.0-7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:25:49 -0000	1.2
+++ .cvsignore	10 Oct 2005 12:31:17 -0000	1.3
@@ -1 +1 @@
-Kerkis_for_LaTeX.zip
+kerkis-20051007.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:25:49 -0000	1.2
+++ sources	10 Oct 2005 12:31:17 -0000	1.3
@@ -1 +1 @@
-8b55db5b9c923af5fe357c9b9eab0d52  Kerkis_for_LaTeX.zip
+87479b0f42f906ed60f58d553405a127  kerkis-20051007.zip


Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/FC-4/tetex-font-kerkis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tetex-font-kerkis.spec	21 Jun 2005 17:24:18 -0000	1.7
+++ tetex-font-kerkis.spec	10 Oct 2005 12:31:17 -0000	1.8
@@ -1,24 +1,24 @@
-%define texmf     %{_datadir}/texmf
-%define tdsname   kerkis
-%define fontpath  kerkis
+%define ctan_date  20051007
+%define texmf      %{_datadir}/texmf
+%define texfonts   %{texmf}/fonts
+%define texpkg     kerkis
+%define fontpath   %{texpkg}
 
 Name:           tetex-font-kerkis
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Kerkis type 1 fonts for LaTeX
-
 Group:          Applications/Publishing
 License:        Distributable
-URL:            http://iris.math.aegean.gr/software/kerkis/Kerkis_for_LaTeX.html
-Source0:        http://iris.math.aegean.gr/kerkis/Kerkis_for_LaTeX.zip
-Source1:        kerkis-test.tex
+URL:           	http://iris.math.aegean.gr/kerkis/Kerkis_for_LaTeX.html
+Source0:        kerkis-%{ctan_date}.zip
+# upstream source - unversioned zip file
+# ftp://tug.ctan.org/pub/tex-archive/fonts/greek/kerkis.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       tetex-latex
-Requires(post): tetex
-Requires(postun): tetex
+Requires:       tetex-latex tetex-fonts
 BuildArch:      noarch
 
+
 %description
 This package contains the Kerkis type 1 fonts for LaTeX.
 
@@ -31,62 +31,64 @@
 characters and common ligatures (including frequently omitted
 ligatures such as "fj").
 
-Please see the file "License.html" for details on the use of this font.
-
+Please see the file "License.txt" for details on the use of this font.
 
 %prep
-%setup -q -n kerkis-11062003
+%setup -q -n %{texpkg}
 
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
-install -p -m 644 tex/{*.sty,*.fd} $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
+mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
+mkdir -p %{buildroot}%{texfonts}/{tfm,type1,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{map,enc}/dvips/%{texpkg}
+
+install -p -m 644 tex/{*.sty,*.fd} %{buildroot}%{texmf}/tex/latex/%{texpkg}/
+install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{fontpath}/
+install -p -m 644 type1/*.pfb %{buildroot}%{texfonts}/type1/%{fontpath}/
+install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{fontpath}/
+install -p -m 644 dvips/*.map %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
+install -p -m 644 dvips/*.enc %{buildroot}%{texfonts}/enc/dvips/%{texpkg}/
 
-mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/{tfm,type1,vf}/%{fontpath}
-install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/
-install -p -m 644 type1/*.pfb $RPM_BUILD_ROOT%{texmf}/fonts/type1/%{fontpath}/
-install -p -m 644 vf/*.vf $RPM_BUILD_ROOT%{texmf}/fonts/vf/%{fontpath}/
-
-mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}
-install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/
-
-mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/enc/dvips/%{tdsname}
-install -m 644 dvips/*.enc $RPM_BUILD_ROOT%{texmf}/fonts/enc/dvips/%{tdsname}/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-/usr/bin/mktexlsr %{texmf}
 if [ "$1" = "1" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map kerkis.map
+  /usr/bin/updmap-sys --quiet --outputdir %{texmf}/dvips/config --enable Map kerkis.map
 fi
 
+
 %postun
 if [ "$1" = "0" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable kerkis.map
+  /usr/bin/updmap-sys --quiet --outputdir %{texmf}/dvips/config --disable kerkis.map
 fi
-/usr/bin/mktexlsr %{texmf}
 
 
 %files
 %defattr(-,root,root,-)
 %doc License.txt README.html
-%{texmf}/tex/latex/%{tdsname}
-%{texmf}/fonts/tfm/%{fontpath}
-%{texmf}/fonts/type1/%{fontpath}
-%{texmf}/fonts/vf/%{fontpath}
-%{texmf}/fonts/map/dvips/%{tdsname}
-%{texmf}/fonts/enc/dvips/%{tdsname}
+%{texmf}/tex/latex/%{texpkg}
+%{texfonts}/tfm/%{fontpath}
+%{texfonts}/type1/%{fontpath}
+%{texfonts}/vf/%{fontpath}
+%{texfonts}/map/dvips/%{texpkg}
+%{texfonts}/enc/dvips/%{texpkg}
 
 
 %changelog
+* Fri Oct  7 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-7
+- Require tetex-fonts.
+- Drop kerkis-test.tex.
+- Use ctan zip soure.
+- Other cleanups.
+
 * Tue Jun 21 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-6
 - Run updmap-sys only when installing/removing, not updating.
 


--- kerkis-test.tex DELETED ---