rpms/geomview/devel geomview-1.8.2-fhs.patch, NONE, 1.1 geomview-cvs_checkout.sh, NONE, 1.1 orrery-0.9.3-fhs.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 geomview.spec, 1.13, 1.14 sources, 1.5, 1.6 geomview-1.8.1-rh.patch, 1.2, NONE geomview-cvs-checkout.sh, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Jul 21 15:17:15 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16679
Modified Files:
.cvsignore geomview.spec sources
Added Files:
geomview-1.8.2-fhs.patch geomview-cvs_checkout.sh
orrery-0.9.3-fhs.patch
Removed Files:
geomview-1.8.1-rh.patch geomview-cvs-checkout.sh
Log Message:
* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.8.rc3
- 1.8.2-rc3
- --without-maniview (for now, doesn't build)
- drop -maniview, -orrery subpkgs
geomview-1.8.2-fhs.patch:
--- NEW FILE geomview-1.8.2-fhs.patch ---
--- geomview-1.8.2-rc3/configure.ac.fhs 2006-07-15 22:41:00.000000000 -0500
+++ geomview-1.8.2-rc3/configure.ac 2006-07-20 13:58:08.000000000 -0500
@@ -711,10 +711,10 @@
########################################################################
-moduledir="\$(exec_prefix)/bin"
+moduledir="\$(libexecdir)/geomview"
AC_SUBST(moduledir)
-geomdatadir="\$(prefix)/data"
+geomdatadir="\$(datadir)/geomview"
AC_SUBST(geomdatadir)
# cache 'moduledir' and 'geomdatadir' so individual module configure scripts
--- geomview-1.8.2-rc3/configure.fhs 2006-07-19 15:36:55.000000000 -0500
+++ geomview-1.8.2-rc3/configure 2006-07-20 13:58:55.000000000 -0500
@@ -28541,10 +28541,10 @@
########################################################################
-moduledir="\$(exec_prefix)/bin"
+moduledir="\$(libexecdir)/geomview"
-geomdatadir="\$(prefix)/data"
+geomdatadir="\$(datadir)/geomview"
# cache 'moduledir' and 'geomdatadir' so individual module configure scripts
--- NEW FILE geomview-cvs_checkout.sh ---
#!/bin/bash
MODULE=$(basename $0 -cvs_checkout.sh)
DATE=$(date +%Y%m%d)
set -x
rm -rf $MODULE
cvs -z3 -d:pserver:anonymous@${MODULE}.cvs.sourceforge.net:/cvsroot/$MODULE co -P $MODULE
tar cjf $MODULE-${DATE}cvs.tar.bz2 $MODULE
rm -rf $MODULE
orrery-0.9.3-fhs.patch:
--- NEW FILE orrery-0.9.3-fhs.patch ---
--- orrery-0.9.3/quick2elem.fhs 2001-03-19 10:35:01.000000000 -0600
+++ orrery-0.9.3/quick2elem 2006-07-21 09:27:54.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#! /usr/bin/perl
# This file is part of the Orrery, a solar system simulator for
# Geomview (see www.geomview.org for details).
--- orrery-0.9.3/mktxmesh.fhs 2001-03-18 19:41:17.000000000 -0600
+++ orrery-0.9.3/mktxmesh 2006-07-21 09:28:20.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#! /usr/bin/perl
if(@ARGV == 0 && -t STDOUT) {
print STDERR "Usage: $0 {-stereo|-sinu|-rect|-cyl|-oneface} usize vsize > mesh.oogl
--- orrery-0.9.3/data/marshemi.mesh.fhs 2001-03-18 19:41:43.000000000 -0600
+++ orrery-0.9.3/data/marshemi.mesh 2006-07-21 09:27:09.000000000 -0500
@@ -344,7 +344,7 @@
0.000 0.000 1.000 0.000 0.000 1.000 0.986 0.500 0
-#! /usr/local/bin/perl
+#! /usr/bin/perl
#
#sub putmesh {
# ($nu,$nv) = (18,18);
--- orrery-0.9.3/data/orrery.fhs 2001-03-19 10:36:46.000000000 -0600
+++ orrery-0.9.3/data/orrery 2006-07-21 09:24:20.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/wish
+#! /usr/bin/wish
# This file is part of the Orrery, a solar system simulator for
# Geomview (see www.geomview.org for details).
--- orrery-0.9.3/data/vectext.tcl.fhs 2001-03-18 19:42:52.000000000 -0600
+++ orrery-0.9.3/data/vectext.tcl 2006-07-21 09:26:04.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/tclsh
+#! /usr/bin/tclsh
# Copyright (c) 1995, Geometry Center, University of Minnesota
# Script by Stuart Levy, Geometry Center.
@@ -11,7 +11,7 @@
# "-hershey" will seek files there if not found relative to ".".
# This could be a colon-separated list of directories.
-set gsfontpath "/usr/local/lib/ghostscript/fonts"
+set gsfontpath "/usr/share/ghostscript/fonts"
catch {set gsfontpath $env(GS_FONTPATH)}
proc vectext {args} {
--- orrery-0.9.3/tailcone.fhs 2001-03-19 10:35:10.000000000 -0600
+++ orrery-0.9.3/tailcone 2006-07-21 09:27:30.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#! /usr/bin/perl
# This file is part of the Orrery, a solar system simulator for
# Geomview (see www.geomview.org for details).
--- orrery-0.9.3/peri2elem.fhs 2001-03-19 10:34:52.000000000 -0600
+++ orrery-0.9.3/peri2elem 2006-07-21 09:24:55.000000000 -0500
@@ -1,4 +1,4 @@
-#! /usr/local/bin/tclsh
+#! /usr/bin/tclsh
# This file is part of the Orrery, a solar system simulator for
# Geomview (see www.geomview.org for details).
--- orrery-0.9.3/stargv.fhs 2001-03-19 10:35:07.000000000 -0600
+++ orrery-0.9.3/stargv 2006-07-21 09:27:43.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# This file is part of the Orrery, a solar system simulator for
# Geomview (see www.geomview.org for details).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 24 Jun 2006 01:46:34 -0000 1.5
+++ .cvsignore 21 Jul 2006 15:17:14 -0000 1.6
@@ -1,5 +1,4 @@
maniview-2.0.0.tar.gz
orrery-0.9.3.tar.gz
-geomview-snapshot-2004-02-21.tar.gz
geomview.png
-geomview-cvs20060623.tar.bz2
+geomview-1.8.2-rc3.tar.bz2
Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geomview.spec 24 Jun 2006 17:24:20 -0000 1.13
+++ geomview.spec 21 Jul 2006 15:17:14 -0000 1.14
@@ -1,30 +1,26 @@
## Conditional build:
%define _with_orrery --with-orrery
-%define _with_maniview --with-maniview
+#define _with_maniview --with-maniview
-%define cvs 20060623
+#define beta 20060623cvs
+%define beta rc3
Name: geomview
Summary: Interactive 3D viewing program
Version: 1.8.2
-Release: 0.7.cvs%{cvs}%{?dist}
+Release: 0.8.%{beta}%{?dist}
License: LGPL
Url: http://www.geomview.org/
-#Url: http://sourceforge.net/projects/geomview/
Group: Applications/Engineering
-#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
-Source0: geomview-cvs%{cvs}.tar.bz2
-Source1: geomview-cvs-checkout.sh
+Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
+#Source0: geomview-%{cvs}.tar.bz2
+Source1: geomview-cvs_checkout.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# http://bugzilla.redhat.com/bugzilla/182625
#ExcludeArch: x86_64
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides: %{name}-plugins = %{version}-%{release}
-
Source1: geomview.desktop
Source2: geomview.png
@@ -36,7 +32,9 @@
## Patches
# put moduledir and data in sane locations
-Patch1: geomview-1.8.1-rh.patch
+Patch1: geomview-1.8.2-fhs.patch
+# orrery fhs fixes
+Patch2: orrery-0.9.3-fhs.patch
BuildRequires: desktop-file-utils
BuildRequires: automake libtool
@@ -61,6 +59,21 @@
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides: %{name}-plugins = %{version}-%{release}
+
+Obsoletes: %{name}-orrery < %{version}-%{release}
+Obsoletes: %{name}-maniview < %{version}-%{release}
+
+%if "%{?_with_orrery:1}" == "1"
+Provides: %{name}-orrery = %{version}-%{release}
+Requires: tk tcl
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+Provides: %{name}-maniview = %{version}-%{release}
+%endif
+
%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,
@@ -74,7 +87,7 @@
Group: Applications/Engineering
Summary: Solar System Simulator for Geomview
Requires: %{name} = %{version}
-Requires: tk
+Requires: tk tcl
Obsoletes: orrery < %{orrery_ver}-%{release}
Provides: orrery = %{orrery_ver}-%{release}
%description orrery
@@ -99,39 +112,42 @@
%prep
-%setup -q -n %{name}
+%define src_dir %{name}-%{version}%{?beta:-%{beta}}
+%setup -q -n %{src_dir}
# purge CVS crud
-find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
+find . -name CVS -type d | xargs rm -rf
+find . -name .cvsignore | xargs rm -f
-%patch1 -p1 -b .rh
+%patch1 -p1 -b .fhs
-libtoolize --force
-./reconf -n
+#aclocal -I m4
+#libtoolize --force
+#./reconf -n
%if "%{?_with_orrery:1}" == "1"
-%setup -q -T -D -n %{name}/src/bin -a 10
+%setup -q -T -D -n %{src_dir}/src/bin -a 10
+%patch2 -p0 -b .orrery-fhs
pushd orrery-%{orrery_ver}
-libtoolize --force
aclocal -I ../../../m4
-autoconf
-autoheader
-automake -a
+autoreconf -i -I ../../../m4
+libtoolize --force
+#autoheader
+#automake -a
popd
-%setup -T -D -n %{name}
+%setup -T -D -n %{src_dir}
%endif
%if "%{?_with_maniview:1}" == "1"
-%setup -q -T -D -n %{name}/src/bin -a 11
+%setup -q -T -D -n %{src_dir}/src/bin -a 11
pushd maniview-%{maniview_ver}
-libtoolize --force
-aclocal -I ../../../m4
-autoconf
-autoheader
-automake -a
+#aclocal -I ../../../m4
+#autoreconf -i -I ../../../m4
+#libtoolize --force
+#autoheader
+#automake -a
popd
-%setup -T -D -n %{name}
+%setup -T -D -n %{src_dir}
%endif
@@ -142,8 +158,7 @@
# --config-cache (for maniview)
%configure \
- --config-cache \
- --disable-seekpipe
+ --disable-static
# Either do (re)automake steps above for addons, or this. -- Rex
%if 0
@@ -154,9 +169,8 @@
# not smp-safe
make MATHLIB=-lm || \
- test -s src/lib/oogl/wa/wa.yacc.c || rm -f src/lib/oogl/wa/wa.yacc.c
-
-make
+# test -s src/lib/oogl/wa/wa.yacc.c || rm -f src/lib/oogl/wa/wa.yacc.c
+# make
%install
@@ -174,21 +188,31 @@
# app icon
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 .
-
# fixup info, We'll use install-info later
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# maniview manpage
%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# rpmdocs
+make -C doc DOCDIR=`pwd`/rpmdocs install-data-local
+for dir in src/bin/orrery* src/bin/maniview* ; do
+ for file in AUTHORS ChangeLog COPYING README TODO ; do
+ test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+ done
+done
+
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{src_dir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
+/sbin/ldconfig
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
@@ -200,6 +224,7 @@
fi
%postun
+/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
@@ -208,64 +233,40 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
-%doc html
+%doc doc/geomview.pdf
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_bindir}/*
%{_infodir}/*
%{_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* }
-
+%{_libdir}/lib*.so*
+%{_libexecdir}/geomview/
%if "%{?_with_orrery:1}" == "1"
-%files orrery
-%defattr(-,root,root,-)
+#files orrery
+#defattr(-,root,root,-)
%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
%doc src/bin/orrery*/README
# zero-length, omit
#doc src/bin/orrery*/NEWS
-%dir %{_datadir}/geomview/modules
-%{_datadir}/geomview/modules/orrery
-%{_libexecdir}/geomview/.geomview-orrery
%endif
%if "%{?_with_maniview:1}" == "1"
-%files maniview
-%defattr(-,root,root,-)
+#files maniview
+#defattr(-,root,root,-)
%doc src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
%doc src/bin/maniview*/README
#zero-length, omit
#doc src/bin/maniview*/AUTHORS src/bin/maniview*/NEWS
-%{_datadir}/geomview/groups/
-%{_libexecdir}/geomview/maniview
-%{_libexecdir}/geomview/.geomview-maniview
-%{_mandir}/man1/maniview*
%endif
%changelog
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.8.rc3
+- 1.8.2-rc3
+- --without-maniview (for now, doesn't build)
+- drop -maniview, -orrery subpkgs
+
* Sat Jun 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.7.cvs20060623
- omit zero-length files
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 24 Jun 2006 01:46:34 -0000 1.5
+++ sources 21 Jul 2006 15:17:14 -0000 1.6
@@ -1,4 +1,4 @@
109909e66ed37c678af4286cc6e620e2 maniview-2.0.0.tar.gz
8f68b4bd7ae8b207456fbed0650a8330 orrery-0.9.3.tar.gz
f5588be3402850ed4cc9ef0dac48013a geomview.png
-c6fa3ef59c73e0ffc008b38724012e68 geomview-cvs20060623.tar.bz2
+28abf8a1d9a5d6af0bc7a20ac84e3214 geomview-1.8.2-rc3.tar.bz2
--- geomview-1.8.1-rh.patch DELETED ---
--- geomview-cvs-checkout.sh DELETED ---
More information about the fedora-extras-commits
mailing list