From f3c024da3a1f36d23740721416b38d1f6060bd0c Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <ndim@fedoraproject.org>
Date: Mar 24 2009 23:04:23 +0000
Subject: - Rebuild for Fedora 11 to pick up font autodeps (#491970)


---

diff --git a/nted-1.5.0-disable-translated-docs.patch b/nted-1.5.0-disable-translated-docs.patch
deleted file mode 100644
index b4dfa45..0000000
--- a/nted-1.5.0-disable-translated-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nted-1.5.0/doc/Makefile.in.orig	2009-02-28 11:42:49.000000000 +0100
-+++ nted-1.5.0/doc/Makefile.in	2009-02-28 11:43:11.000000000 +0100
-@@ -208,7 +208,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = templates docimages en de it
-+SUBDIRS = templates docimages en
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/nted.spec b/nted.spec
index abe8c69..7dfe2c8 100644
--- a/nted.spec
+++ b/nted.spec
@@ -4,13 +4,18 @@
 # ntedfont is a special purpose symbol font, and thus needs
 # no fontconfig magic.
 
-# Whether to work around broken po2xml/qt
-#global broken_po2xml 1
-%global broken_po2xml 0
+
+# Only build noarch subpackages if distribution supports it
+%if 0%{?fedora} >= 11
+%global noarch_subpackage BuildArch: noarch
+%else
+%global noarch_subpackage %{nil}
+%endif
+
 
 Name:           nted
 Version:        1.5.0
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -22,9 +27,6 @@ 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
-%if %{broken_po2xml}
-Patch10:        nted-1.5.0-disable-translated-docs.patch
-%endif
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel alsa-lib-devel
@@ -47,10 +49,8 @@ import. Scores can be played through the ALSA sequencer.
 
 %package doc
 Group:          Applications/Publishing
-%if 0%{?fedora} >= 11
-BuildArch:      noarch
-%endif
 Summary:        NtEd's documentation and online help
+%{noarch_subpackage}
 
 
 %description doc
@@ -59,11 +59,9 @@ NtEd's documentation and online help.
 
 %package %{family}-fonts
 Group:          User Interface/X
-%if 0%{?fedora} >= 11
-BuildArch:      noarch
-%endif
 Requires:       fontpackages-filesystem
 Summary:        NtEd's own special note symbol font
+%{noarch_subpackage}
 
 
 %description %{family}-fonts
@@ -72,9 +70,6 @@ NtEd's own special note symbol font.
 
 %prep
 %setup -q
-%if %{broken_po2xml}
-%patch10 -p1 -b .disable-translated-docs
-%endif
 # 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
@@ -130,6 +125,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 25 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.5.0-6
+- Rebuild for Fedora 11 to pick up font autodeps (#491970)
+
+* Thu Mar  5 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.5.0-5
+- Remove workaround for broken po2xml which is now fixed
+- Move noarch subpackage conditional part to single place in file
+
 * Sat Feb 28 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.5.0-4
 - Add (disabled) workaround for broken po2xml (would remove translated docs)