rpms/nas/devel nas.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/nas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28678

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use potentially broken %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nas.spec	11 Sep 2006 08:03:28 -0000	1.5
+++ nas.spec	11 Oct 2006 13:14:00 -0000	1.6
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	9%{?dist}
-#for FC>4
-BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-#BuildRequires: bison flex xorg-x11-devel 
-#ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?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		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,11 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180)
+
 * Mon Sep 11 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
 - second rebuild for FC6