packages: gnumeric/gnumeric.spec - up to 1.10.12 - drop obsoleted rm - use ...

[lisu]

Author: lisu                         Date: Wed Dec  8 10:20:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.10.12
- drop obsoleted rm
- use rm macro
- new plugin: nlsolve

---- Files affected:
packages/gnumeric:
   gnumeric.spec (1.205 -> 1.206) 

---- Diffs:

================================================================
Index: packages/gnumeric/gnumeric.spec
diff -u packages/gnumeric/gnumeric.spec:1.205 packages/gnumeric/gnumeric.spec:1.206
--- packages/gnumeric/gnumeric.spec:1.205	Mon Oct  4 15:25:34 2010
+++ packages/gnumeric/gnumeric.spec	Wed Dec  8 11:20:34 2010
@@ -18,16 +18,15 @@
 Summary(uk.UTF-8):	Електронні таблиці для GNOME
 Summary(zh_CN.UTF-8):	Linux下的Excel -- GNOME电子表格
 Name:		gnumeric
-Version:	1.10.11
+Version:	1.10.12
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
-Vendor:		Gnumeric List <gnumeric-list at gnome.org>
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	28933c7b1099329d28fdb2f3ce05030d
-#Patch0:		%{name}-help-path.patch
-#Patch1:		%{name}-gda12.patch
+# Source0-md5:	d93c01092fccefa33e796c07ef0a5b37
+#Patch0: 	%{name}-help-path.patch
+#Patch1: 	%{name}-gda12.patch
 URL:		http://www.gnome.org/gnumeric/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	ORBit2-devel >= 1:2.14.0
@@ -43,7 +42,7 @@
 BuildRequires:	libart_lgpl-devel >= 2.3.12
 %if %{with gnome}
 BuildRequires:	libbonoboui-devel >= 2.14.0
-BuildRequires:	libgoffice-devel >= 0.8.11
+BuildRequires:	libgoffice-devel >= 0.8.12
 BuildRequires:	libgsf-gnome-devel >= 1.14.18
 %endif
 %if %{with gda}
@@ -234,6 +233,19 @@
 %description plugin-lpsolve -l pl.UTF-8
 Importuje pliki lpsolve.
 
+# nlsolve
+%package plugin-nlsolve
+Summary:	nlsolve plugin
+Summary(pl.UTF-8):	Wtyczka nlsolve
+Group:		X11/Applications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-nlsolve
+Imports nlsolve files.
+
+%description plugin-nlsolve -l pl.UTF-8
+Importuje pliki nlsolve.
+
 # gnu oleo
 %package plugin-gnuoleo
 Summary:	GNU Oleo plugin
@@ -457,9 +469,8 @@
 	docdir=%{_datadir}/gnome/help/gnumeric/C \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnumeric/%{version}/plugins/*/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnumeric/%{version}/plugins/*/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
@@ -526,7 +537,6 @@
 %dir %{_datadir}/gnumeric/%{version}*
 %{_datadir}/gnumeric/%{version}/*.xml
 %{_datadir}/gnumeric/%{version}/autoformat-templates
-%{_datadir}/gnumeric/%{version}/glade
 %{_datadir}/gnumeric/%{version}/templates
 
 %{_mandir}/man1/gnumeric.1*
@@ -592,6 +602,13 @@
 %attr(755,root,root) %{_libdir}/gnumeric/%{version}/plugins/lpsolve/*.so
 %{_libdir}/gnumeric/%{version}/plugins/lpsolve/*.xml
 
+# nlsolve
+%files plugin-nlsolve
+%defattr(644,root,root,755)
+%dir %{_libdir}/gnumeric/%{version}/plugins/nlsolve
+%attr(755,root,root) %{_libdir}/gnumeric/%{version}/plugins/nlsolve/*.so
+%{_libdir}/gnumeric/%{version}/plugins/nlsolve/*.xml
+
 # gnu oleo
 %files plugin-gnuoleo
 %defattr(644,root,root,755)
@@ -709,6 +726,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2010/12/08 10:20:34  lisu
+- up to 1.10.12
+- drop obsoleted rm
+- use rm macro
+- new plugin: nlsolve
+
 Revision 1.205  2010/10/04 13:25:34  lisu
 - 1.10.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnumeric/gnumeric.spec?r1=1.205&r2=1.206&f=u