rpms/geomview/devel geomview.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	geomview.spec 
Log Message:
* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
- rework Obsoletes/Provides: geomview-plugins



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.spec	3 Jan 2006 14:43:54 -0000	1.5
+++ geomview.spec	3 Jan 2006 19:40:54 -0000	1.6
@@ -1,6 +1,5 @@
 
 ## Conditional build:
-# FIXME
 %define _with_orrery --with-orrery
 %define _with_maniview --with-maniview
 
@@ -10,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.1.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -20,6 +19,9 @@
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
+
 Source1: geomview.desktop
 Source2: geomview.png
 
@@ -39,10 +41,10 @@
 BuildRequires: openmotif-devel
 BuildRequires: xforms-devel
 ## X/GL support
-%if "%{?fedora}" > "4"
+%if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
 %else
-BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+BuildRequires: libGL.so.1 libGLU.so.1
 %endif
 
 Requires(post): /sbin/install-info
@@ -56,9 +58,6 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides:  %{name}-plugins = %{version}-%{release}
-
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
 Group:   Applications/Engineering
@@ -250,6 +249,9 @@
 
 
 %changelog
+* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
+- rework Obsoletes/Provides: geomview-plugins
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
 - cvs20040421
 - --with-xforms unconditional, Obsoletes/Provides: geomview-plugins