rpms/libXaw/devel libXaw.spec,1.28,1.29

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15431

Modified Files:
	libXaw.spec 
Log Message:
* Thu Jun 11 2009 Adam Jackson <ajax at redhat.com> 1.0.4-5
- Hide libXaw6 behind with_compat, disable by default.



Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXaw.spec	25 Feb 2009 13:12:19 -0000	1.28
+++ libXaw.spec	11 Jun 2009 18:30:59 -0000	1.29
@@ -1,7 +1,9 @@
+%define with_compat 0
+
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -9,15 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-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: libXext-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(xt)
+BuildRequires: pkgconfig(xmu) pkgconfig(xpm) pkgconfig(xext)
 # Required by the configury.
 BuildRequires: ed
 
@@ -26,12 +21,14 @@ Obsoletes: XFree86-libs, xorg-x11-libs
 %description
 X.Org X11 libXaw runtime library
 
+%if %{with_compat}
 %package compat
 Summary: X.Org X11 libXaw version 6 compatibility
 Group: System Environment/Libraries
 
 %description compat
 X.Org X11 libXaw version 6 compatibility
+%endif
 
 %package devel
 Summary: X.Org X11 libXaw development package
@@ -39,10 +36,7 @@ Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel
-Requires: libXmu-devel
-Requires: libXt-devel
-Requires: libXpm-devel
+Requires: pkgconfig(xproto) pkgconfig(xmu) pkgconfig(xt) pkgconfig(xpm)
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -53,15 +47,17 @@ X.Org X11 libXaw development package
 %setup -q
 
 %build
-%configure --disable-xaw8 --disable-static
+export CFLAGS="$RPM_OPT_FLAGS -Os"
+%configure --disable-xaw8 --disable-static \
+%if !%{with_compat}
+	   --disable-xaw6
+%endif
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
-# We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -77,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXaw7.so.7
 %{_libdir}/libXaw7.so.7.0.0
 
+%if %{with_compat}
 %files compat
 %defattr(-,root,root,-)
 %{_libdir}/libXaw.so.6
@@ -84,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXaw6.so.6
 %{_libdir}/libXaw6.so.6.0.1
 %{_libdir}/pkgconfig/xaw6.pc
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -98,10 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xaw7.pc
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
-#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jun 11 2009 Adam Jackson <ajax at redhat.com> 1.0.4-5
+- Hide libXaw6 behind with_compat, disable by default.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild