SPECS (DEVEL): gnumeric.spec - 1.5.2, run post/postun ldconfig, %%...

[freetz]

Author: freetz                       Date: Mon Jul 11 19:28:41 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 1.5.2, run post/postun ldconfig, %%files updates, removed ugly omf hack,
  updated BRs

---- Files affected:
SPECS:
   gnumeric.spec (1.151 -> 1.151.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnumeric.spec
diff -u SPECS/gnumeric.spec:1.151 SPECS/gnumeric.spec:1.151.2.1
--- SPECS/gnumeric.spec:1.151	Wed Jun  1 21:17:03 2005
+++ SPECS/gnumeric.spec	Mon Jul 11 21:28:36 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO:
+# - plugins subpackages
 #
 # Conditional build:
 %bcond_without	gda	# build without gda
@@ -18,14 +20,14 @@
 Summary(uk):	ĺĚĹËÔŇĎÎÎŚ ÔÁÂĚÉĂŚ ÄĚŃ GNOME
 Summary(zh_CN):	LinuxĎÂľÄExcel -- GNOMEľç×Óąí¸ń
 Name:		gnumeric
-Version:	1.4.3
-Release:	4
+Version:	1.5.2
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
 Vendor:		Gnumeric List <gnumeric-list at gnome.org>
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	b684eec48b1696d7a8d7152d1e17741c
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.5/%{name}-%{version}.tar.bz2
+# Source0-md5:	70051ecbd00a4b2d58ed51ca552fdf22
 Patch0:		%{name}-help-path.patch
 URL:		http://www.gnome.org/gnumeric/
 BuildRequires:	GConf2-devel
@@ -44,7 +46,8 @@
 %if %{with gnome}
 BuildRequires:	libbonobo-devel >= 2.6.0
 BuildRequires:	libbonoboui-devel >= 2.6.0
-BuildRequires:	libgsf-gnome-devel >= 1.11.0
+BuildRequires:	libgoffice-devel
+BuildRequires:	libgsf-gnome-devel >= 1.12.1
 %endif
 %if %{with gda}
 BuildRequires:	libgda-devel >= 1.0.1
@@ -132,7 +135,6 @@
 	--with%{!?with_python:out}-python \
 	--with%{!?with_gda:out}-gda \
 	--with%{!?with_mono:out}-mono \
-	--without-guile \
 	--without-gb
 
 %{__make}
@@ -149,22 +151,13 @@
 rm -r $RPM_BUILD_ROOT%{_datadir}/mc/templates/gnumeric.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
-########################  FAKE !  ########################################
-# Change location in omf file to real (needs update in every version up) #
-##########################################################################
-sed -e 's#gnumeric/1.4.3/doc#gnome/help/gnumeric#' \
-$RPM_BUILD_ROOT%{_omf_dest_dir}/%{name}/gnumeric-C.omf > \
-$RPM_BUILD_ROOT%{_omf_dest_dir}/%{name}/gnumeric-C.omf.out
-
-mv $RPM_BUILD_ROOT%{_omf_dest_dir}/%{name}/gnumeric-C.{omf.out,omf}
-######################## END FAKE ########################################
-
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 %gconf_schema_install gnumeric-dialogs.schemas
 %gconf_schema_install gnumeric-general.schemas
 %gconf_schema_install gnumeric-plugins.schemas
@@ -177,6 +170,7 @@
 %gconf_schema_uninstall gnumeric-plugins.schemas
 
 %postun
+/sbin/ldconfig
 %scrollkeeper_update_postun
 %update_desktop_database_postun
 
@@ -186,19 +180,21 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 
 %{_libdir}/bonobo/servers/*
+
 %dir %{_libdir}/gnumeric
-%dir %{_libdir}/gnumeric/%{version}*
-%dir %{_libdir}/gnumeric/%{version}*/plugins
-%dir %{_libdir}/gnumeric/%{version}*/plugins/*
-%attr(755,root,root) %{_libdir}/gnumeric/%{version}*/plugins/*/*.so
-%{_libdir}/gnumeric/%{version}*/plugins/*/*.glade
-%{_libdir}/gnumeric/%{version}*/plugins/*/*.xml
-%{_libdir}/gnumeric/%{version}*/plugins/*/*.la
+%dir %{_libdir}/gnumeric/%{version}
+%dir %{_libdir}/gnumeric/%{version}/plugins
+%dir %{_libdir}/gnumeric/%{version}/plugins/*
+%attr(755,root,root) %{_libdir}/gnumeric/%{version}/plugins/*/*.so
+%{_libdir}/gnumeric/%{version}/plugins/*/*.xml
+%{_libdir}/gnumeric/%{version}/plugins/*/*.la
+%{_libdir}/gnumeric/%{version}/plugins/*/*.pl
 %if %{with python}
-%{_libdir}/gnumeric/%{version}*/plugins/*/*.py
-%{_libdir}/gnumeric/%{version}*/plugins/gnome-glossary/glossary-po-header
+%{_libdir}/gnumeric/%{version}/plugins/*/*.py
+%{_libdir}/gnumeric/%{version}/plugins/gnome-glossary/glossary-po-header
 %endif
 
 %{_desktopdir}/*.desktop
@@ -207,11 +203,11 @@
 
 %dir %{_datadir}/gnumeric
 %dir %{_datadir}/gnumeric/%{version}*
-%{_datadir}/gnumeric/%{version}*/*.xml
-%{_datadir}/gnumeric/%{version}*/autoformat-templates
-%{_datadir}/gnumeric/%{version}*/idl
-%{_datadir}/gnumeric/%{version}*/glade
-%{_datadir}/gnumeric/%{version}*/templates
+%{_datadir}/gnumeric/%{version}/*.xml
+%{_datadir}/gnumeric/%{version}/autoformat-templates
+%{_datadir}/gnumeric/%{version}/glade
+%{_datadir}/gnumeric/%{version}/idl
+%{_datadir}/gnumeric/%{version}/templates
 
 %{_mandir}/man1/gnumeric.1*
 %{_mandir}/man1/ssconvert.1*
@@ -222,6 +218,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151.2.1  2005/07/11 19:28:36  freetz
+- 1.5.2, run post/postun ldconfig, %%files updates, removed ugly omf hack,
+  updated BRs
+
 Revision 1.151  2005/06/01 19:17:03  zbyniu
 - BR: pkgconfig, popt-devel, scrollkeeper
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnumeric.spec?r1=1.151&r2=1.151.2.1&f=u