rpms/Macaulay2/devel Macaulay2.spec,1.41,1.42

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226

Modified Files:
	Macaulay2.spec 
Log Message:
final 1.1 fixes



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Macaulay2.spec	12 Mar 2008 19:50:31 -0000	1.41
+++ Macaulay2.spec	13 Mar 2008 03:31:28 -0000	1.42
@@ -52,6 +52,8 @@
 
 BuildRequires: autoconf
 
+Obsoletes: Macaulay2-common < %{version}-%{release}
+Provides:  Macaulay2-common = %{version}-%{release}
 Obsoletes: Macaulay2-doc < %{version}-%{release} 
 Provides:  Macaulay2-doc = %{version}-%{release}
 Obsoletes: Macaulay2-emacs < %{version}-%{release}
@@ -105,8 +107,7 @@
 
 
 %check 
-# util/screen dies on fc5/buildsystem (could not open pty)
-#make -k check ||:
+make -k check ||:
 
 
 %install
@@ -144,9 +145,17 @@
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do
+  /sbin/install-info --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
+done
 
 %postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+  for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do
+    /sbin/install-info --delete --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||:
+  done
+fi
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then 
@@ -171,13 +180,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Macaulay2/CHANGES Macaulay2/COPYING
+%doc Macaulay2/COPYING Macaulay2/README
 %{_bindir}/*
-%{_datadir}/Macaulay2/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/Macaulay2/
 %{_docdir}/Macaulay2/
 %{_infodir}/*
+%{_libdir}/Macaulay2/
 %{_mandir}/man1/*
 %ghost %{emacs_sitelisp} 
 %ghost %{xemacs_sitelisp}
@@ -186,6 +196,7 @@
 %changelog
 * Tue Mar 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1-1
 - Macaulay2-1.1
+- Obsoletes/Provides: Macaulay2-common (upstream compatibility)
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.95-10
 - Autorebuild for GCC 4.3