rpms/nted/F-11 .cvsignore, 1.18, 1.19 nted.desktop, 1.1, 1.2 nted.spec, 1.24, 1.25 sources, 1.18, 1.19

[Hans Ulrich Niedermann]

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20113

Modified Files:
	.cvsignore nted.desktop nted.spec sources 
Log Message:
* Wed Feb 10 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.18-2
- Explicitly check for and link against libX11 (will be in upstream 1.9.19)
- Remove obsolete "chmod -x" on dynarray.h
- Update nted.desktop translations from upstream's nted.desktop



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	21 Jan 2010 15:54:46 -0000	1.18
+++ .cvsignore	10 Feb 2010 15:14:07 -0000	1.19
@@ -1 +1 @@
-nted-1.9.17.tar.gz
+nted-1.9.18.tar.gz


Index: nted.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nted.desktop	8 Sep 2008 07:23:00 -0000	1.1
+++ nted.desktop	10 Feb 2010 15:14:07 -0000	1.2
@@ -3,10 +3,14 @@ Encoding=UTF-8
 Name=NtEd
 GenericName=Score editor
 GenericName[de]=Partitureditor
+GenericName[en]=Score Editor
+GenericName[es]=Editor de partituras
 GenericName[fr]=Éditeur de partition
 GenericName[it]=Redattore di spartiti
 Comment=Edit musical scores
 Comment[de]=Bearbeitet (musikal.) Partituren
+Comment[en]=Edit musical scores
+Comment[es]=Editor musical de partituras
 Comment[fr]=Ėdite des partitions musicales
 Comment[it]=Redige spartiti musicali
 Exec=nted
@@ -14,5 +18,5 @@ Icon=nted
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Audio;AudioVideo;Midi;Music;Publishing
+Categories=Audio;AudioVideo;Midi;Music;Publishing;X-Notation;
 


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nted.spec	21 Jan 2010 15:54:46 -0000	1.24
+++ nted.spec	10 Feb 2010 15:14:07 -0000	1.25
@@ -14,8 +14,8 @@
 
 
 Name:           nted
-Version:        1.9.17
-Release:        1%{?dist}
+Version:        1.9.18
+Release:        2%{?dist}
 Summary:        Musical score editor
 
 Group:          Applications/Publishing
@@ -26,6 +26,10 @@ URL:            http://vsr.informatik.tu
 Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-%{version}.tar.gz
 Source1:        nted.desktop
 #Source2:        %{name}-%{family}-fontconfig.conf
+
+# Explicitly check for and link against libX11 (will be in upstream 1.9.19)
+Patch1:         %{name}-%{version}-link-fix-for-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel alsa-lib-devel
@@ -69,9 +73,12 @@ 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
+
+# Apply explicit X11 linkage patch, and avoid re-running autoreconf parts
+%patch1 -p1 -b .link-X11
+sleep 1
+touch aclocal.m4 config.h.in
+touch configure Makefile.in dialogs/Makefile.in
 
 
 %build
@@ -124,6 +131,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 10 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.18-2
+- Explicitly check for and link against libX11 (will be in upstream 1.9.19)
+- Remove obsolete "chmod -x" on dynarray.h
+- Update nted.desktop translations from upstream's nted.desktop
+
+* Wed Feb 10 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.18-1
+- Update to 1.9.18
+
 * Thu Jan 21 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.17-1
 - Update to 1.9.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	21 Jan 2010 15:54:46 -0000	1.18
+++ sources	10 Feb 2010 15:14:07 -0000	1.19
@@ -1 +1 @@
-0ae75f7b25cb871c4766e0b7abccb223  nted-1.9.17.tar.gz
+5a6efc93ec718208ad18a5740c31a344  nted-1.9.18.tar.gz