rpms/Macaulay2/devel Macaulay2.spec,1.3,1.4

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	Macaulay2.spec 
Log Message:
>From #149225

* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
- x86_64 issues (%%_libdir -> %%_prefix/lib )
- remove desktop_file macro usage




Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
+++ Macaulay2.spec	25 Mar 2005 15:19:05 -0000	1.4
@@ -1,9 +1,12 @@
-# $Id$
-
+# busted on x86_64 -- Rex
+# define m2home %{_libdir}/%{name}-%{version}
+# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
+%define m2home %{_prefix}/lib/%{name}-%{version}
+ 
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 14%{?dist_tag}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -83,41 +86,36 @@
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+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%{_libdir}/%{name}-%{version}/emacs/*
+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%{_libdir}/%{name}-%{version}/emacs/*.el \
+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
 
-%if "%{?desktop_file}" != "0"
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-
 desktop-file-install \
   --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   --add-category "X-Fedora" \
   %{SOURCE2}
-%else
-install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
-%endif
 
 ## Unpackaged files
 # %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
+rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
 # .cvsignore
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
 # unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
+find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
@@ -126,44 +124,44 @@
 
 %preun
 # Handle possibly existing dumpdata
-rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
+rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files
 %defattr(-,root,root)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
-%if "%{?desktop_file}" != "0"
 %{_datadir}/applications/*.desktop
-%else
-%{_sysconfdir}/X11/applnk/*/*.desktop
-%endif
 %{_datadir}/pixmaps/*.png
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/cache
-%{_libdir}/%{name}-%{version}/libexec
-%{_libdir}/%{name}-%{version}/m2
-%{_libdir}/%{name}-%{version}/packages
+%dir %{m2home}
+%{m2home}/cache
+%{m2home}/libexec
+%{m2home}/m2
+%{m2home}/packages
 # Not needed/wanted
-%exclude %{_libdir}/%{name}-%{version}/setup
+%exclude %{m2home}/setup
 
 %files emacs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}-%{version}/emacs
-%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
-%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
-%doc %{_libdir}/%{name}-%{version}/emacs/README
-%{_libdir}/%{name}-%{version}/emacs/*.el
+%dir %{m2home}/emacs
+%doc %{m2home}/emacs/*.m2
+%doc %{m2home}/emacs/*.txt
+%doc %{m2home}/emacs/README
+%{m2home}/emacs/*.el
 %{_datadir}/emacs/site-lisp/*.el
 
 %files doc
 %defattr(-,root,root)
 %{_bindir}/M2-help
-%{_libdir}/%{name}-%{version}/html
-%{_libdir}/%{name}-%{version}/tutorial
+%{m2home}/html
+%{m2home}/tutorial
 
 
 %changelog
+* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
+- x86_64 issues (%%_libdir -> %%_prefix/lib )
+- remove desktop_file macro usage
+
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
 - BR: time (again)
 - omit m2_dir/setup (not needed/wanted)