rpms/mathgl/F-11 mathgl.spec, 1.3, 1.4 mathgl-io.patch, 1.1, NONE mathgl-png.patch, 1.1, NONE

[mycae]

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31883

Modified Files:
	mathgl.spec 
Removed Files:
	mathgl-io.patch mathgl-png.patch 
Log Message:
* Fix octave install
* Fix info install
* Remove patches that are no longer needed (fixed by upstream)



Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-11/mathgl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mathgl.spec	2 Jan 2010 03:24:32 -0000	1.3
+++ mathgl.spec	2 Jan 2010 06:01:37 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных
 License: GPLv2+
@@ -122,6 +122,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libe
 #Remove empty INDEX file
 rm %{name}/INDEX
 
+#Fix PKG_ADD 
+echo "pkg load mathgl" > %{name}/PKG_ADD
+echo "mathgl;" >> %{name}/PKG_ADD
+
+#fix wrong version number in description
+sed -i 's/1.9/1.10/'  %{name}/DESCRIPTION 
+
 #We cannot use version macro with octave package search,
 # as pkg.m assumes a x.y.z format for packages. Failing
 # to do this renders the plugin inoperable
@@ -154,6 +161,16 @@ rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name
 #remove misplaced info "dir" file
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
+pushd $RPM_BUILD_ROOT/%{_infodir}
+
+#move to _en info files
+for i in mathgl_en.info*;
+do
+	mv $i `echo $i | sed s/mathgl_en/mathgl/`
+done
+
+popd
+
 %post 
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -180,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 %{_prefix}/libexec/octave/packages/%{name}-1.10.0/
 %{_datadir}/octave/packages/%{name}-1.10.0/
-%{_infodir}/%{name}_en.*.gz
+%{_infodir}/%{name}.*.gz
 %{_infodir}/%{name}_ru.*.gz
 
 
@@ -194,6 +211,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Sat Jan 02 2010 <mycae(a!t)yahoo.com> - 1.10-2
+- Fix octave interface to load on startup
+- Fix texinfo insatll
+
 * Sat Jan 02 2010 <mycae(a!t)yahoo.com> - 1.10-1
 - Update to 1.10
 


--- mathgl-io.patch DELETED ---


--- mathgl-png.patch DELETED ---