rpms/Macaulay2/devel Macaulay2.spec,1.7,1.8

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
cleanup
drop not-needed %%preun
BR: gc-devel >= 6.5



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Macaulay2.spec	27 May 2005 09:23:20 -0000	1.7
+++ Macaulay2.spec	8 Aug 2005 15:59:03 -0000	1.8
@@ -11,7 +11,7 @@
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
 Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
@@ -25,7 +25,7 @@
 Patch5: Macaulay2-0.9.2-gcc4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 6.3
+BuildRequires: gc-devel >= 6.5
 BuildRequires: factory-devel >= 2.0.5
 BuildRequires: libfac-devel >= 2.0.5
 BuildRequires: gdbm-devel
@@ -37,21 +37,20 @@
 and Michael E. Stillman
 
 %package doc
-Summary: Macaulay2 documentation
+Summary: %{name} documentation
 Group: Documentation
 Requires: %{name} = %{version}
 Requires: htmlview
-Summary: Macaulay2 documentation
 %description doc
-Macaulay2 documentation.
+%{name} documentation.
 
 %package emacs
-Summary: Macaulay2 emacs mode
+Summary: %{name} emacs mode
 Group: Applications/Editors
 Requires: emacs
 Requires: %{name} = %{version}
 %description emacs
-Macaulay2 emacs mode.
+%{name} emacs mode.
 
 
 
@@ -67,6 +66,7 @@
 %patch4 -p1 -b .gcc34
 %patch5 -p1 -b .gcc4
 
+
 %build
 %configure  \
   --enable-gc-for-new \
@@ -94,17 +94,19 @@
 perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
-install -d      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf	$RPM_BUILD_ROOT%{m2home}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \
+        $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
-install -p -D -m644 %{SOURCE1}      $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -p -D -m644 \
+  %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install \
-  --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --vendor fedora \
   --add-category "X-Fedora" \
   %{SOURCE2}
 
@@ -123,9 +125,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%preun
+#preun
 # Handle possibly existing dumpdata
-rm -f %{m2home}/libexec/Macaulay2-*-data ||:
+#rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files