rpms/nas/EL-4 nasd_247468.patch, NONE, 1.1 nasd_250453.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nas.spec, 1.9, 1.10 sources, 1.4, 1.5
Frank Büttner (frankb)
fedora-extras-commits at redhat.com
Fri Nov 2 17:38:57 UTC 2007
- Previous message: rpms/nas/EL-5 nasd_247468.patch, NONE, 1.1 nasd_250453.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 nas.spec, 1.13, 1.14 sources, 1.6, 1.7
- Next message: rpms/environment-modules/devel .cvsignore, 1.7, 1.8 environment-modules.spec, 1.11, 1.12 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: frankb
Update of /cvs/pkgs/rpms/nas/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16632
Modified Files:
.cvsignore nas.spec sources
Added Files:
nasd_247468.patch nasd_250453.patch
Log Message:
fix #247468 and #245712
nasd_247468.patch:
--- NEW FILE nasd_247468.patch ---
diff -Naur nas-1.9a.org/server/nasd.conf.eg nas-1.9a/server/nasd.conf.eg
--- nas-1.9a.org/server/nasd.conf.eg 2007-06-16 21:03:22.000000000 +0200
+++ nas-1.9a/server/nasd.conf.eg 2007-11-02 17:55:45.000000000 +0100
@@ -27,7 +27,7 @@
# init the mixer on startup? Voxware only.
# defaults to "yes"
-MixerInit "yes"
+MixerInit "no"
# Initialize the mixer settings on every audio device open?
# Settings are only initialized if MixerInit is set to "yes".
nasd_250453.patch:
--- NEW FILE nasd_250453.patch ---
diff -Naur nas-1.9.org/lib/audio/Aproto.h nas-1.9/lib/audio/Aproto.h
--- nas-1.9.org/lib/audio/Aproto.h 2006-08-13 20:33:08.000000000 +0200
+++ nas-1.9/lib/audio/Aproto.h 2007-08-11 17:58:47.000000000 +0200
@@ -99,7 +99,7 @@
#define AU_DEFAULT_TCP_PORT 8000
#define AU_DEFAULT_DECNET_TASK "AUDIO$"
-#define AU_DEFAULT_UNIX_PATH "/tmp/.sockets/audio"
+#define AU_DEFAULT_UNIX_PATH "/var/run/nasd/audio"
#define auFalse 0
#define auTrue 1
diff -Naur nas-1.9.org/server/os/connection.c nas-1.9/server/os/connection.c
--- nas-1.9.org/server/os/connection.c 2007-03-18 07:55:09.000000000 +0100
+++ nas-1.9/server/os/connection.c 2007-08-11 19:05:02.000000000 +0200
@@ -203,10 +203,10 @@
#ifdef hpux
#define X_UNIX_DIR "/usr/spool/sockets/audio"
#define X_UNIX_PATH "/usr/spool/sockets/audio/"
-#define OLD_UNIX_DIR "/tmp/.sockets"
+#define OLD_UNIX_DIR "/var/run/nasd"
#else
-#define X_UNIX_DIR "/tmp/.sockets"
-#define X_UNIX_PATH "/tmp/.sockets/audio"
+#define X_UNIX_DIR "/var/run/nasd"
+#define X_UNIX_PATH "/var/run/nasd/audio"
#endif
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nas/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Apr 2007 14:17:17 -0000 1.4
+++ .cvsignore 2 Nov 2007 17:38:23 -0000 1.5
@@ -1 +1 @@
-nas-1.9.src.tar.gz
+nas-1.9a.src.tar.gz
Index: nas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nas/EL-4/nas.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nas.spec 9 Apr 2007 14:17:17 -0000 1.9
+++ nas.spec 2 Nov 2007 17:38:23 -0000 1.10
@@ -1,9 +1,9 @@
Name: nas
Summary: The Network Audio System (NAS)
-Version: 1.9
-Release: 1%{?dist}
+Version: 1.9a
+Release: 3%{?dist}
BuildRequires: bison flex
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
%define libdir_x11 %{_libdir}/X11
%else
@@ -19,6 +19,9 @@
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
+Patch0: nasd_250453.patch
+Patch1: nasd_247468.patch
+
Buildroot: %{_tmppath}/NAS-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(preun): chkconfig /sbin/service
Requires(post): chkconfig
@@ -50,9 +53,9 @@
%prep
-
%setup -q -n nas-%{version}
-
+%patch0 -p1
+%patch1 -p1
%build
xmkmf
@@ -104,7 +107,7 @@
%{_libdir}/libaudio.so.2
%{_libdir}/libaudio.so.2.4
%{libdir_x11}/AuErrorDB
-%doc README BUGS FAQ HISTORY TODO
+%doc README FAQ HISTORY TODO
%files devel
%defattr(-,root,root)
@@ -114,6 +117,24 @@
%changelog
+*Fri Nov 02 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9a-3
+ - add better patch for #247468
+
+*Fri Nov 02 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9a-2
+ - add patch to fix #247468
+
+*Sun Oct 28 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9a-1
+ - update to 1.9a to fix #245712
+
+*Sat Aug 18 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9-4
+ - fix for bug #245712
+
+* Sat Aug 11 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9-3
+ - fix for bug #250453
+
+* Fri May 04 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9-2%{?dist}
+- rebuild for the new ppc64 arch
+
* Sun Apr 08 2007 Frank Büttner <frank-buettner at gmx.net> - 1.9-1%{?dist}
- update to 1.9
- remove old patch file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nas/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 9 Apr 2007 14:17:17 -0000 1.4
+++ sources 2 Nov 2007 17:38:23 -0000 1.5
@@ -1 +1 @@
-aac031fae04f53bcd1e033b380b1b29d nas-1.9.src.tar.gz
+fc2412d5f4625aeb86f8d9d2c78991b6 nas-1.9a.src.tar.gz
- Previous message: rpms/nas/EL-5 nasd_247468.patch, NONE, 1.1 nasd_250453.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 nas.spec, 1.13, 1.14 sources, 1.6, 1.7
- Next message: rpms/environment-modules/devel .cvsignore, 1.7, 1.8 environment-modules.spec, 1.11, 1.12 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list