packages: kdepim/kdepim.spec - move more korganizer files, package more fil...

glen glen at pld-linux.org
Thu Jul 15 10:46:08 CEST 2010


Author: glen                         Date: Thu Jul 15 08:46:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move more korganizer files, package more files, libkorg_stdprinting.so remove was mistake, put it back

---- Files affected:
packages/kdepim:
   kdepim.spec (1.308 -> 1.309) 

---- Diffs:

================================================================
Index: packages/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.308 packages/kdepim/kdepim.spec:1.309
--- packages/kdepim/kdepim.spec:1.308	Thu Jul 15 10:14:40 2010
+++ packages/kdepim/kdepim.spec	Thu Jul 15 10:46:02 2010
@@ -1,10 +1,8 @@
 # $Revision$, $Date$
 # TODO
-# - subpackages for akregator, korganizer(?)
+# - subpackages for akregator?
 # - unpackaged:
-#   /usr/bin/kabcdistlistupdater
 #   /usr/lib64/libknodecommon.so
-#   /usr/share/autostart/kabcdistlistupdater.desktop
 #
 # Conditional build:
 %bcond_without	apidocs			# do not prepare API documentation
@@ -24,7 +22,7 @@
 Summary(uk.UTF-8):	Персональный планувальник (PIM) для KDE
 Name:		kdepim
 Version:	3.5.10
-Release:	7.12
+Release:	7.13
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -642,7 +640,7 @@
 if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
 	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
 
-	%{__make} install \
+	%{__make} install -j1 \
 		DESTDIR=$RPM_BUILD_ROOT \
 		kde_htmldir=%{_kdedocdir}
 
@@ -659,6 +657,7 @@
 
 	# are there any apps that actually link to these?
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libkitchensync.so
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libknodecommon.so
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libqopensync.so
 
 	# unsupported
@@ -713,11 +712,11 @@
 %attr(755,root,root) %{_bindir}/kolabwizard
 %attr(755,root,root) %{_bindir}/scalixadmin
 %attr(755,root,root) %{_bindir}/scalixwizard
+%attr(755,root,root) %{_bindir}/kabcdistlistupdater
 %attr(755,root,root) %{_bindir}/kontact
 %attr(755,root,root) %{_bindir}/kxml_compiler
 %attr(755,root,root) %{_bindir}/networkstatustestservice
 %attr(755,root,root) %{_bindir}/sloxwizard
-
 %attr(755,root,root) %{_libdir}/kde3/conduit_memofile.so
 %attr(755,root,root) %{_libdir}/kde3/conduit_notepad.so
 %attr(755,root,root) %{_libdir}/kde3/kabc_groupdav.so
@@ -779,6 +778,7 @@
 %{_datadir}/apps/kontact
 %{_datadir}/apps/kontactsummary
 %{_datadir}/apps/kdepim
+%{_datadir}/autostart/kabcdistlistupdater.desktop
 %{_datadir}/config.kcfg/akregator.kcfg
 %{_datadir}/config.kcfg/custommimeheader.kcfg
 %{_datadir}/config.kcfg/customtemplates_kfg.kcfg
@@ -900,6 +900,7 @@
 %{_libdir}/libkorganizer.so
 %{_libdir}/libkorganizer_eventviewer.so
 %{_libdir}/libkorganizer_calendar.so
+%{_libdir}/libkorg_stdprinting.so
 %{_libdir}/libkpgp.so
 %{_libdir}/libkpilot.so
 %{_libdir}/libkpimexchange.so
@@ -1128,6 +1129,12 @@
 %attr(755,root,root) %{_bindir}/korgac
 %attr(755,root,root) %{_bindir}/korganizer*
 %attr(755,root,root) %{_bindir}/ical2vcal
+%attr(755,root,root) %{_libdir}/libkorganizer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkorganizer.so.1
+%attr(755,root,root) %{_libdir}/libkorganizer_calendar.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkorganizer_calendar.so.1
+%attr(755,root,root) %{_libdir}/libkorganizer_eventviewer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkorganizer_eventviewer.so.1
 %attr(755,root,root) %{_libdir}/kde3/kcm_korganizer.so
 %attr(755,root,root) %{_libdir}/kde3/libkorg_*.so
 %attr(755,root,root) %{_libdir}/kde3/libkorganizerpart.so
@@ -1273,12 +1280,6 @@
 %attr(755,root,root) %ghost %{_libdir}/libkontact.so.1
 %attr(755,root,root) %{_libdir}/libkorg_stdprinting.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkorg_stdprinting.so.1
-%attr(755,root,root) %{_libdir}/libkorganizer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkorganizer.so.1
-%attr(755,root,root) %{_libdir}/libkorganizer_calendar.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkorganizer_calendar.so.1
-%attr(755,root,root) %{_libdir}/libkorganizer_eventviewer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkorganizer_eventviewer.so.1
 %attr(755,root,root) %{_libdir}/libkpgp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkpgp.so.2
 %attr(755,root,root) %{_libdir}/libkpilot.so.*.*.*
@@ -1309,6 +1310,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.309  2010/07/15 08:46:02  glen
+- move more korganizer files, package more files, libkorg_stdprinting.so remove was mistake, put it back
+
 Revision 1.308  2010/07/15 08:14:40  glen
 - libkorg_stdprinting.so drop from -devel, already in -libs
 
@@ -1737,7 +1741,7 @@
 - 3.4.89
 
 Revision 1.177  2005/04/26 06:26:08  arekm
-i18n rel2; pim rel 3
+- i18n rel2; pim rel 3
 
 Revision 1.176  2005/04/25 18:00:35  arekm
 - alpha build fix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.308&r2=1.309&f=u



More information about the pld-cvs-commit mailing list