From 338711dea3387179eaf5e96240189bed7e29b878 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <ndim@fedoraproject.org>
Date: Jan 12 2009 01:01:24 +0000
Subject: - remove wrongly encoded german description

- use new font packaging rules
- split ntedfont.pfa into nted-fonts subpackage

---

diff --git a/nted.spec b/nted.spec
index 23c18e7..a319378 100644
--- a/nted.spec
+++ b/nted.spec
@@ -1,6 +1,9 @@
+%define fontname ntedfont
+#define fontconf XX-%{fontname}.conf
+
 Name:           nted
 Version:        1.4.17
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -10,10 +13,16 @@ License:        GPLv2+ and GFDL
 URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
 Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
 Source1:        nted.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Source2:        nted-fonts-fontconfig.conf
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel alsa-lib-devel
 BuildRequires:  gettext kdesdk yelp xmlto desktop-file-utils
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontpackages-filesystem
+
+Requires:       nted-fonts
+
 
 %description
 NtEd is a GTK score editor. It intends to be really WYSIWYG: what you
@@ -24,17 +33,15 @@ music instruments per staff, MIDI and Postscript export, MusicXML
 import. Scores can be played through the ALSA sequencer.
 
 
-%description(de)
-NtEd ist ein GTK-Partitureditor. Er soll das WYSIWYG-Prinzip
-vollständig umsetzen: Was man auf dem Bildschirm sieht, sieht genau so
-aus wie das, was man aus dem Drucker erhält.
+%package fonts
+Group:          User Interface/X
+#BuildArch:     noarch # This still breaks the Fedora build architecture
+Requires:       fontpackages-filesystem
+Summary:        NtEd's own special note font.
 
-NtEd unterstützt bis zu 4 Stimmen pro Notenzeile, Schlagzeugnoten, 5
-Strophenzeilen, N-Tolen, Wiederholungen mit Alternativen, einstellbare
-Musikinstrumente pro Notensystem, MIDI- und PostScript-Export,
-MusicXML-Import.
 
-Partituren können über den ALSA-Sequencer abgespielt werden.
+%description fonts
+NtEd's own special note font.
 
 
 %prep
@@ -52,6 +59,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mv %{buildroot}%{_docdir}/%{name}-%{version} docs
+
 # Upstream desktop file contains some blank keys and is not spec-compliant
 rm %{buildroot}%{_datadir}/applications/nted.desktop
 desktop-file-install --vendor="fedora" \
@@ -59,6 +67,23 @@ desktop-file-install --vendor="fedora" \
   %{SOURCE1}
 %find_lang %{name}
 
+# Install font into the correct directory
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv -f %{buildroot}%{_datadir}/%{name}/ntedfont.pfa \
+      %{buildroot}%{_fontdir}/ntedfont.pfa
+# This saves us from patching the nted source.
+ln -s %{_fontdir}/ntedfont.pfa \
+      %{buildroot}%{_datadir}/%{name}/ntedfont.pfa \
+
+# fontconfig magic
+#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+#                   %{buildroot}%{_fontconfig_confdir}
+
+#install -m 0644 -p %{SOURCE2} \
+#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+#ln -s %{_fontconfig_templatedir}/%{fontconf} \
+#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
 
 %clean
 rm -rf %{buildroot}
@@ -70,11 +95,23 @@ rm -rf %{buildroot}
 %{_bindir}/nted
 %{_datadir}/applications/fedora-nted.desktop
 %{_datadir}/pixmaps/nted.png
-%{_datadir}/nted
+%{_datadir}/%{name}
 %{_mandir}/*/*
 
 
+#_font_pkg -n fonts -f %{fontconf} *.pfa
+%_font_pkg -n fonts *.pfa
+
+%doc
+%dir %{_fontdir}
+
+
 %changelog
+* Sun Jan 11 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.4.17-1.1
+- remove wrongly encoded german description
+- use new font packaging rules
+- split ntedfont.pfa into nted-fonts subpackage
+
 * Wed Dec 10 2008 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.4.17-1
 - Update to upstream's 1.4.17 release.