Author: glen Date: Mon Feb 15 18:30:33 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- kitchensync to subpackage
- indexlib bcond
- export pkgconfig path for kitcheksync lib deps finding
- rm makeinstall.stamp on %build completion
---- Files affected:
packages/kdepim:
kdepim.spec (1.304 -> 1.305)
---- Diffs:
================================================================
Index: packages/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.304 packages/kdepim/kdepim.spec:1.305
--- packages/kdepim/kdepim.spec:1.304 Wed Jan 27 16:38:22 2010
+++ packages/kdepim/kdepim.spec Mon Feb 15 19:30:28 2010
@@ -10,6 +10,7 @@
%bcond_without apidocs # do not prepare API documentation
%bcond_without hidden_visibility # don't use gcc hidden visibility
%bcond_without kitchensync # build with kitchensync
+%bcond_without indexlib # disable full text indexing support
#
%define _state stable
%define _minlibsevr 9:%{version}
@@ -40,7 +41,7 @@
Patch8: %{name}-sparc64.patch
Patch9: %{name}-inotify.patch
Patch10: kde-am.patch
-Patch11: gcc44.patch
+Patch11: kdepim-3.5.10-gcc_4.4-2.patch
BuildRequires: autoconf
BuildRequires: autoconf
BuildRequires: automake
@@ -252,6 +253,18 @@
spędzony na różnych zajęciach. Jest przydatny przy obliczaniu godzin
do wystawiania rachunków wielu klientom.
+%package kitchensync
+Summary: kitchensync
+Summary(pl.UTF-8): kitchensync
+Group: X11/Applications
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description kitchensync
+kitchensync.
+
+%description kitchensync -l pl.UTF-8
+kitchensync.
+
%package kmail
Summary: KDE Mail client
Summary(pl.UTF-8): Program pocztowy KDE
@@ -568,12 +581,14 @@
%{__make} -f admin/Makefile.common cvs
fi
+export PKG_CONFIG_PATH=%{_libdir}/pkgconfig
+
%configure \
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
%{!?debug:--disable-rpath} \
--disable-final \
%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
- --enable-indexlib \
+ %{?with_indexlib:--enable-indexlib} \
%if "%{_lib}" == "lib64"
--enable-libsuffix=64 \
%endif
@@ -590,6 +605,8 @@
%{__make} -j1
%{?with_apidocs:%{__make} apidox}
+rm -f makeinstall.stamp
+
%install
if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
@@ -609,6 +626,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdepimwidgets.la
rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kpartsdesignerplugin.la
+ # are there any apps that actually link to these?
+ rm -f $RPM_BUILD_ROOT%{_libdir}/libkitchensync.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/libqopensync.so
+
# unsupported
rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
@@ -644,6 +665,9 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post kitchensync -p /sbin/ldconfig
+%postun kitchensync -p /sbin/ldconfig
+
%post knode -p /sbin/ldconfig
%postun knode -p /sbin/ldconfig
@@ -799,14 +823,6 @@
%{_iconsdir}/crystalsvg/22x22/actions/button_fewer.png
%{_iconsdir}/crystalsvg/22x22/actions/button_more.png
-%if %{with kitchensync}
-%attr(755,root,root) %{_bindir}/kitchensync
-%attr(755,root,root) %{_libdir}/kde3/libkitchensyncpart.so
-%{_datadir}/apps/kitchensync
-%{_desktopdir}/kde/kitchensync.desktop
-%{_iconsdir}/*/*/*/kitchensync.png
-%endif
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/indexlib-config
@@ -885,10 +901,6 @@
%{_libdir}/libktnef.so
%{_libdir}/libmimelib.so
%{_libdir}/libqgpgme.so
-%if %{with kitchensync}
-%{_libdir}/libkitchensync.so
-%{_libdir}/libqopensync.so
-%endif
%{_libdir}/*.la
@@ -977,6 +989,19 @@
%{_desktopdir}/kde/karm.desktop
%{_iconsdir}/*/*/*/karm.png
+%if %{with kitchensync}
+%files kitchensync
+%attr(755,root,root) %{_bindir}/kitchensync
+%attr(755,root,root) %{_libdir}/libkitchensync.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkitchensync.so.0
+%attr(755,root,root) %{_libdir}/libqopensync.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqopensync.so.0
+%attr(755,root,root) %{_libdir}/kde3/libkitchensyncpart.so
+%{_datadir}/apps/kitchensync
+%{_desktopdir}/kde/kitchensync.desktop
+%{_iconsdir}/*/*/*/kitchensync.png
+%endif
+
%files kmail -f kmail.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kmail
@@ -1044,6 +1069,7 @@
%{_desktopdir}/kde/ktnef.desktop
%{_iconsdir}/hicolor/*/apps/ktnef.png
+
%files knode -f knode.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/knode
@@ -1244,19 +1270,18 @@
%{_datadir}/apps/libkdepim
%{_datadir}/apps/libkholidays
-%if %{with kitchensync}
-%attr(755,root,root) %{_libdir}/libkitchensync.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkitchensync.so.0
-%attr(755,root,root) %{_libdir}/libqopensync.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqopensync.so.0
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.305 2010/02/15 18:30:28 glen
+- kitchensync to subpackage
+- indexlib bcond
+- export pkgconfig path for kitcheksync lib deps finding
+- rm makeinstall.stamp on %build completion
+
Revision 1.304 2010/01/27 15:38:22 glen
- kitchensync bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.304&r2=1.305&f=u