diff --git a/.cvsignore b/.cvsignore index 5c19c81..5fb5e0f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nted-1.4.17.tar.gz +nted-1.5.0.tar.gz diff --git a/nted.spec b/nted.spec index bc7b2d8..301dade 100644 --- a/nted.spec +++ b/nted.spec @@ -1,28 +1,31 @@ -%define fontname ntedfont +%global family ntedfont +#global fontconf 69-%{name}-%{family}.conf # ntedfont is a special purpose symbol font, and thus needs # no fontconfig magic. Name: nted -Version: 1.4.17 -Release: 2%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: Musical score editor Summary(de): Partitureditor Group: Applications/Publishing # Program source is GPLv2+, HTML manuals are GFDL 1.2+. +# Right now, font is GPL, but eventually supposed to become GPL+font exception. 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 +#Source2: %{name}-%{family}-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-devel >= 1.18 BuildRequires: fontpackages-filesystem -Requires: nted-fonts +Requires: %{name}-%{family}-fonts %description @@ -34,20 +37,21 @@ music instruments per staff, MIDI and Postscript export, MusicXML import. Scores can be played through the ALSA sequencer. -%package fonts +%package %{family}-fonts Group: User Interface/X #BuildArch: noarch # This still breaks the Fedora build architecture Requires: fontpackages-filesystem -Summary: NtEd's own special note font. +Summary: NtEd's own special note symbol font -%description fonts -NtEd's own special note font. +%description %{family}-fonts +NtEd's own special note symbol font. %prep %setup -q # Upstream mistakenly ships a header file with its x bit set. +test -x dynarray.h # make sure we notice when upstream fixes that chmod -x dynarray.h @@ -83,7 +87,7 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING docs/* +%doc COPYING COPYING.GFDL docs/* %{_bindir}/nted %{_datadir}/applications/fedora-nted.desktop %{_datadir}/pixmaps/nted.png @@ -91,13 +95,19 @@ rm -rf %{buildroot} %{_mandir}/*/* -%_font_pkg -n fonts *.pfa - -%doc -%dir %{_fontdir} +#_font_pkg -n %{family} -f %{fontconf} %{family}.pfa +%_font_pkg -n %{family} %{family}.pfa %changelog +* Fri Feb 20 2009 Hans Ulrich Niedermann - 1.5.0-1 +- Update to upstream 1.5.0 release +- nothing user visible besides the upstream 1.5.0 release +- replace %%dir %%{_fontdir} by fontpackages-devel >= 1.18 build req +- replace %%define with %%global +- ship COPYING.GFDL file +- split off nted-ntedfont-fonts subpackage for the font people + * Mon Jan 11 2009 Hans Ulrich Niedermann - 1.4.17-2 - remove unneeded fontconfig hooks from spec diff --git a/sources b/sources index 9a78645..3ece8eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1342ae8cff7bceb7ed9ee1f38294753 nted-1.4.17.tar.gz +e9d0013788a9173c4550739f0047ea1f nted-1.5.0.tar.gz