rpms/geomview/devel .cvsignore, 1.8, 1.9 geomview.spec, 1.18, 1.19 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore geomview.spec sources 
Log Message:
* Mon Jul 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.13.rc7
- 1.8.2-rc7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jul 2006 18:18:51 -0000	1.8
+++ .cvsignore	31 Jul 2006 13:09:50 -0000	1.9
@@ -3,3 +3,4 @@
 geomview.png
 geomview-1.8.2-rc4.tar.bz2
 geomview-1.8.2-rc6.tar.bz2
+geomview-1.8.2-rc7.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- geomview.spec	26 Jul 2006 18:18:51 -0000	1.18
+++ geomview.spec	31 Jul 2006 13:09:50 -0000	1.19
@@ -3,13 +3,12 @@
 %define _with_orrery --with-orrery
 #define _with_maniview --with-maniview
 
-#define beta  20060623cvs
-%define beta rc6
+%define beta rc7
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.12.%{beta}%{?dist}
+Release: 0.13.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -119,7 +118,7 @@
 find . -name CVS -type d | xargs rm -rf
 find . -name .cvsignore | xargs rm -f
 
-%patch1 -p1 -b .fhs
+#patch1 -p1 -b .fhs
 
 #libtoolize --force
 #aclocal -I m4
@@ -166,9 +165,7 @@
 %endif
 
 # 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 
+make MATHLIB=-lm 
 
 
 %install
@@ -193,10 +190,11 @@
 %{?_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
+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/$dir/$file"
+    test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/`basename $dir`/$file"
   done
 done
 
@@ -206,7 +204,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 
 %post
@@ -231,35 +229,31 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%doc doc/geomview.pdf
+%doc rpmdocs/geomview.pdf rpmdocs/html/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man1/*
+%{_mandir}/man3/*
 %{_datadir}/geomview/
 %{_libdir}/lib*.so*
 %{_libexecdir}/geomview/
 %if "%{?_with_orrery:1}" == "1"
-#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
+%doc rpmdocs/orrery*/AUTHORS rpmdocs/orrery*/ChangeLog rpmdocs/orrery*/COPYING 
+%doc rpmdocs/orrery*/README
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
-#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
+%doc rpmdocs/maniview*/ChangeLog rpmdocs/maniview*/COPYING
+%doc rpmdocs/maniview*/README
 %endif
 
 
 %changelog
+* Mon Jul 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.13.rc7
+- 1.8.2-rc7
+
 * Thu Jul 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.12.rc6
 - 1.8.2-rc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jul 2006 18:18:51 -0000	1.8
+++ sources	31 Jul 2006 13:09:50 -0000	1.9
@@ -2,3 +2,4 @@
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
 b7deaf96fa9b968d3fc1a502e6751e36  geomview-1.8.2-rc6.tar.bz2
+a9d01f3e3ff50aff9cdad8ee45be7ea5  geomview-1.8.2-rc7.tar.bz2