rpms/nas/FC-5 nas.spec,1.4,1.5
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Oct 11 13:20:28 UTC 2006
- Previous message: rpms/nas/FC-4 nas.spec,1.6,1.7
- Next message: rpms/mediawiki/devel .cvsignore, 1.4, 1.5 mediawiki.spec, 1.5, 1.6 sources, 1.4, 1.5 needs.rebuild, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/nas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29674
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/FC-5/nas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nas.spec 24 Jul 2006 11:00:31 -0000 1.4
+++ nas.spec 11 Oct 2006 13:20:28 -0000 1.5
@@ -1,12 +1,16 @@
Name: nas
Summary: The Network Audio System (NAS)
Version: 1.8
-Release: 8%{?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,14 @@
%{_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
+
* Mon Jul 24 2006 Frank Büttner <frank-buettner at gmx.net> - 1.8-8%{?dist}
- fix ugly output when starting the daemon
- Previous message: rpms/nas/FC-4 nas.spec,1.6,1.7
- Next message: rpms/mediawiki/devel .cvsignore, 1.4, 1.5 mediawiki.spec, 1.5, 1.6 sources, 1.4, 1.5 needs.rebuild, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list