rpms/geomview/devel geomview.spec,1.1,1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Mar 3 21:26:04 UTC 2005
Author: thias
Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/geomview/devel
Modified Files:
geomview.spec
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs
Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.spec 24 Dec 2004 11:58:48 -0000 1.1
+++ geomview.spec 3 Mar 2005 21:26:02 -0000 1.2
@@ -1,19 +1,18 @@
# $Id$
-%define xforms_ver 0:1.0
+%define xforms_ver 1.0
%define maniview_ver 2.0.0
%define orrery_ver 0.9.3
-Name: geomview
-Summary: An interactive 3D viewing program
-Epoch: 0
+Name: geomview
+Summary: Interactive 3D viewing program
Version: 1.8.1
Release: 10%{?dist_tag}
License: LGPL
Url: http://www.geomview.org/
-#Url: http://sourceforge.net/projects/geomview/
+#Url: http://sourceforge.net/projects/geomview/
Group: Applications/Engineering
-Source: http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
+Source: http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source1: geomview.desktop
@@ -43,14 +42,14 @@
%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
## plugins, default to yes, unless rpmbuild --without pluginname
# default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{epoch}:%{version}-%{release}}
+#{?_without_xforms:Obsoletes: %{name}-plugins < %{version}-%{release}}
# maniview (requires xforms)
%{?_without_xforms:%define _without_maniview --without-maniview}
%{!?_without_maniview:%define _with_maniview --with-maniview}
-#{?_without_maniview:Obsoletes: %{name}-maniview < %{epoch}:%{maniview_ver}-%{release}}
+#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
# orrery
%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{epoch}:%{orrery_ver}-%{release}}
+#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
%description
Geomview is an interactive 3D viewing program for Unix. It lets you view and
@@ -65,7 +64,7 @@
%package plugins
Group: Applications/Engineering
Summary: %{name} plugins
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
BuildRequires: xforms-devel >= %{xforms_ver}
%description plugins
Geomview default plugins
@@ -73,13 +72,13 @@
%if "%{?_with_orrery:1}" == "1"
%package orrery
-Group: Applications/Engineering
+Group: Applications/Engineering
Summary: Solar System Simulator for Geomview
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
Requires: tk
-Obsoletes: orrery < %{epoch}:%{orrery_ver}-%{release}
-Provides: orrery = %{epoch}:%{orrery_ver}-%{release}
-%description orrery
+Obsoletes: orrery < %{orrery_ver}-%{release}
+Provides: orrery = %{orrery_ver}-%{release}
+%description orrery
The Orrery is Geomview module which is a digital model of the solar
system, named for the mechanical models of the same name (often you'll
see one with just the Sun, Earth and Moon, as little balls supported
@@ -90,12 +89,12 @@
%if "%{?_with_maniview:1}" == "1"
%package maniview
-Group: Applications/Engineering
-Summary: a Geomview module for viewing 3D manifolds
-Requires: %{name} = %{epoch}:%{version}
+Group: Applications/Engineering
+Summary: Geomview module for viewing 3D manifolds
+Requires: %{name} = %{version}
BuildRequires: xforms-devel >= %{xforms_ver}
-Obsoletes: maniview < %{epoch}:%{maniview_ver}-%{release}
-Provides: maniview = %{epoch}:%{maniview_ver}-%{release}
+Obsoletes: maniview < %{maniview_ver}-%{release}
+Provides: maniview = %{maniview_ver}-%{release}
%description maniview
a Geomview module for viewing 3D manifolds.
%endif
@@ -114,8 +113,8 @@
autoheader-2.13
# Move misc plugins to correct location
-%{?_with_orrery:( mv orrery* src/bin; ln -s src/bin/orrery* ) }
-%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
+%{?_with_orrery:( mv orrery* src/bin; ln -s src/bin/orrery* ) }
+%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
%build
More information about the scm-commits
mailing list