From 0f7788566cbc124828548bf98b190c421968731f Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 30 Sep 2005 11:20:42 +0000 Subject: [PATCH] - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. - Use Fedora Extras style BuildRoot tag. - Disable static library creation by default. - Add missing defattr to devel subpackage - Add missing documentation files to doc macro - Fix all "BuildRequires:" deps with s/xorg-x11-//g --- libXaw.spec | 53 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/libXaw.spec b/libXaw.spec index df2ad21..2470278 100644 --- a/libXaw.spec +++ b/libXaw.spec @@ -1,24 +1,22 @@ -%define pkgname libXaw Summary: X.Org X11 libXaw runtime library -Name: xorg-x11-%{pkgname} +Name: libXaw Version: 0.99.0 -Release: 4 +Release: 5 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org -Source0: %{pkgname}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXt-devel -BuildRequires: xorg-x11-libXmu-devel -BuildRequires: xorg-x11-libXpm-devel +BuildRequires: libX11-devel +BuildRequires: libXt-devel +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel # configure doesn't complain about libXext missing, but the build fails # without it. -BuildRequires: xorg-x11-libXext-devel +BuildRequires: libXext-devel -Provides: %{pkgname} Conflicts: XFree86-libs, xorg-x11-libs %description @@ -28,25 +26,30 @@ X.Org X11 libXaw runtime library Summary: X.Org X11 libXaw development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: xorg-x11-libXmu-devel +Requires: libXmu-devel -Provides: %{pkgname}-devel Conflicts: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXaw development package %prep -%setup -q -c %{name}-%{version} +%setup -q + +# Disable static library creation by default. +%define with_static 0 %build -cd %{pkgname}-%{version} -%configure --disable-xaw8 + +%configure --disable-xaw8 \ +%if ! %{with_static} + --disable-static +%endif make %install rm -rf $RPM_BUILD_ROOT -cd %{pkgname}-%{version} + %makeinstall # We intentionally don't ship *.la files @@ -60,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc +%doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} %{_libdir}/libXaw6.so.6 %{_libdir}/libXaw6.so.6.0.1 @@ -68,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libXaw7.so.7.0.0 %files devel +%defattr(-,root,root,-) %dir %{_includedir}/X11 %dir %{_includedir}/X11/Xaw %{_includedir}/X11/Xaw/AllWidgets.h @@ -141,9 +145,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/Xaw/XawImP.h %{_includedir}/X11/Xaw/XawInit.h %{_libdir}/libXaw.so +%if %{with_static} %{_libdir}/libXaw6.a -%{_libdir}/libXaw6.so %{_libdir}/libXaw7.a +%endif +%{_libdir}/libXaw6.so %{_libdir}/libXaw7.so %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xaw6.pc @@ -154,6 +160,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xaw.3* %changelog +* Thu Sep 29 2005 Mike A. Harris 0.99.0-5 +- Renamed package to remove xorg-x11 from the name due to unanimous decision + between developers. +- Use Fedora Extras style BuildRoot tag. +- Disable static library creation by default. +- Add missing defattr to devel subpackage +- Add missing documentation files to doc macro +- Fix all "BuildRequires:" deps with s/xorg-x11-//g + * Wed Aug 25 2005 Mike A. Harris 0.99.0-4 - Added dependency on xorg-x11-libXmu-devel to devel subpackage, as libXaw headers include libXmu headers directly which caused xkbutils to fail to