- Move Xaw6 to a compat package, nothing in the distro needs it.

libXaw.spec

@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -26,6 +26,13 @@ Obsoletes: XFree86-libs, xorg-x11-libs
 %description
 X.Org X11 libXaw runtime library
 
+%package compat
+Summary: X.Org X11 libXaw version 6 compatibility
+Group: System Environment/Libraries
+
+%description compat
+X.Org X11 libXaw version 6 compatibility
+
 %package devel
 Summary: X.Org X11 libXaw development package
 Group: Development/Libraries
@@ -45,14 +52,8 @@ X.Org X11 libXaw development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure --disable-xaw8 \
+%configure --disable-xaw8 --disable-static
-%if ! %{with_static}
-	--disable-static
-%endif
 make %{?_smp_mflags}
 
 %install
@@ -72,13 +73,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/libXaw.so.6
 %{_libdir}/libXaw.so.7
-%{_libdir}/libXaw6.so.6
-%{_libdir}/libXaw6.so.6.0.1
 %{_libdir}/libXaw7.so.7
 %{_libdir}/libXaw7.so.7.0.0
 
+%files compat
+%defattr(-,root,root,-)
+%{_libdir}/libXaw.so.6
+%{_libdir}/libXaw6.so
+%{_libdir}/libXaw6.so.6
+%{_libdir}/libXaw6.so.6.0.1
+%{_libdir}/pkgconfig/xaw6.pc
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
@@ -87,13 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 # FIXME:  Is this C file really supposed to be here?
 %{_includedir}/X11/Xaw/Template.c
 %{_libdir}/libXaw.so
-%if %{with_static}
-%{_libdir}/libXaw6.a
-%{_libdir}/libXaw7.a
-%endif
-%{_libdir}/libXaw6.so
 %{_libdir}/libXaw7.so
-%{_libdir}/pkgconfig/xaw6.pc
 %{_libdir}/pkgconfig/xaw7.pc
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax@redhat.com> 1.0.2-10
+- Move Xaw6 to a compat package, nothing in the distro needs it.
+
 * Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.2-9
 - Rebuild for build id