rpms/nted/devel nted.spec,1.13,1.14

[Hans Ulrich Niedermann]

Author: ndim

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

Modified Files:
	nted.spec 
Log Message:
* Thu Feb 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.5.0-3
- noarch subpackage for doc
- use versioned requirements for subpackages



Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nted.spec	26 Feb 2009 06:14:35 -0000	1.13
+++ nted.spec	26 Feb 2009 13:49:08 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           nted
 Version:        1.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -25,7 +25,8 @@
 BuildRequires:  fontpackages-devel >= 1.18
 BuildRequires:  fontpackages-filesystem
 
-Requires:       %{name}-%{family}-fonts
+Requires:       %{name}-%{family}-fonts = %{version}-%{release}
+Requires:       %{name}-doc = %{version}-%{release}
 
 
 %description
@@ -37,9 +38,23 @@
 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
+
+
+%description doc
+NtEd's documentation and online help.
+
+
 %package %{family}-fonts
 Group:          User Interface/X
-#BuildArch:     noarch # This still breaks the Fedora build architecture
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
 Requires:       fontpackages-filesystem
 Summary:        NtEd's own special note symbol font
 
@@ -56,14 +71,14 @@
 
 
 %build
-%configure --docdir='%{_docdir}/%{name}-%{version}'
+%configure --docdir='%{_docdir}/%{name}-doc-%{version}'
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-mv %{buildroot}%{_docdir}/%{name}-%{version} docs
+mv %{buildroot}%{_docdir}/%{name}-doc-%{version} docs
 
 # Upstream desktop file contains some blank keys and is not spec-compliant
 rm %{buildroot}%{_datadir}/applications/nted.desktop
@@ -87,7 +102,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING COPYING.GFDL docs/*
+%doc COPYING COPYING.GFDL
 %{_bindir}/nted
 %{_datadir}/applications/fedora-nted.desktop
 %{_datadir}/pixmaps/nted.png
@@ -95,11 +110,20 @@
 %{_mandir}/*/*
 
 
+%files doc
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GFDL docs/*
+
+
 #_font_pkg -n %{family} -f %{fontconf} %{family}.pfa
 %_font_pkg -n %{family} %{family}.pfa
 
 
 %changelog
+* Thu Feb 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.5.0-3
+- noarch subpackage for doc
+- use versioned requirements for subpackages
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild