- Added libXaw-0.99.2-bug-173027-libtool-sucks.patch to fix bug #173027,

added 'autoconf' invocation prior to configure, and conditionalized it
    all with with_libtool_sucks_workaround macro.
- Added _smp_mflags to make invocation.
- Use *.h glob in file manifest instead of listing each header
    individually.
This commit is contained in:
mharris 2005-11-13 01:03:31 +00:00
parent bea3a67fc2
commit 38f3061bf7

View File

@ -1,12 +1,19 @@
%define with_libtool_sucks_workaround 1
Summary: X.Org X11 libXaw runtime library
Name: libXaw
Version: 0.99.2
Release: 1
Release: 2
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
# FIXME: Upstream tarballs create broken DT_SONAME on Fedora Core 4/5, due
# to a bug in configure.ac, so we hack it up, and invoke autoconf below to
# work around the issue. (RH Bug #173027)
Patch0: libXaw-0.99.2-bug-173027-libtool-sucks.patch
BuildRequires: xorg-x11-proto-devel
BuildRequires: libX11-devel
@ -35,34 +42,32 @@ X.Org X11 libXaw development package
%prep
%setup -q
%if %{with_libtool_sucks_workaround}
%patch0 -p0 -b .bug-173027-libtool-sucks
%endif
# Disable static library creation by default.
%define with_static 0
%build
%if %{with_libtool_sucks_workaround}
# FIXME: Upstream tarballs create broken DT_SONAME on Fedora Core 4/5, due
# to a bug in configure.ac, so we hack it up, and invoke autoconf below to
# work around the issue. (RH Bug #173027)
autoconf
%endif
%configure --disable-xaw8 \
%if ! %{with_static}
--disable-static
%endif
make
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
# Fix library names and symlinks
#{
# pushd $RPM_BUILD_ROOT%{_libdir}
# rm -f libXaw6.so.6 libXaw7.so.7
# mv libXaw6.so.6.0.1 libXaw.so.6.0.1
# mv libXaw7.so.7.0.0 libXaw.so.7.0.0
# ln -s libXaw.so.6.0.1 libXaw.so.6
# ln -s libXaw.so.6.0.1 libXaw.so
# popd
#}
# We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@ -77,9 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING README INSTALL ChangeLog
%dir %{_libdir}
%{_libdir}/libXaw.so.6
#%{_libdir}/libXaw.so.6.0.1
%{_libdir}/libXaw.so.7
#%{_libdir}/libXaw.so.7.0.0
%{_libdir}/libXaw6.so.6
%{_libdir}/libXaw6.so.6.0.1
%{_libdir}/libXaw7.so.7
@ -89,76 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%dir %{_includedir}/X11
%dir %{_includedir}/X11/Xaw
%{_includedir}/X11/Xaw/AllWidgets.h
%{_includedir}/X11/Xaw/AsciiSink.h
%{_includedir}/X11/Xaw/AsciiSinkP.h
%{_includedir}/X11/Xaw/AsciiSrc.h
%{_includedir}/X11/Xaw/AsciiSrcP.h
%{_includedir}/X11/Xaw/AsciiText.h
%{_includedir}/X11/Xaw/AsciiTextP.h
%{_includedir}/X11/Xaw/Box.h
%{_includedir}/X11/Xaw/BoxP.h
%{_includedir}/X11/Xaw/Cardinals.h
%{_includedir}/X11/Xaw/Command.h
%{_includedir}/X11/Xaw/CommandP.h
%{_includedir}/X11/Xaw/Dialog.h
%{_includedir}/X11/Xaw/DialogP.h
%{_includedir}/X11/Xaw/Form.h
%{_includedir}/X11/Xaw/FormP.h
%{_includedir}/X11/Xaw/Grip.h
%{_includedir}/X11/Xaw/GripP.h
%{_includedir}/X11/Xaw/Label.h
%{_includedir}/X11/Xaw/LabelP.h
%{_includedir}/X11/Xaw/List.h
%{_includedir}/X11/Xaw/ListP.h
%{_includedir}/X11/Xaw/MenuButtoP.h
%{_includedir}/X11/Xaw/MenuButton.h
%{_includedir}/X11/Xaw/MultiSink.h
%{_includedir}/X11/Xaw/MultiSinkP.h
%{_includedir}/X11/Xaw/MultiSrc.h
%{_includedir}/X11/Xaw/MultiSrcP.h
%{_includedir}/X11/Xaw/Paned.h
%{_includedir}/X11/Xaw/PanedP.h
%{_includedir}/X11/Xaw/Panner.h
%{_includedir}/X11/Xaw/PannerP.h
%{_includedir}/X11/Xaw/Porthole.h
%{_includedir}/X11/Xaw/PortholeP.h
%{_includedir}/X11/Xaw/Repeater.h
%{_includedir}/X11/Xaw/RepeaterP.h
%{_includedir}/X11/Xaw/Reports.h
%{_includedir}/X11/Xaw/Scrollbar.h
%{_includedir}/X11/Xaw/ScrollbarP.h
%{_includedir}/X11/Xaw/Simple.h
%{_includedir}/X11/Xaw/SimpleMenP.h
%{_includedir}/X11/Xaw/SimpleMenu.h
%{_includedir}/X11/Xaw/SimpleP.h
%{_includedir}/X11/Xaw/Sme.h
%{_includedir}/X11/Xaw/SmeBSB.h
%{_includedir}/X11/Xaw/SmeBSBP.h
%{_includedir}/X11/Xaw/SmeLine.h
%{_includedir}/X11/Xaw/SmeLineP.h
%{_includedir}/X11/Xaw/SmeP.h
%{_includedir}/X11/Xaw/StripCharP.h
%{_includedir}/X11/Xaw/StripChart.h
%{_includedir}/X11/Xaw/Template.h
%{_includedir}/X11/Xaw/TemplateP.h
%{_includedir}/X11/Xaw/Text.h
%{_includedir}/X11/Xaw/TextP.h
%{_includedir}/X11/Xaw/TextSink.h
%{_includedir}/X11/Xaw/TextSinkP.h
%{_includedir}/X11/Xaw/TextSrc.h
%{_includedir}/X11/Xaw/TextSrcP.h
%{_includedir}/X11/Xaw/Tip.h
%{_includedir}/X11/Xaw/TipP.h
%{_includedir}/X11/Xaw/Toggle.h
%{_includedir}/X11/Xaw/ToggleP.h
%{_includedir}/X11/Xaw/Tree.h
%{_includedir}/X11/Xaw/TreeP.h
%{_includedir}/X11/Xaw/VendorEP.h
%{_includedir}/X11/Xaw/Viewport.h
%{_includedir}/X11/Xaw/ViewportP.h
%{_includedir}/X11/Xaw/XawImP.h
%{_includedir}/X11/Xaw/XawInit.h
%{_includedir}/X11/Xaw/*.h
# FIXME: Is this C file really supposed to be here?
%{_includedir}/X11/Xaw/Template.c
%{_libdir}/libXaw.so
@ -176,9 +110,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_mandir}/man3x
%{_mandir}/man3x/*.3x*
#- Install the libraries as libXaw.so.[67]* instead of libXaw[67].so.[67]*
%changelog
* Sat Nov 12 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
- Added libXaw-0.99.2-bug-173027-libtool-sucks.patch to fix bug #173027,
added 'autoconf' invocation prior to configure, and conditionalized it
all with with_libtool_sucks_workaround macro.
- Added _smp_mflags to make invocation.
- Use *.h glob in file manifest instead of listing each header individually.
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
- Updated libXaw to version 0.99.2 from X11R7 RC2