Author: neoclust
Date: Tue Jan 30 14:53:28 2007
New Revision: 115469

Modified:
   packages/cooker/gnumexp/current/SPECS/gnumexp.spec

Log:
- Fix BuildRequires
- Fix spec
- Fix menu


Modified: packages/cooker/gnumexp/current/SPECS/gnumexp.spec
==============================================================================
--- packages/cooker/gnumexp/current/SPECS/gnumexp.spec  (original)
+++ packages/cooker/gnumexp/current/SPECS/gnumexp.spec  Tue Jan 30 14:53:28 2007
@@ -1,5 +1,5 @@
 %define        version 0.10.0
-%define release        %mkrel 4
+%define release        %mkrel 5
 
 %define numexp_version 0.11.0
 %define orbit_version 2.12.1
@@ -23,13 +23,13 @@
 BuildRequires: gnome-python-extras >= 2.9.4
 BuildRequires: pygtk2.0-devel >= 2.5.3
 BuildRequires: pyorbit-devel >= 2.0.1
-BuildRequires: pymathml >= %{pymathml_version}
+BuildRequires: python-pymathml >= %{pymathml_version}
 BuildRequires: docbook-dtd-mathml20
 BuildRequires: libnxplot-python
 BuildRequires: libnxplot-devel
 BuildRequires: X11-Xvfb
 BuildRequires: perl(XML::Parser)
-BuildRequires:  libbonoboui-devel
+#BuildRequires:  libbonoboui-devel
 # finding this one out is very painstaking
 BuildRequires: gnome-python-gnomeprint
 
@@ -44,7 +44,7 @@
 Requires:      docbook-dtd-mathml20
 Requires: pymathml
 # prevent "Fatal Python error: can't initialise module _nxplot" error:
-Requires: gnome-python-gnomeprin
+Requires: gnome-python-gnomeprint
 
 %description
 gNumExp is a GUI frontend to numexp-core. gNumExp can be considered
@@ -66,7 +66,6 @@
 %configure2_5x --disable-schemas-install || \
        { kill $pid; exit 1; }
 
-kill $pid
 
 %make
 
@@ -74,25 +73,12 @@
 rm -rf %{buildroot}
 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall_std DISABLE_MIME_INSTALL=1
 
-mkdir -p %{buildroot}%{_menudir}
-cat << _EOF_ > %{buildroot}%{_menudir}/%{name}
-?package(%{name}): \
- command="%{_bindir}/gnumexp" \
- icon="%{name}.png" \
- longtitle="Enter NumExp math queries" \
- needs="x11" \
- section="More Applications/Sciences/Mathematics" \
- title="gNumExp Math Console" \
- startup_notify="yes"
-?package(%{name}): \
- command="%{_bindir}/gnumexp -p" \
- icon="%{name}.png" \
- longtitle="Plot NumExp functions" \
- needs="x11" \
- section="More Applications/Sciences/Mathematics" \
- title="gNumExp Function Plotter" \
- startup_notify="yes"
-_EOF_
+desktop-file-install --vendor="" \
+  --remove-category="Application" \
+  --add-category="Math" \
+  --add-category="Science" \
+  --add-category="X-MandrivaLinux-MoreApplications-Sciences-Mathematics" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications 
$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 #icons
 mkdir -p %{buildroot}%{_miconsdir} \
@@ -109,7 +95,6 @@
        %{buildroot}%{_libdir}/python?.?/site-packages/*.{a,la}
 
 %post
-%update_menus
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 for SCHEMA in numexp-console; do
         gconftool-2 --makefile-install-rule 
%{_sysconfdir}/gconf/schemas/$SCHEMA.schemas > /dev/null
@@ -125,7 +110,6 @@
 fi
 
 %postun
-%clean_menus
 %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null
 
 %clean
@@ -147,7 +131,6 @@
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/orbit-2.0/*.so
 %{_libdir}/python?.?/site-packages/*
-%{_menudir}/%{name}
 %{_iconsdir}/%{name}.png
 %{_miconsdir}/%{name}.png
 %{_liconsdir}/%{name}.png

Reply via email to