packages: libgsf/libgsf.spec - updated to 1.14.20

[qboosh]

Author: qboosh                       Date: Sat Apr 30 14:21:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.14.20

---- Files affected:
packages/libgsf:
   libgsf.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: packages/libgsf/libgsf.spec
diff -u packages/libgsf/libgsf.spec:1.80 packages/libgsf/libgsf.spec:1.81
--- packages/libgsf/libgsf.spec:1.80	Sat Oct  2 22:40:21 2010
+++ packages/libgsf/libgsf.spec	Sat Apr 30 16:21:05 2011
@@ -14,12 +14,12 @@
 Summary:	GNOME Structured File library
 Summary(pl.UTF-8):	Biblioteka plików strukturalnych dla GNOME
 Name:		libgsf
-Version:	1.14.19
+Version:	1.14.20
 Release:	1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	2d09ad4e61a650b5d554b5fca8250046
+# Source0-md5:	e7a19d0e7c3be748df4f1ed59cdefa16
 Patch0:		%{name}-no_GConf2_macros.patch
 URL:		http://www.gnumeric.org/
 BuildRequires:	GConf2-devel >= 2.14.0
@@ -206,9 +206,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}-1/gsf-win32
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/gsf/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/gsf/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/gsf/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/gsf/*.py
+
+%if %{without bonobo} && %{without gnomevfs}
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/libgsf-1/gsf-gnome
+%endif
 
 %find_lang %{name}
 
@@ -257,7 +260,7 @@
 %{_gtkdocdir}/gsf
 %endif
 
-%if %{with gnome}
+%if %{with bonobo} || %{with gnomevfs}
 %files gnome
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgsf-gnome-1.so.*.*.*
@@ -265,7 +268,7 @@
 
 %files gnome-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgsf-gnome-?.so
+%attr(755,root,root) %{_libdir}/libgsf-gnome-1.so
 %{_libdir}/libgsf-gnome-1.la
 %{_includedir}/libgsf-1/gsf-gnome
 %{_pkgconfigdir}/libgsf-gnome-1.pc
@@ -275,13 +278,13 @@
 %defattr(644,root,root,755)
 %{_libdir}/libgsf-gnome-1.a
 %endif
+%endif
 
 %files -n gsf-office-thumbnailer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gsf-office-thumbnailer
 %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
 %{_mandir}/man1/gsf-office-thumbnailer.1*
-%endif
 
 %files -n python-gsf
 %defattr(644,root,root,755)
@@ -290,7 +293,7 @@
 %dir %{py_sitescriptdir}/gsf
 %{py_sitescriptdir}/gsf/*.py[co]
 
-%if %{with gnome}
+%if %{with bonobo} || %{with gnomevfs}
 %files -n python-gsf-gnome
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gsf/gnomemodule.so
@@ -302,6 +305,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2011/04/30 14:21:05  qboosh
+- updated to 1.14.20
+
 Revision 1.80  2010/10/02 20:40:21  megabajt
 - updated to 1.14.19
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgsf/libgsf.spec?r1=1.80&r2=1.81&f=u