rpms/geomview/EL-5 .cvsignore, 1.13, 1.14 geomview.spec, 1.31, 1.32 sources, 1.12, 1.13 geomview-1.8.2-fhs.patch, 1.1, NONE orrery-0.9.3-fhs.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jul 10 12:31:08 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/geomview/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16405

Modified Files:
	.cvsignore geomview.spec sources 
Removed Files:
	geomview-1.8.2-fhs.patch orrery-0.9.3-fhs.patch 
Log Message:
* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.3-1
- geomview-1.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Oct 2006 21:36:53 -0000	1.13
+++ .cvsignore	10 Jul 2007 12:30:35 -0000	1.14
@@ -1,5 +1,3 @@
-maniview-2.0.0.tar.gz
-orrery-0.9.3.tar.gz
-geomview-1.8.2-rc8.tar.bz2
+clog
 geomview.png
-geomview-1.8.2-rc9.tar.bz2
+geomview-1.9.3.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/geomview.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- geomview.spec	26 Oct 2006 20:29:17 -0000	1.31
+++ geomview.spec	10 Jul 2007 12:30:35 -0000	1.32
@@ -1,85 +1,49 @@
 
-## Conditional build:
-%define _with_orrery --with-orrery
-#define _with_maniview --with-maniview
-
-%define beta rc9
-
 Name:    geomview
 Summary: Interactive 3D viewing program
-Version: 1.8.2
-Release: 0.25.%{beta}%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
 Group:   Applications/Engineering
-Source0: http://osdn.dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
-#Source0: geomview-%{cvs}.tar.bz2
-#Source1: geomview-cvs_checkout.sh
+Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # http://bugzilla.redhat.com/bugzilla/182625
 #ExcludeArch: x86_64
 
 Source1: geomview.desktop
 Source2: geomview.png
 
-# Other plugins
-%define orrery_ver 0.9.3
-Source100: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
-%define maniview_ver 2.0.0
-Source200: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
-
-## Patches
-# put moduledir and data in sane locations
-Patch1: geomview-1.8.2-fhs.patch
-# orrery fhs fixes
-Patch100: orrery-0.9.3-fhs.patch
-
 BuildRequires: desktop-file-utils
-BuildRequires: automake libtool
 BuildRequires: byacc flex
 # Until we have a generic BR: motif-devel -- Rex
-%if "%{?fedora}" > "5"
+%if 0%{?fedora} > 5
 BuildRequires: lesstif-devel
 %else
 BuildRequires: openmotif-devel
 %endif
-BuildRequires: xforms-devel
 BuildRequires: libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: libXmu-devel
 %endif
 BuildRequires: tcl-devel tk-devel
 
-
 #BuildRequires: /usr/bin/makeinfo 
 BuildRequires: texinfo
 
 #BuildRequires: /usr/bin/texi2html
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: texi2html
 %else
 BuildRequires: tetex
 %endif
 
+Requires: xdg-utils
 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,
@@ -95,92 +59,18 @@
 %description devel
 %{summary}.
 
-%if "%{?_with_orrery:1}" == "1"
-%package orrery
-Group:   Applications/Engineering
-Summary: Solar System Simulator for Geomview
-Requires: %{name} = %{version}
-Requires: tk tcl
-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
-on wires); the first such was built for the fourth Earl of Orrery in
-the 1700's.  This one includes all nine planets, some of their
-satellites, and a few recent comets.
-%endif
-
-%if "%{?_with_maniview:1}" == "1"
-%package maniview
-Group:   Applications/Engineering
-Summary: Geomview module for viewing 3D manifolds
-Requires: %{name} = %{version}
-Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides:  maniview = %{maniview_ver}-%{release}
-%description maniview
-%{summary}.
-%endif
-
 
 %prep
-%define src_dir %{name}-%{version}%{?beta:-%{beta}}
-%setup -q -n %{src_dir} 
-
-# purge CVS crud 
-find . -name CVS -type d | xargs rm -rf
-find . -name .cvsignore | xargs rm -f
-
-#patch1 -p1 -b .fhs
-
-#libtoolize --force
-#aclocal -I m4
-#./reconf -n
-
-%if "%{?_with_orrery:1}" == "1"
-%setup -q -T -D -n %{src_dir}/src/bin -a 100
-%patch100 -p0 -b .orrery-fhs
-pushd orrery-%{orrery_ver}
-libtoolize --force
-aclocal -I ../../../m4
-autoreconf -i -I ../../../m4
-#autoheader
-#automake -a
-popd
-%setup -T -D -n %{src_dir}
-%endif
-
-%if "%{?_with_maniview:1}" == "1"
-%setup -q -T -D -n %{src_dir}/src/bin -a 200
-pushd maniview-%{maniview_ver}
-#libtoolize --force
-#aclocal -I ../../../m4
-#autoreconf -i -I ../../../m4
-popd
-%setup -T -D -n %{src_dir}
-%endif
+%setup -q 
 
 
 %build
-
-export ACLOCAL=aclocal
-export AUTOMAKE=automake
-
-# --config-cache (for maniview)
 %configure \
   --enable-shared \
-  --disable-static
+  --disable-static \
+  --with-htmlbrowser=xdg-open \
+  --with-pdfviewer=xdg-open \
 
-# 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 
 make %{?_smp_mflags}
 
 
@@ -197,31 +87,10 @@
 # app icon
 install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
 
-# 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}
-
-# rename animate.1 that Conflicts: ImageMagick (#202039)
-mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
-   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
-# rename sweep.1 that Conflicts: lam (#212435)
-mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
-   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
-
-# rpmdocs
-make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
-make -k -C doc dochtmldir=`pwd`/rpmdocs/html install-dochtmlDATA ||:
-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/`basename $dir`/$file"
-  done
-done
-
 # Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{src_dir}
+
 
 
 %clean
@@ -250,33 +119,35 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%doc rpmdocs/geomview.pdf rpmdocs/html/
+%{_docdir}/geomview/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
+%{_mandir}/man5/*
 %{_datadir}/geomview/
-%{_libdir}/lib*.so.*
+%{_libdir}/libgeomview-%{version}.so
 %{_libexecdir}/geomview/
-%if "%{?_with_orrery:1}" == "1"
-%doc rpmdocs/orrery*/AUTHORS rpmdocs/orrery*/ChangeLog rpmdocs/orrery*/COPYING 
-%doc rpmdocs/orrery*/README
-%endif
-
-%if "%{?_with_maniview:1}" == "1"
-%doc rpmdocs/maniview*/ChangeLog rpmdocs/maniview*/COPYING
-%doc rpmdocs/maniview*/README
-%endif
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so
+%{_libdir}/libgeomview.so
 %{_includedir}/geomview/
 
 
 %changelog
+* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.3-1
+- geomview-1.9.3
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.2-1
+- geomview-1.9.2
+
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.1-1
+- geomview-1.9.1
+- omit orrery/maniview, can now be packaged separately.
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
 - re-instate dfi --vendor=fedora (thanks Ville!) 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Oct 2006 21:36:53 -0000	1.12
+++ sources	10 Jul 2007 12:30:35 -0000	1.13
@@ -1,4 +1,2 @@
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
-8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
-109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
-a8d62bdf60e385f36e0a59f4d8bec361  geomview-1.8.2-rc9.tar.bz2
+76b23ad312e68b22b6f2d8ab769ebcbd  geomview-1.9.3.tar.bz2


--- geomview-1.8.2-fhs.patch DELETED ---


--- orrery-0.9.3-fhs.patch DELETED ---




More information about the scm-commits mailing list