Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit kdepimlibs4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 03 Jun 2007 21:37:36 +0200
- Message-id: <20070603193736.99A5967818F@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Sun Jun 3 21:37:36 CEST 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-05-28 19:41:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-06-01 13:32:44.114692000 +0200
@@ -1,0 +2,10 @@
+Fri Jun 1 13:31:58 CEST 2007 - coolo@xxxxxxx
+
+- simplify spec file by using macros from kde4-filesystem
+
+-------------------------------------------------------------------
+Wed May 30 18:26:00 CEST 2007 - coolo@xxxxxxx
+
+- fix build after kdelibs changes
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.T27441/_old 2007-06-03 21:37:19.000000000 +0200
+++ /var/tmp/diff_new_pack.T27441/_new 2007-06-03 21:37:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.90.1.svn668118)
+# spec file for package kdepimlibs4 (Version 3.90.1.svn670093)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,12 +15,10 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
URL: http://www.kde.org
-Version: 3.90.1.svn668118
+Version: 3.90.1.svn670093
Release: 1
Source0: kdepimlibs.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: libkdepimlibs4
-%define prefix /usr
%description
This package contains the basic packages for KDE PIM applications.
@@ -35,18 +33,13 @@
%setup -q -n kdepimlibs
%build
-# export CFLAGS="$RPM_OPT_FLAGS"
-# export CXXFLAGS="$CFLAGS"
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=release \
- -DLIB_INSTALL_DIR=%{_libdir} -DLIB_SUFFIX=$(echo %_lib | cut -b -f3-) ..
- make %{?jobs:-j %jobs} VERBOSE=1
+ %cmake_kde4 -d build
+ %make_jobs
%install
cd build
- make install \
- DESTDIR="$RPM_BUILD_ROOT"
+ %makeinstall
+ %kde_post_install
%post -p /sbin/ldconfig
@@ -94,7 +87,7 @@
%package -n libkdepimlibs4-devel
Group: System/GUI/KDE
Summary: KDE PIM Libraries: Build Environment
-Requires: kdepimlibs4 = %version libkde4-devel cyrus-sasl-devel openldap2-devel
+Requires: kdepimlibs4 = %version libkde4-devel cyrus-sasl-devel openldap2-devel boost-devel
Requires: libkdepimlibs4 = %version
%description -n libkdepimlibs4-devel
@@ -112,7 +105,8 @@
%defattr(-,root,root)
%doc COPYING COPYING.BSD COPYING.LIB
/usr/include/*
-/usr/share/apps/cmake
+
+%_kde_share_dir/apps/cmake
/usr/%_lib/libkabc.so
/usr/%_lib/libkabc_file_core.so
/usr/%_lib/libkcal.so
@@ -130,19 +124,26 @@
%files
%defattr(-,root,root)
%doc COPYING COPYING.BSD COPYING.LIB
-%exclude /usr/lib/debug
-%exclude /usr/src
-%exclude /usr/share/apps/cmake
+%exclude %_kde_share_dir/apps/cmake
/usr/%_lib/kde4
-/usr/share/apps
+
+%_kde_share_dir/apps
/usr/share/autostart
/usr/share/dbus-1
-/usr/share/kde4/services
-/usr/share/kde4/servicetypes
-/usr/share/config.kcfg/pimemoticons.kcfg
-/usr/share/config.kcfg/mailtransport.kcfg
+
+%_kde_share_dir/services
+
+%_kde_share_dir/servicetypes
+
+%_kde_share_dir/config.kcfg/pimemoticons.kcfg
+
+%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Fri Jun 01 2007 - coolo@xxxxxxx
+- simplify spec file by using macros from kde4-filesystem
+* Wed May 30 2007 - coolo@xxxxxxx
+- fix build after kdelibs changes
* Mon May 28 2007 - dmueller@xxxxxxx
- update to 3.90.1.svn668118
* Mon May 07 2007 - stbinner@xxxxxxx
++++++ kdepimlibs.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/doc/api/Doxyfile.local new/kdepimlibs/doc/api/Doxyfile.local
--- old/kdepimlibs/doc/api/Doxyfile.local 2006-11-21 18:09:12.000000000 +0100
+++ new/kdepimlibs/doc/api/Doxyfile.local 2007-05-29 19:54:35.000000000 +0200
@@ -11,14 +11,22 @@
PREDEFINED = KCAL_EXPORT="" \
KTNEF_EXPORT="" \
KABC_EXPORT="" \
+ KABC_FILE_CORE_EXPORT="" \
+ KABC_DIR_EXPORT="" \
+ KABC_NET_EXPORT="" \
KRESOURCES_EXPORT="" \
SYNDICATION_EXPORT="" \
+ KIMAP_EXPORT="" \
+ KMIME_EXPORT="" \
+ KPIMUTILS_EXPORT="" \
+ KBLOG_EXPORT="" \
+ KLDAP_EXPORT="" \
+ KABC_LDAPKIO_EXPORT="" \
+ MAILTRANSPORT_EXPORT="" \
KDE_DEPRECATED="" \
Q_OS_UNIX="" \
Q_SLOTS="slots" \
Q_SIGNALS="signals" \
- EMAILFUNCTIONS_EXPORT="" \
- KMIME_EXPORT="" \
kmime_mk_trivial_ctor="" \
kmime_mk_trivial_ctor_with_name=""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/formats/binary.desktop new/kdepimlibs/kabc/formats/binary.desktop
--- old/kdepimlibs/kabc/formats/binary.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kabc/formats/binary.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -1,11 +1,13 @@
[Misc]
Encoding=UTF-8
Name=Binary
+Name[be]=Двойкавы
Name[el]=Δυαδικό
Name[ja]=バイナリ
Name[pa]=ਬਾਈਨਰੀ
Name[sv]=Binär
Name[x-test]=xxBinaryxx
+Name[zh_TW]=二進位
[Plugin]
Type=binary
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/kab2kabc.desktop new/kdepimlibs/kabc/kab2kabc.desktop
--- old/kdepimlibs/kabc/kab2kabc.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kabc/kab2kabc.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -11,6 +11,7 @@
Comment[ja]=libkab から libkabc への変換ツール
Comment[sv]=Konverteringsverktyg mellan libkab och libkabc
Comment[x-test]=xxlibkab to libkabc conversion tool.xx
+Comment[zh_TW]=libkab 到 libkabc 轉換工具
Terminal=false
NoDisplay=true
X-KDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/kabc_manager.desktop new/kdepimlibs/kabc/kabc_manager.desktop
--- old/kdepimlibs/kabc/kabc_manager.desktop 2007-04-24 07:32:12.000000000 +0200
+++ new/kdepimlibs/kabc/kabc_manager.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -9,6 +9,7 @@
Name[pa]=ਸੰਪਰਕ
Name[sv]=Kontakter
Name[x-test]=xxContactsxx
+Name[zh_TW]=聯絡人
Type=Service
ServiceTypes=KResources/Manager
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/plugins/dir/dir.desktop new/kdepimlibs/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs/kabc/plugins/dir/dir.desktop 2007-04-24 07:32:12.000000000 +0200
+++ new/kdepimlibs/kabc/plugins/dir/dir.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -8,6 +8,7 @@
Name[pa]=ਡਾਇਰੈਕਟਰੀ
Name[sv]=Katalog
Name[x-test]=xxDirectoryxx
+Name[zh_TW]=目錄
X-KDE-Library=kabc_directory
Type=Service
ServiceTypes=KResources/Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/plugins/file/file.desktop new/kdepimlibs/kabc/plugins/file/file.desktop
--- old/kdepimlibs/kabc/plugins/file/file.desktop 2007-04-24 07:32:12.000000000 +0200
+++ new/kdepimlibs/kabc/plugins/file/file.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -8,6 +8,7 @@
Name[pa]=ਫਾਇਲ
Name[sv]=Fil
Name[x-test]=xxFilexx
+Name[zh_TW]=檔案
X-KDE-Library=kabc_file
Type=Service
ServiceTypes=KResources/Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kabc/plugins/net/net.desktop new/kdepimlibs/kabc/plugins/net/net.desktop
--- old/kdepimlibs/kabc/plugins/net/net.desktop 2007-04-24 07:32:12.000000000 +0200
+++ new/kdepimlibs/kabc/plugins/net/net.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -8,6 +8,7 @@
Name[pa]=ਨੈੱਟਵਰ
Name[sv]=Nätverk
Name[x-test]=xxNetworkxx
+Name[zh_TW]=網路
X-KDE-Library=kabc_net
Type=Service
ServiceTypes=KResources/Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kcal/kcal_manager.desktop new/kdepimlibs/kcal/kcal_manager.desktop
--- old/kdepimlibs/kcal/kcal_manager.desktop 2007-04-24 07:32:12.000000000 +0200
+++ new/kdepimlibs/kcal/kcal_manager.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -10,6 +10,7 @@
Name[pa]=ਕੈਲੰਡਰ
Name[sv]=Kalender
Name[x-test]=xxCalendarxx
+Name[zh_TW]=行事曆
Type=Service
ServiceTypes=KResources/Manager
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kcal/local.desktop new/kdepimlibs/kcal/local.desktop
--- old/kdepimlibs/kcal/local.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kcal/local.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -7,6 +7,7 @@
Name[pa]=ਲੋਕਲ ਫਾਇਲ 'ਚ ਕੈਲੰਡਰ
Name[sv]=Kalender i lokal fil
Name[x-test]=xxCalendar in Local Filexx
+Name[zh_TW]=本地端檔案裡的行事曆
X-KDE-Library=kcal_local
Type=Service
ServiceTypes=KResources/Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kcal/localdir.desktop new/kdepimlibs/kcal/localdir.desktop
--- old/kdepimlibs/kcal/localdir.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kcal/localdir.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -7,6 +7,7 @@
Name[pa]=ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ 'ਚ ਕੈਲੰਡਰ
Name[sv]=Kalender i lokal katalog
Name[x-test]=xxCalendar in Local Directoryxx
+Name[zh_TW]=本地端目錄裡的行事曆
X-KDE-Library=kcal_localdir
Type=Service
ServiceTypes=KResources/Plugin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kldap/CMakeLists.txt new/kdepimlibs/kldap/CMakeLists.txt
--- old/kdepimlibs/kldap/CMakeLists.txt 2007-05-24 17:26:03.000000000 +0200
+++ new/kdepimlibs/kldap/CMakeLists.txt 2007-05-29 19:01:39.000000000 +0200
@@ -1,6 +1,5 @@
project(kldap)
-
-
+include(CheckFunctionExists)
macro_optional_find_package(Ldap)
macro_log_feature(LDAP_FOUND "OpenLDAP" "LDAP (Lightweight Directory Access Protocol) libraries" "http://www.openldap.org" FALSE "" "Needed to provide LDAP functionality in KDE" ;)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kresources/kresources.desktop new/kdepimlibs/kresources/kresources.desktop
--- old/kdepimlibs/kresources/kresources.desktop 2007-04-29 07:01:37.000000000 +0200
+++ new/kdepimlibs/kresources/kresources.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -15,12 +15,14 @@
Name[pa]=KDE ਸਰੋਤ
Name[sv]=KDE-resurser
Name[x-test]=xxKDE Resourcesxx
+Name[zh_TW]=KDE 資源
Comment=Configure KDE Resources
Comment[el]=Ρύθμιση πόρων του KDE
Comment[ja]=KDE リソースの設定
Comment[sv]=Anpassa KDE-resurser
Comment[x-test]=xxConfigure KDE Resourcesxx
+Comment[zh_TW]=設定 KDE 資源
Keywords=resources,konnector resource,contact resource,calendar resource,notes resource,alarm resource,imap
Keywords[el]=πόροι,πόροι του konnector,πόρος επαφής,πόρος ημερολογίου,πόρος σημειώσεων,πόρος ειδοποίησης,imap
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kresources/kresources_manager.desktop new/kdepimlibs/kresources/kresources_manager.desktop
--- old/kdepimlibs/kresources/kresources_manager.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kresources/kresources_manager.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -8,6 +8,7 @@
Comment[pa]=ਕੇ-ਰੀਸੋਰਸ ਮੈਨੇਜਰ
Comment[sv]=Resurshantering
Comment[x-test]=xxKResource Managerxx
+Comment[zh_TW]=KResource 管理者
[PropertyDef::X-KDE-ResourceFamily]
Type=QString
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/kresources/kresources_plugin.desktop new/kdepimlibs/kresources/kresources_plugin.desktop
--- old/kdepimlibs/kresources/kresources_plugin.desktop 2007-03-31 23:03:34.000000000 +0200
+++ new/kdepimlibs/kresources/kresources_plugin.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -7,6 +7,7 @@
Comment[ja]=K リソース・フレームワーク・プラグイン
Comment[sv]=Insticksprogram för resursramverk
Comment[x-test]=xxKResource Framework Pluginxx
+Comment[zh_TW]=KResource 框架外掛程式
[PropertyDef::X-KDE-ResourceFamily]
Type=QString
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/mailtransport/kcm_mailtransport.desktop new/kdepimlibs/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs/mailtransport/kcm_mailtransport.desktop 2007-04-30 07:07:48.000000000 +0200
+++ new/kdepimlibs/mailtransport/kcm_mailtransport.desktop 2007-05-31 07:32:16.000000000 +0200
@@ -15,3 +15,4 @@
Name=Mail Transport
Name[el]=Κύριος μεταφορέας
Name[x-test]=xxMail Transportxx
+Name[zh_TW]=Mail 傳送
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs/mailtransport/socket.cpp new/kdepimlibs/mailtransport/socket.cpp
--- old/kdepimlibs/mailtransport/socket.cpp 2007-05-13 22:19:31.000000000 +0200
+++ new/kdepimlibs/mailtransport/socket.cpp 2007-05-28 22:49:10.000000000 +0200
@@ -154,7 +154,7 @@
( KSocketFactory::connectToHost( d->protocol, d->server, d->port, this
) );
- d->socket->setProtocol( QSslSocket::AnyProtocol );
+ d->socket->setProtocol( QSsl::AnyProtocol );
connect( d->socket, SIGNAL( stateChanged( QAbstractSocket::SocketState ) ),
SLOT( slotStateChanged( QAbstractSocket::SocketState ) ) );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |