- Merge review cleanups. (#226063)

libXau.spec

@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -12,8 +12,6 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libXau runtime library
 
@@ -23,28 +21,19 @@ Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
-
+Requires: pkgconfig
-# xorg-x11-proto-devel needed by xau.pc
 BuildRequires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libXau development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 
-%configure \
+%configure --disable-static
-%if ! %{with_static}
+make %{?_smp_mflags}
-	--disable-static
-%endif
-make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,15 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %{_includedir}/X11/Xauth.h
-%if %{with_static}
-%{_libdir}/libXau.a
-%endif
 %{_libdir}/libXau.so
 %{_libdir}/pkgconfig/xau.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Feb 21 2009 Adam Jackson <ajax@redhat.com> 1.0.4-2
+- Merge review cleanups. (#226063)
+
 * Thu Sep 04 2008 Adam Jackson <ajax@redhat.com> 1.0.4-1
 - libXau 1.0.4