rpms/geomview/devel .cvsignore, 1.2, 1.3 geomview-1.8.1-rh.patch, 1.1, 1.2 geomview.desktop, 1.1, 1.2 geomview.spec, 1.4, 1.5 sources, 1.2, 1.3 geomview-1.8.1-cH-2.diff, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jan 3 14:43:54 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20512
Modified Files:
.cvsignore geomview-1.8.1-rh.patch geomview.desktop
geomview.spec sources
Removed Files:
geomview-1.8.1-cH-2.diff
Log Message:
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Dec 2004 11:58:48 -0000 1.2
+++ .cvsignore 3 Jan 2006 14:43:54 -0000 1.3
@@ -1,3 +1,3 @@
-geomview-1.8.1.tar.gz
maniview-2.0.0.tar.gz
orrery-0.9.3.tar.gz
+geomview-snapshot-2004-02-21.tar.gz
geomview-1.8.1-rh.patch:
Index: geomview-1.8.1-rh.patch
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview-1.8.1-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview-1.8.1-rh.patch 24 Dec 2004 11:58:48 -0000 1.1
+++ geomview-1.8.1-rh.patch 3 Jan 2006 14:43:54 -0000 1.2
@@ -1,4 +1,4 @@
---- geomview-1.8.1/configure.in.rh 2001-03-25 19:56:01.000000000 -0600
+--- Geomview-1.8.1/configure.in.rh 2001-03-25 19:56:01.000000000 -0600
+++ geomview-1.8.1/configure.in 2004-03-16 13:05:13.000000000 -0600
@@ -491,10 +491,10 @@
Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.desktop 24 Dec 2004 11:58:48 -0000 1.1
+++ geomview.desktop 3 Jan 2006 14:43:54 -0000 1.2
@@ -2,8 +2,8 @@
Name=geomview
Comment=An interactive 3D viewing program
Exec=geomview
-Icon=geomview.png
-MimeType=
+Icon=geomview
+#MimeType=application/x-geomview
Type=Application
Encoding=UTF-8
Categories=Application;Graphics;Scientific;Education;Math;
Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geomview.spec 6 Apr 2005 22:11:38 -0000 1.4
+++ geomview.spec 3 Jan 2006 14:43:54 -0000 1.5
@@ -1,57 +1,53 @@
-# $Id$
-%define xforms_ver 1.0
-%define maniview_ver 2.0.0
-%define orrery_ver 0.9.3
+## Conditional build:
+# FIXME
+%define _with_orrery --with-orrery
+%define _with_maniview --with-maniview
+
+%define beta -alpha
+%define cvs 20040221
Name: geomview
Summary: Interactive 3D viewing program
-Version: 1.8.1
-Release: 11%{?dist_tag}
+Version: 1.8.2
+Release: 0.1.cvs%{cvs}%{?dist}
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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
+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)
Source1: geomview.desktop
Source2: geomview.png
# Other plugins
+%define orrery_ver 0.9.3
Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+%define maniview_ver 2.0.0
Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
## Patches
# put moduledir and data in sane locations
Patch1: geomview-1.8.1-rh.patch
-# from the "patches" section of http://sourceforge.net/projects/geomview/
-Patch2: geomview-1.8.1-cH-2.diff
BuildRequires: desktop-file-utils
-BuildRequires: autoconf213 automake14 libtool flex
+#BuildRequires: automake libtool
+BuildRequires: flex
BuildRequires: openmotif-devel
-# For libGL/libGLU (yuck, but I see no other way -- Rex)
+BuildRequires: xforms-devel
+## X/GL support
+%if "%{?fedora}" > "4"
+BuildRequires: libGL-devel libGLU-devel
+%else
BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+%endif
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
-## XForms configuration
-# use xforms by default, unless rpmbuild --without xforms
-%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
-## plugins, default to yes, unless rpmbuild --without pluginname
-# default plugins
-#{?_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 < %{maniview_ver}-%{release}}
-# orrery
-%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
-
%description
Geomview is an interactive 3D viewing program for Unix. It lets you view and
manipulate 3D objects: you use the mouse to rotate, translate, zoom in and out,
@@ -60,16 +56,8 @@
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.
-
-%if "%{?_with_xforms:1}" == "1"
-%package plugins
-Group: Applications/Engineering
-Summary: %{name} plugins
-Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins
-Geomview default plugins
-%endif
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides: %{name}-plugins = %{version}-%{release}
%if "%{?_with_orrery:1}" == "1"
%package orrery
@@ -93,39 +81,68 @@
Group: Applications/Engineering
Summary: Geomview module for viewing 3D manifolds
Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
+BuildRequires: xforms-devel
Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides: maniview = %{maniview_ver}-%{release}
+Provides: maniview = %{maniview_ver}-%{release}
%description maniview
-a Geomview module for viewing 3D manifolds.
+%{summary}.
%endif
%prep
-%setup -q %{?_with_orrery: -a 10} %{?_with_maniview: -a 11}
+%setup -q -n %{name}-%{version}%{?beta}
%patch1 -p1 -b .rh
-%patch2 -p1 -b .gcc3
libtoolize --force
-aclocal-1.4 -I ./m4
-automake-1.4
-autoconf-2.13
-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* )}
+aclocal -I m4
+autoconf
+autoheader
+automake -a
+
+%if "%{?_with_orrery:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+pushd orrery-%{orrery_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+pushd maniview-%{maniview_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
%build
-%{?CCC:export %{CCC}}
-%{?CXX:export %{CXX}}
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
+
+# --config-cache (for maniview)
%configure \
- %{?_with_xforms} %{?_without_xforms}
+ --config-cache
-make MATHLIB=-lm %{?CCC} %{?CXX}
+# Either do (re)automake steps above for addons, or this. -- Rex
+%if 0
+#--no-recursion
+%{?_with_orrery:(cd src/bin/orrery-%{orrery_ver};%configure)}
+%{?_with_maniview:(cd src/bin/maniview-%{maniview_ver};%configure --cache-file=../../../config.cache)}
+%endif
+
+# not smp-safe
+make MATHLIB=-lm
%install
@@ -141,7 +158,7 @@
%{SOURCE1}
# app icon
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
# move the html manual for inclusion later
mv doc/html .
@@ -149,84 +166,97 @@
# fixup info, We'll use install-info later
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# Manually install maniview manpage
-%{?_with_maniview:install -D -m644 src/bin/maniview*/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# maniview manpage
+%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%POST
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
+for icon_theme in hicolor ; do
+ touch --no-create %{_datadir}/icons/${icon_theme} ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
%preun
if [ $1 -eq 0 ] ;then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
fi
+%postun
+for icon_theme in hicolor ; do
+ touch --no-create %{_datadir}/icons/${icon_theme} ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
%files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL INSTALL.Geomview NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
%doc html
%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
%{_bindir}/*
%{_infodir}/*
-%{_mandir}/man?/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.geomview
-%{_datadir}/%{name}/geom
-%{_datadir}/%{name}/cmap.fmap
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvx
-%{_libexecdir}/%{name}/animate
-%{_libexecdir}/%{name}/.geomview-animate
-%{_libexecdir}/%{name}/drawbdy
-%{_libexecdir}/%{name}/.geomview-drawbdy
-
-%if "%{?_with_xforms:1}" == "1"
-%files plugins
-%defattr(-,root,root)
-%{_libexecdir}/%{name}/example
-%{_libexecdir}/%{name}/.geomview-example
-%{_libexecdir}/%{name}/ginsu
-%{_libexecdir}/%{name}/.geomview-ginsu
-%{_libexecdir}/%{name}/graffiti
-%{_libexecdir}/%{name}/.geomview-graffiti
-%{_libexecdir}/%{name}/stereo
-%{_libexecdir}/%{name}/.geomview-stereo
-%{_libexecdir}/%{name}/sweep
-%{_libexecdir}/%{name}/.geomview-sweep
-%{_libexecdir}/%{name}/tackdown
-%{_libexecdir}/%{name}/.geomview-tackdown
-%{_libexecdir}/%{name}/transformer
-%{_libexecdir}/%{name}/.geomview-transformer
-%{_libexecdir}/%{name}/origin
-%endif
+%{_mandir}/man1/*
+%{_datadir}/geomview/
+%{_libexecdir}/geomview/gvx
+%{_libexecdir}/geomview/animate
+%{_libexecdir}/geomview/.geomview-animate
+%{_libexecdir}/geomview/drawbdy
+%{_libexecdir}/geomview/.geomview-drawbdy
+%{_libexecdir}/geomview/example
+%{_libexecdir}/geomview/.geomview-example
+%{_libexecdir}/geomview/ginsu
+%{_libexecdir}/geomview/.geomview-ginsu
+%{_libexecdir}/geomview/graffiti
+%{_libexecdir}/geomview/.geomview-graffiti
+%{_libexecdir}/geomview/stereo
+%{_libexecdir}/geomview/.geomview-stereo
+%{_libexecdir}/geomview/sweep
+%{_libexecdir}/geomview/.geomview-sweep
+%{_libexecdir}/geomview/tackdown
+%{_libexecdir}/geomview/.geomview-tackdown
+%{_libexecdir}/geomview/transformer
+%{_libexecdir}/geomview/.geomview-transformer
+%{_libexecdir}/geomview/origin
+%{?_with_orrery:%exclude %{_datadir}/geomview/modules/ }
+%{?_with_maniview:%exclude %{_datadir}/geomview/groups/ }
+%{?_with_maniview:%exclude %{_mandir}/man1/maniview* }
%if "%{?_with_orrery:1}" == "1"
%files orrery
-%defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
+%defattr(-,root,root,-)
+%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
+%doc src/bin/orrery*/NEWS src/bin/orrery*/README
%dir %{_datadir}/geomview/modules
%{_datadir}/geomview/modules/orrery
-%{_libexecdir}/%{name}/.geomview-orrery
+%{_libexecdir}/geomview/.geomview-orrery
%endif
%if "%{?_with_maniview:1}" == "1"
%files maniview
-%defattr(-,root,root)
-%doc maniview*/README maniview*/NEWS maniview*/AUTHORS maniview*/ChangeLog
-%{_datadir}/%{name}/groups
-%{_libexecdir}/%{name}/maniview
-%{_libexecdir}/%{name}/.geomview-maniview
+%defattr(-,root,root,-)
+%doc src/bin/maniview*/AUTHORS src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
+%doc src/bin/maniview*/README src/bin/maniview*/NEWS
+%{_datadir}/geomview/groups/
+%{_libexecdir}/geomview/maniview
+%{_libexecdir}/geomview/.geomview-maniview
%{_mandir}/man1/maniview*
%endif
%changelog
+* 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
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]usres.sf.net> 1.8.1-12
+- follow/use icon spec
+
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Dec 2004 11:58:48 -0000 1.2
+++ sources 3 Jan 2006 14:43:54 -0000 1.3
@@ -1,3 +1,3 @@
-1cb0e07a6552e9fe122491af70171536 geomview-1.8.1.tar.gz
+776c3acefac602c422dacd45119f3560 geomview-snapshot-2004-02-21.tar.gz
109909e66ed37c678af4286cc6e620e2 maniview-2.0.0.tar.gz
8f68b4bd7ae8b207456fbed0650a8330 orrery-0.9.3.tar.gz
--- geomview-1.8.1-cH-2.diff DELETED ---
More information about the fedora-extras-commits
mailing list