packages: libpst/libpst.spec - up to 0.6.48, static_libs bcond

[glen]

Author: glen                         Date: Fri Sep  3 09:28:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.48, static_libs bcond

---- Files affected:
packages/libpst:
   libpst.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/libpst/libpst.spec
diff -u packages/libpst/libpst.spec:1.15 packages/libpst/libpst.spec:1.16
--- packages/libpst/libpst.spec:1.15	Sun Aug 29 18:51:15 2010
+++ packages/libpst/libpst.spec	Fri Sep  3 11:28:37 2010
@@ -1,13 +1,17 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+
 Summary:	Library for reading .pst files
 Summary(pl.UTF-8):	Biblioteka do czytania plików .pst
 Name:		libpst
-Version:	0.6.47
+Version:	0.6.48
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.five-ten-sg.com/libpst/packages/%{name}-%{version}.tar.gz
-# Source0-md5:	72e49f127ca1fff888d5a262e7a60d4e
+# Source0-md5:	cb121951c21bc1c76b652e0f63c5f150
 Patch0:		%{name}-m4.patch
 URL:		http://www.five-ten-sg.com/libpst/
 BuildRequires:	ImageMagick
@@ -88,6 +92,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	%{!?with_static_libs:--disable-static} \
 	--enable-dii \
 	--enable-libpst-shared
 
@@ -100,7 +105,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install python/.libs/_libpst.so $RPM_BUILD_ROOT%{py_sitedir}
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/_libpst.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,9 +126,11 @@
 %{_includedir}/libpst-4
 %{_pkgconfigdir}/libpst.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpst.a
+%endif
 
 %files tools
 %defattr(644,root,root,755)
@@ -147,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/09/03 09:28:37  glen
+- up to 0.6.48, static_libs bcond
+
 Revision 1.15  2010/08/29 16:51:15  glen
 - note about what pst file is for
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpst/libpst.spec?r1=1.15&r2=1.16&f=u