[libXaw] libXaw 1.0.9

Adam Jackson ajax at fedoraproject.org
Thu Jan 13 15:27:45 UTC 2011


commit c7747ebe293f0cecf033cd1fcbf16d91c91ee254
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jan 13 10:27:35 2011 -0500

    libXaw 1.0.9

 .gitignore  |    1 +
 libXaw.spec |   34 +++++++++-------------------------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index baceec1..a1f963d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libXaw-1.0.7.tar.bz2
 /libXaw-1.0.8.tar.bz2
+/libXaw-1.0.9.tar.bz2
diff --git a/libXaw.spec b/libXaw.spec
index b345374..28d62c6 100644
--- a/libXaw.spec
+++ b/libXaw.spec
@@ -1,8 +1,6 @@
-%define with_compat 0
-
 Summary: X Athena Widget Set
 Name: libXaw
-Version: 1.0.8
+Version: 1.0.9
 Release: 1%{?dist}
 License: MIT
 URL: http://www.x.org
@@ -14,20 +12,11 @@ BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(xt)
 BuildRequires: pkgconfig(xmu) pkgconfig(xpm) pkgconfig(xext)
 # Required by the configury.
 BuildRequires: ed
-BuildRequires: xorg-x11-util-macros xmlto
+BuildRequires: xorg-x11-util-macros xmlto lynx
 
 %description
 Xaw is a widget set based on the X Toolkit Intrinsics (Xt) 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: Development files for %{name}
 Group: Development/Libraries
@@ -46,9 +35,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Os"
 %configure \
 	    --docdir=%{_docdir}/%{name}-%{version}-%{release} \
 	    --disable-xaw8 --disable-static \
-%if !%{with_compat}
 	    --disable-xaw6
-%endif
 make %{?_smp_mflags}
 
 %install
@@ -70,16 +57,6 @@ 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
-%{_libdir}/libXaw6.so
-%{_libdir}/libXaw6.so.6
-%{_libdir}/libXaw6.so.6.0.1
-%{_libdir}/pkgconfig/xaw6.pc
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11/Xaw
@@ -97,6 +74,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}-%{version}-%{release}/%{name}.txt
 
 %changelog
+* Thu Jan 13 2011 Adam Jackson <ajax at redhat.com> 1.0.9-1
+- libXaw 1.0.9
+- Remove with_compat, always disable xaw6.
+
+* Mon Dec 06 2010 Adam Jackson <ajax at redhat.com> 1.0.8-2
+- Add BR: lynx so xmlto can generate text doc, fixes FTBFS.
+
 * Thu Oct 28 2010 Adam Jackson <ajax at redhat.com>
 - Drop BuildRoot
 
diff --git a/sources b/sources
index e0e27af..bece217 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-030fced589e9128c3cf57564d4a2e1ab  libXaw-1.0.8.tar.bz2
+ccc57478c41b7a75b9702241b889b1d4  libXaw-1.0.9.tar.bz2


More information about the scm-commits mailing list