[nas/f13/master] 1.9.2 bump

Wed Aug 11 08:24:11 UTC 2010

commit e8bfbb17ae7a1eae79fe68bd95b652e9a00f2a8b
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Aug 10 15:25:05 2010 +0200

    1.9.2 bump
    
    1.9.2 bumped, spec file changed massively.

 .gitignore                                 |    1 +
 nas-1.9.2-Move-AuErrorDB-to-SHAREDIR.patch |   68 +++++++++++
 nas-1.9.2-asneeded.patch                   |   13 ++
 nas.spec                                   |  169 ++++++++++++++--------------
 sources                                    |    2 +-
 5 files changed, 167 insertions(+), 86 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d0ada22..9e3236b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 nas-1.9.1.src.tar.gz
+nas-1.9.2.src.tar.gz
diff --git a/nas-1.9.2-Move-AuErrorDB-to-SHAREDIR.patch b/nas-1.9.2-Move-AuErrorDB-to-SHAREDIR.patch
new file mode 100644
index 0000000..cbd2bda
--- /dev/null
+++ b/nas-1.9.2-Move-AuErrorDB-to-SHAREDIR.patch
@@ -0,0 +1,68 @@
+From 6b273c6e18623a89bebfd2780c37552c8226eb19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 10 Aug 2010 14:01:55 +0200
+Subject: [PATCH] Move AuErrorDB to SHAREDIR
+
+AuErrorDB list of error messages. Non-executables should not reside in LIBDIR.
+---
+ README               |    2 +-
+ lib/audio/AuErrDes.c |    2 +-
+ lib/audio/Imakefile  |    6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/README b/README
+index 790bc58..0d852c0 100644
+--- a/README
++++ b/README
+@@ -175,7 +175,7 @@ A complete installation should include the following files:
+ 	/usr/man/man3/*.3			API man pages
+ 
+ 	/usr/lib/libaudio.[a|so]		API library
+-	/usr/lib/X11/AuErrorDB			Error database
++	/usr/share/X11/AuErrorDB		Error database
+ 
+ 	/usr/bin/X11/nasd			NAS server for your
+ 						hardware (voxware,
+diff --git a/lib/audio/AuErrDes.c b/lib/audio/AuErrDes.c
+index 157423a..f5e8ea7 100644
+--- a/lib/audio/AuErrDes.c
++++ b/lib/audio/AuErrDes.c
+@@ -23,7 +23,7 @@
+  */
+ 
+ #ifndef ERRORDB
+-#define ERRORDB "/usr/lib/X11/AuErrorDB"
++#define ERRORDB "/usr/share/X11/AuErrorDB"
+ #endif /* !ERRORDB */
+ 
+ #include "Alibint.h"
+diff --git a/lib/audio/Imakefile b/lib/audio/Imakefile
+index da34db3..e273db3 100644
+--- a/lib/audio/Imakefile
++++ b/lib/audio/Imakefile
+@@ -79,7 +79,7 @@ XCOMM JET - see if we should avoid streams
+     COMPAT_OBJS = AuGetBest.o
+ #endif /* ProjectX < 5 */
+ 
+-     EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
++     EDB_DEFINES = -DERRORDB=\"$(SHAREDIR)/AuErrorDB\"
+ 
+         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
+    CONN_DEFINES = ConnectionFlags
+@@ -137,11 +137,11 @@ SpecialObjectRule(globals.o,/**/,$(CONN_DEFINES))
+ BuildIncludes($(HEADERS),audio,..)
+ InstallMultiple($(HEADERS),$(INCDIR))
+ #if ProjectX >= 5
+-InstallNonExecFile(AuErrorDB,$(LIBDIR))
++InstallNonExecFile(AuErrorDB,$(SHAREDIR))
+ #else
+ install::
+ 	$(MKDIRHIER) $(LIBDIR)
+-InstallNonExec(AuErrorDB,$(LIBDIR))
++InstallNonExec(AuErrorDB,$(SHAREDIR))
+ #endif
+ 
+ #if defined(HPArchitecture) && !defined(LinuxArchitecture) && !defined(GNUArchitecture)
+-- 
+1.7.2.1
+
diff --git a/nas-1.9.2-asneeded.patch b/nas-1.9.2-asneeded.patch
new file mode 100644
index 0000000..2ac8948
--- /dev/null
+++ b/nas-1.9.2-asneeded.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=247761
+
+--- config/NetAudio.tmpl
++++ config/NetAudio.tmpl
+@@ -162,7 +162,7 @@
+ 
+   AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ #ifndef WIN32
+-     AUDIOLIBS = $(AULIB) $(XTOOLLIB) $(XLIB) -lm
++     AUDIOLIBS = $(AULIB) $(XTOOLLIB) $(XAUTHLIB) $(XLIB) -lm
+ #else /* WIN32 */
+      AUDIOLIBS = $(AULIB)
+ #endif /* WIN32 */
diff --git a/nas.spec b/nas.spec
index f48a294..65ecc50 100644
--- a/nas.spec
+++ b/nas.spec
@@ -1,55 +1,39 @@
+Name:       nas 
+Summary:    The Network Audio System (NAS)
+Version:    1.9.2
+Release:    1%{?dist}
+URL:        http://radscan.com/nas.html
+License:    Public Domain
+Group:      Development/Libraries
+%define daemon nasd
+
+Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
+Source1:    %{daemon}.init
+Source2:    %{daemon}.sysconfig
+Patch0:     %{name}-1.9.2-asneeded.patch
+Patch1:     %{name}-1.9.2-Move-AuErrorDB-to-SHAREDIR.patch
+
+Buildroot:  %{_tmppath}/NAS-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  bison flex
+BuildRequires:  imake
+BuildRequires:  libX11-devel libXau-devel libXaw-devel libXext-devel
+BuildRequires:  libXp-devel libXt-devel
+
+Requires:           %{name}-libs = %{version}-%{release}
+Requires(post):     chkconfig
+Requires(preun):    chkconfig initscripts
+Requires(postun):   initscripts
 
-%if 0%{?fedora} > 8
-# libs split, see http://bugzilla.redhat.com/438547 )
-%define libs 1
-%endif
-
-Name:		nas	
-Summary:	The Network Audio System (NAS)
-Version:	1.9.1
-Release:	7%{?dist}
-BuildRequires:	bison flex
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-%define libdir_x11 %{_libdir}/X11
-%else
-BuildRequires: xorg-x11-devel 
-# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
-%define libdir_x11 %{_prefix}/X11R6/lib/X11
-%endif
-
-URL:		http://nas.codebrilliance.com		
-
-License: 	Public Domain
-Group: 		Development/Libraries
-Source0: 	http://nas.codebrilliance.com/nas/nas-%{version}.src.tar.gz
-Source1:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.init
-Source2:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.sysconfig
-
-Buildroot: 	%{_tmppath}/NAS-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(preun): chkconfig /sbin/service
-Requires(post):  chkconfig
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-#Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-%endif
 
 %package devel
-Summary:	Development and doc files for the NAS 
-Requires:	%{name}-libs = %{version}-%{release}
-Group:		Development/Libraries
+Summary:    Development and doc files for the NAS 
+Group:      Development/Libraries
+Requires:   %{name}-libs = %{version}-%{release}
 
-%if 0%{?libs}
 %package libs
-Summary: Runtime libraries for NAS
+Summary: Run-time libraries for NAS
 Group:   System Environment/Libraries
-%description libs
-%{summary}.
-%endif
 
 
 %description
@@ -60,65 +44,74 @@ X Window System, it uses the client/server model to separate
 applications from the specific drivers that control audio input
 and output devices.
 Key features of the Network Audio System include:
-	o  Device-independent audio over the network
-	o  Lots of audio file and data formats
-	o  Can store sounds in server for rapid replay
-	o  Extensive mixing, separating, and manipulation of audio data
-	o  Simultaneous use of audio devices by multiple applications
-	o  Use by a growing number of ISVs
-	o  Small size
-	o  Free!  No obnoxious licensing terms
+    o  Device-independent audio over the network
+    o  Lots of audio file and data formats
+    o  Can store sounds in server for rapid replay
+    o  Extensive mixing, separating, and manipulation of audio data
+    o  Simultaneous use of audio devices by multiple applications
+    o  Use by a growing number of ISVs
+    o  Small size
+    o  Free!  No obnoxious licensing terms
+
+%description libs
+%{summary}.
 
 %description devel
-Development files and the documentation
+Development files and the documentation.
 
 
 %prep
-%setup -q -n nas-%{version}
-iconv --from-code=ISO_8859-15 --to-code=UTF-8 HISTORY >HISTORY.tmp
-mv HISTORY.tmp HISTORY
+%setup -q
+%patch0 -p0 -b .asneeded
+%patch1 -p1 -b .move_AuErrorDB
+for F in HISTORY; do
+    iconv --from-code=ISO_8859-15 --to-code=UTF-8 "$F" > "${F}.tmp"
+    touch -r "$F" "${F}.tmp"
+    mv "${F}.tmp" "$F"
+done
+
 
 %build
-export LDFLAGS=-lXau
 xmkmf
-find . -name Makefile \
-| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/'
-make %{?_smp_mflags} World
+# See HISTORY file how to modify CDEBUGFLAGS
+make WORLDOPTS='-k CDEBUGFLAGS="%{optflags}"' %{?_smp_mflags} World
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export LDFLAGS=-lXau
 make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-  INSTALLFLAGS='-p' \
+  LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} \
+  MANPATH=%{_mandir} INSTALLFLAGS='-p' \
   install install.man
 
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{daemon}
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{daemon}
 
-#remove satic lib
+# Remove static libraries
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
-#rename cofigfile
-mv $RPM_BUILD_ROOT/etc/nas/nasd.conf.eg $RPM_BUILD_ROOT/etc/nas/nasd.conf
+# Rename config file
+mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/nasd.conf{.eg,}
 
-%post
-%{!?libs:/sbin/ldconfig}
-/sbin/chkconfig --add nasd
 
-%{!?libs:%postun -p /sbin/ldconfig}
+%post
+/sbin/chkconfig --add %{daemon}
 
 %preun
 if [ $1 = 0 ] ; then
-  /sbin/chkconfig --del nasd
-  /sbin/service nasd stop >/dev/null 2>&1 ||:
+    /sbin/service %{daemon} stop >/dev/null 2>&1 ||:
+    /sbin/chkconfig --del %{daemon}
+fi
+
+%postun
+if [ "$1" -ge "1" ] ; then
+    /sbin/service %{daemon} condrestart >/dev/null 2>&1 || :
 fi
 
-%if 0%{?libs}
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %clean
@@ -126,23 +119,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir /etc/nas
-%config (noreplace) /etc/nas/nasd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/nasd
-%{_initrddir}/nasd
-
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/nasd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/%{daemon}
+%{_initrddir}/%{daemon}
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{libdir_x11}/AuErrorDB
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %doc README FAQ HISTORY TODO
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
+%{_datadir}/X11/AuErrorDB
 
 %files devel
 %defattr(-,root,root,-)
@@ -152,6 +142,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 09 2010 Petr Pisar <ppisar at redhat.com> - 1.9.2-1
+- 1.9.2 bump, update URL, Source0
+- Remove spec code specific for Fedora < 12 and EPEL < 4 as they are
+  unsupported now
+- Apply nas-1.9.2-asneeded.patch to get libXau linked explicitly (bug #565181)
+- Move AuErrorDB non-executable to share directory, distribute with libraries
+- Unify spec file indentation
+- Add postun action
+
 * Sun Mar 14 2010 Frank Büttner <frank-buettner at gmx.net> - 1.9.1-7
 - fix #565181
 
diff --git a/sources b/sources
index 4ff34fb..e9803a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d975efefba50b985446bb2c2cb4ee91f  nas-1.9.1.src.tar.gz
+ed7864f55b384452167959022cfb403b  nas-1.9.2.src.tar.gz
