rpms/Macaulay2/FC-5 Macaulay2.desktop, 1.1, 1.2 Macaulay2.spec, 1.11, 1.12

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Mar 30 21:15:18 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29547

Modified Files:
	Macaulay2.desktop Macaulay2.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
- .desktop: drop Category=Development
- app icon: follow icon spec
- drop -emacs subpkg (in main now) 

* Fri Sep 16 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-19
- disable 'make check' (fc5/buildsystem error), besides, we get a 
  good consistency check when M2 builds all the doc examples.



Index: Macaulay2.desktop
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Macaulay2.desktop	8 Dec 2004 16:15:35 -0000	1.1
+++ Macaulay2.desktop	30 Mar 2006 21:15:18 -0000	1.2
@@ -5,5 +5,5 @@
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application
-Categories=Application;Education;Math;Scientific;Development;
+Categories=Application;Education;Math;Scientific;
 Encoding=UTF-8


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Macaulay2.spec	30 Mar 2006 17:03:09 -0000	1.11
+++ Macaulay2.spec	30 Mar 2006 21:15:18 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -20,16 +20,19 @@
 Patch1: Macaulay2-0.9-htmlview.patch
 Patch2: Macaulay2-0.9.2-static.patch
 Patch3: Macaulay2-0.9.2-gcc3.patch
-# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view
 Patch4: Macaulay2-0.9.2-gcc34.patch
 Patch5: Macaulay2-0.9.2-gcc4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 6.6
-BuildRequires: factory-devel >= 2.0.5-7
-BuildRequires: libfac-devel >= 2.0.5-4
+BuildRequires: gc-devel
+BuildRequires: factory-devel >= 2.0.5
+BuildRequires: libfac-devel >= 2.0.5
 BuildRequires: gdbm-devel
 BuildRequires: time
+#BuildRequires: lapack-devel
+
+Obsoletes: %{name}-emacs < %{version}-%{release}
+Provides:  %{name}-emacs = %{version}-%{release}
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in
@@ -44,15 +47,6 @@
 %description doc
 %{name} documentation.
 
-%package emacs
-Summary: %{name} emacs mode
-Group: Applications/Editors
-Requires: emacs
-Requires: %{name} = %{version}
-%description emacs
-%{name} emacs mode.
-
-
 
 %prep
 %setup -q
@@ -64,34 +58,33 @@
 %patch3 -p1 -b .gcc3
 # fc3/gcc34 fix
 %patch4 -p1 -b .gcc34
+# fc4/gcc4 fix
 %patch5 -p1 -b .gcc4
 
 
 %build
+
 %configure  \
-  --enable-gc-for-new \
   --disable-dumpdata \
-  --disable-optimize \
-  --disable-static \
-  %{?debug_package:--disable-strip}
+  --disable-optimize 
+
+#TODO: --with-lapacklibs 
+
+make 
 
-# not smp-safe
-make
 
-# Takes a *long* time, default off
 %check || :
-%{!?_without_check:make check }
+#disable, for now, util/screen dies on fc5/buildsystem (could not open pty)
+make check 
 
 
 %install
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
-	$RPM_BUILD_ROOT%{_bindir}/M2
-perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
-	$RPM_BUILD_ROOT%{_bindir}/M2-help
-perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
+sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2
+sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help
+sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
@@ -99,18 +92,18 @@
         $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
-install -p -D -m644 \
-  %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png
+install -p -m644 -D %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor fedora \
   --add-category "X-Fedora" \
   %{SOURCE2}
 
 ## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{m2home}/setup
 # %doc stuff, no need to dup in appdir
 rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
@@ -129,40 +122,46 @@
 # Handle possibly existing dumpdata
 #rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
+%post
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/*/*
 %dir %{m2home}
-%{m2home}/cache
-%{m2home}/libexec
-%{m2home}/m2
-%{m2home}/packages
-# Not needed/wanted
-%exclude %{m2home}/setup
-
-%files emacs
-%defattr(-,root,root)
-%dir %{m2home}/emacs
-%doc %{m2home}/emacs/*.m2
-%doc %{m2home}/emacs/*.txt
-%doc %{m2home}/emacs/README
-%{m2home}/emacs/*.el
-%{_datadir}/emacs/site-lisp/*.el
+%{m2home}/cache/
+%{m2home}/libexec/
+%{m2home}/m2/
+%{m2home}/packages/
+# emacs bits
+%{m2home}/emacs/
+%{_datadir}/emacs/site-lisp/
 
 %files doc
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/M2-help
-%{m2home}/html
-%{m2home}/tutorial
+%{m2home}/html/
+%{m2home}/tutorial/
 
 
 %changelog
-* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-19
-- BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265)
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
+- .desktop: drop Category=Development
+- app icon: follow icon spec
+- drop -emacs subpkg (in main now) 
+
+* Fri Sep 16 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-19
+- disable 'make check' (fc5/buildsystem error), besides, we get a 
+  good consistency check when M2 builds all the doc examples.
 
 * Wed Sep 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-18
 - rebuild against gc-6.6

More information about the scm-commits mailing list