rpms/nas/devel nas.spec,1.22,1.23

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	nas.spec 
Log Message:
* Mon Apr 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.9.1-4
- -libs subpkg (f9+, #438547)
- %install: INSTALLFLAGS='-p' (preserve timestamps)
- fixup %changelog whitespace



Index: nas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nas/devel/nas.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nas.spec	19 Feb 2008 03:19:41 -0000	1.22
+++ nas.spec	7 Apr 2008 18:44:19 -0000	1.23
@@ -1,10 +1,16 @@
+
+%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:	3%{?dist}
+Release:	4%{?dist}
 BuildRequires:	bison flex
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
-BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel 
+%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 
@@ -24,11 +30,28 @@
 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} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Group:		Development/Libraries
 
+%if 0%{?libs}
+%package libs
+Summary: Runtime libraries for NAS
+Group:   System Environment/Libraries
+%description libs
+%{summary}.
+%endif
+
+
 %description
 In a nutshell, NAS is the audio equivalent of an X display  server.
 The Network Audio System (NAS) was developed by NCD for playing,
@@ -67,6 +90,7 @@
 
 make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
   LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  INSTALLFLAGS='-p' \
   install install.man
 
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
@@ -78,10 +102,10 @@
 mv $RPM_BUILD_ROOT/etc/nas/nasd.conf.eg $RPM_BUILD_ROOT/etc/nas/nasd.conf
 
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 /sbin/chkconfig --add nasd
 
-%postun -p /sbin/ldconfig
+%{!?libs:%postun -p /sbin/ldconfig}
 
 %preun
 if [ $1 = 0 ] ; then
@@ -89,11 +113,18 @@
   /sbin/service nasd stop >/dev/null 2>&1 ||:
 fi
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir /etc/nas
 %config (noreplace) /etc/nas/nasd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/nasd
@@ -102,42 +133,53 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{_libdir}/libaudio.so.2
-%{_libdir}/libaudio.so.2.4
 %{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
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/audio/
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
 
-%changelog
+%changelog 
+* Mon Apr 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.9.1-4
+- -libs subpkg (f9+, #438547)
+- %%install: INSTALLFLAGS='-p' (preserve timestamps)
+- fixup %%changelog whitespace
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.1-3
 - Autorebuild for GCC 4.3
 
-*Sun Nov 11 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9.1-2
- - fix spec file
-*Sun Nov 11 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9.1-1
- - update to 1.9.1
- - remove unneeded patches
-
-*Fri Nov 02 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9a-3
- - add better patch for #247468 
+* Sun Nov 11 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9.1-2
+- fix spec file
+
+* Sun Nov 11 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9.1-1
+- update to 1.9.1
+- remove unneeded patches
+
+* 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
+* 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
+* 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 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
+- 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