rpms/nted/devel nted.spec, 1.15, 1.16 nted-1.5.0-disable-translated-docs.patch, 1.1, NONE

[Hans Ulrich Niedermann]

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29046

Modified Files:
	nted.spec 
Removed Files:
	nted-1.5.0-disable-translated-docs.patch 
Log Message:
* Wed Mar 25 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.5.0-6
- Rebuild for Fedora 11 to pick up font autodeps (#491970)



Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nted.spec	1 Mar 2009 18:42:53 -0000	1.15
+++ nted.spec	24 Mar 2009 23:04:23 -0000	1.16
@@ -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 @@
 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 @@
 
 %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 @@
 
 %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 @@
 
 %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 @@
 
 
 %changelog
+* Wed Mar 25 2009 Hans Ulrich Niedermann <hun at 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 at 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 at n-dimensional.de> - 1.5.0-4
 - Add (disabled) workaround for broken po2xml (would remove translated docs)
 


--- nted-1.5.0-disable-translated-docs.patch DELETED ---