rpms/xfig/devel xfig.spec,1.46,1.47

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28173

Modified Files:
	xfig.spec 
Log Message:
* Sat Nov 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.5-6
- Put the Xaw3d version in the main xfig package, put the plain Xaw version
  in a -plain subpackage



Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xfig.spec	16 Nov 2007 20:56:21 -0000	1.46
+++ xfig.spec	17 Nov 2007 19:07:49 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -39,8 +39,12 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# for xrdb for merging of the color resources
+Requires: xorg-x11-server-utils
 Requires: %{name}-common = %{version}-%{release}
 Provides: %{name}-executable = %{version}-%{release}
+# Xaw3d used to be the one in a subpackage, now the plain Xaw version is
+Obsoletes: %{name}-Xaw3d < %{version}-%{release}
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -53,19 +57,18 @@
 graphics.
 
 
-%package Xaw3d
-Summary:        Xaw3d version of xfig
+%package plain
+Summary:        Plain Xaw version of xfig
 Group:          Applications/Multimedia
-# for xrdb
-Requires:       xorg-x11-server-utils
 Requires:       %{name}-common = %{version}-%{release}
 Provides:       %{name}-executable = %{version}-%{release}
 
-%description Xaw3d
-Xaw3d version of xfig, an X Window System tool for creating basic vector
-graphics, including bezier curves, lines, rulers and more. The Xaw3d version
-is a more modern / prettier looking version of the normal xfig program, other
-then that it is identical.
+%description plain
+Plain Xaw version of xfig, an X Window System tool for creating basic vector
+graphics, including bezier curves, lines, rulers and more. The normal xfig
+package uses the more modern / prettier looking Xaw3d toolkit, whereas this
+version uses the very basic Xaw toolkit. Unless you really know you want this
+version you probably don't want this version.
 
 
 %package common
@@ -159,11 +162,11 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-plain
+%{_bindir}/%{name}-Xaw3d
 
-%files Xaw3d
+%files plain
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-Xaw3d
+%{_bindir}/%{name}-plain
 
 %files common
 %defattr(-,root,root,-)
@@ -177,6 +180,10 @@
 
 
 %changelog
+* Sat Nov 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.5-6
+- Put the Xaw3d version in the main xfig package, put the plain Xaw version
+  in a -plain subpackage
+
 * Fri Nov 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.5-5
 - Also compile a version against Xaw3d instead of plain Xaw, available in the
   new xfig-Xaw3d package