SPECS: nas.spec - updated to 1.8 - removed gcc4 patch (already in ...

[megabajt]

Author: megabajt                     Date: Thu Jun 22 09:15:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.8
- removed gcc4 patch (already in sources)
- modular xorg deps

---- Files affected:
SPECS:
   nas.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: SPECS/nas.spec
diff -u SPECS/nas.spec:1.49 SPECS/nas.spec:1.50
--- SPECS/nas.spec:1.49	Thu Mar  9 15:35:10 2006
+++ SPECS/nas.spec	Thu Jun 22 11:15:44 2006
@@ -4,17 +4,19 @@
 Summary(ru):	NAS - ËĚÉĹÎÔ-ÓĹŇ×ĹŇÎÁŃ ÓĹÔĹ×ÁŃ ĐĎÄÄĹŇÖËÁ ÁŐÄÉĎ
 Summary(uk):	NAS - ËĚŚ¤ÎÔ-ÓĹŇ×ĹŇÎÁ ÍĹŇĹÖĹ×Á ĐŚÄÔŇÉÍËÁ ÁŐÄŚĎ
 Name:		nas
-Version:	1.7
+Version:	1.8
 Release:	1
 License:	Free
 Group:		Applications/Sound
-Source0:	http://radscan.com/nas/%{name}-%{version}.src.tar.gz
-# Source0-md5:	c9918e9c9c95d587a95b455bbabe3b49
-Patch0:		%{name}-gcc4.patch
+Source0:	http://nas.codebrilliance.com/nas/%{name}-%{version}.src.tar.gz
+# Source0-md5:	7e5ecab75a48c75b0c6305fcced34a97
 URL:		http://radscan.com/nas.html
-BuildRequires:	XFree86-devel
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	xorg-cf-files >= 1.0.1-0.3
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-util-gccmakedep
+BuildRequires:	xorg-util-imake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nas
@@ -80,7 +82,7 @@
 Summary(ru):	âÉÂĚÉĎÔĹËÉ É .h-ĆÁĘĚŮ ÄĚŃ ĐŇĎÇŇÁÍÍ Ó ĐĎÄÄĹŇÖËĎĘ NAS
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ÔÁ .h-ĆÁĘĚÉ ÄĚŃ ĐŇĎÇŇÁÍ Ú ĐŚÄÔŇÉÍËĎŔ NAS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package allows you to develop your own network audio programs.
@@ -102,7 +104,7 @@
 Summary(ru):	óÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍÍ Ó ĐĎÄÄĹŇÖËĎĘ NAS
 Summary(uk):	óÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍ Ú ĐŚÄÔŇÉÍËĎŔ NAS
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 NAS static library.
@@ -118,14 +120,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 xmkmf
 %{__make} World \
 	WORLDOPTS="-k CDEBUGFLAGS='%{rpmcflags} -D__USE_BSD_SIGNAL -w'" \
 	CXXDEBUGFLAGS="%{rpmcflsgs} -w" \
-	REQUIREDLIBS="-L/usr/X11R6/%{_lib} -lXt -X11 -lm" \
+	REQUIREDLIBS="-lXt -X11 -lm" \
 	CC="%{__cc}"
 
 %install
@@ -140,8 +141,6 @@
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/nasd.conf.eg \
 	$RPM_BUILD_ROOT%{_sysconfdir}/nasd.conf
-mv $RPM_BUILD_ROOT%{_mandir}/man5/nasd.conf.5nas \
-	$RPM_BUILD_ROOT%{_mandir}/man5/nasd.conf.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -156,7 +155,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nasd.conf
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*
-/usr/X11R6/lib/X11/AuErrorDB
+%{_libdir}/X11/AuErrorDB
 %{_mandir}/man[15]/*
 
 %files devel
@@ -176,6 +175,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2006/06/22 09:15:44  megabajt
+- updated to 1.8
+- removed gcc4 patch (already in sources)
+- modular xorg deps
+
 Revision 1.49  2006/03/09 14:35:10  glen
 - quote %{__cc}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nas.spec?r1=1.49&r2=1.50&f=u