From af562714ae502b19b08abb5f0d2a25ae8022f454 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 24 2009 06:02:23 +0000 Subject: - 4.2.0 --- diff --git a/.cvsignore b/.cvsignore index bbda50f..bbf7276 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,5 @@ -kdepim-4.1.4.tar.bz2 +kdepim-4.1.2.tar.bz2 +kdepim-4.1.80.tar.bz2 +kdepim-4.1.85.tar.bz2 +kdepim-4.1.96.tar.bz2 +kdepim-4.2.0.tar.bz2 diff --git a/bug_169166_fix.patch b/bug_169166_fix.patch deleted file mode 100644 index e44eb2c..0000000 --- a/bug_169166_fix.patch +++ /dev/null @@ -1,188 +0,0 @@ -Index: accountmanager.h -=================================================================== ---- accountmanager.h (revision 914004) -+++ accountmanager.h (revision 914005) -@@ -80,13 +80,6 @@ - KMAccount *find( const uint id ) const; - - /** -- @return true if account with ID @p id is enabled. -- Accounts can be disabled by setting "enabled" flag to false -- in "Account #" groups of kmailrc. -- */ -- bool isEnabled( const uint id ) const { return !mDisabledAccounts.contains(id); } -- -- /** - Physically remove account. Also deletes the given account object ! - Returns false and does nothing if the account cannot be removed. - */ -@@ -163,6 +156,12 @@ - */ - uint createId(); - -+ /** -+ * Return a list of config group names of all config groups that store -+ * receiving accounts. -+ */ -+ QStringList accountGroups() const; -+ - AccountList mAcctList; - AccountList::Iterator mPtrListInterfaceProxyIterator; - AccountList mAcctChecking; -@@ -176,9 +175,6 @@ - - // if a summary should be displayed - bool mDisplaySummary; -- -- // IDs of disabled accounts, used in AccountManager::writeConfig() -- QSet mDisabledAccounts; - }; - - } // namespace KMail -Index: kmkernel.cpp -=================================================================== ---- kmkernel.cpp (revision 914004) -+++ kmkernel.cpp (revision 914005) -@@ -1480,8 +1480,7 @@ - { - KMFolderNode *node = *it; - if (node->isDir() || ((acct = the_acctMgr->find(node->id())) -- && ( acct->type() == KAccount::Imap )) -- || !the_acctMgr->isEnabled( node->id() )) -+ && ( acct->type() == KAccount::Imap ))) - { - ++it; - } else { -Index: accountmanager.cpp -=================================================================== ---- accountmanager.cpp (revision 914004) -+++ accountmanager.cpp (revision 914005) -@@ -39,88 +39,68 @@ - qDeleteAll(mAcctList); - } - -+//----------------------------------------------------------------------------- -+QStringList AccountManager::accountGroups() const -+{ -+ return KMKernel::config()->groupList().filter( QRegExp( "Account \\d+" ) ); -+} - - //----------------------------------------------------------------------------- - void AccountManager::writeConfig( bool withSync ) - { - KConfig* config = KMKernel::config(); - -- // Delete all accounts for groups in the config file not having -- // Enabled=false flag (accountGroups) -- // and replace them with account groups existing in memory (mAcctList) -- uint accounts = 0; -- QStringList accountGroups = -- config->groupList().filter( QRegExp( "Account \\d+" ) ); -- AccountList::ConstIterator enabledAccountIt = mAcctList.constBegin(); -- for ( QStringList::ConstIterator it = accountGroups.constBegin() ;; ) { -- QString groupName; -- bool appendNewGroup = false; -- if ( it == accountGroups.constEnd() ) { -- if ( enabledAccountIt == mAcctList.constEnd() ) -- break; -- appendNewGroup = true; -- groupName.sprintf( "Account %d", accounts + 1 ); -- } -- else { -- groupName = *it; -- ++it; -- } -+ QStringList accountGroupsInConfig = accountGroups(); -+ QStringList accountGroupsToKeep; - -- KConfigGroup group(config, groupName); -- uint id = group.readEntry( "Id", 0 ); -- if ( mDisabledAccounts.contains( id ) ) -- accounts++; // do not modify disabled account - skip -- else { -- if ( appendNewGroup ) { -- (*enabledAccountIt)->writeConfig( group ); -- ++enabledAccountIt; -- accounts++; -- } -- else // no such account on the list - disabled / enabled -- config->deleteGroup( groupName ); -- } -+ // Write all account config groups to the config file and remember -+ // the config group names -+ foreach( KMAccount *account, mAcctList ) { -+ uint accountId = account->id(); -+ QString groupName = QString( "Account %1" ).arg( accountId ); -+ accountGroupsToKeep += groupName; -+ KConfigGroup group( config, groupName ); -+ account->writeConfig( group ); - } - -- KConfigGroup group(config, "General"); -- group.writeEntry("accounts", accounts); -+ // Now, delete all config groups with "Account" in them which don't -+ // belong to the accounts we just saved (these are deleted accounts, then -+ // NOTE: This has to be done _after_ writing out the accounts, otherwise -+ // there is the risk of data loss, see bug 169166 -+ foreach( const QString &groupName, accountGroupsInConfig ) { -+ if ( !accountGroupsToKeep.contains( groupName ) ) -+ config->deleteGroup( groupName ); -+ } - -- if (withSync) config->sync(); -+ if ( withSync ) -+ config->sync(); - } - - - //----------------------------------------------------------------------------- - void AccountManager::readConfig(void) - { -- KConfig* config = KMKernel::config(); -- KMAccount* acct; -- QString acctName; -- QString groupName; -- int i, num; -- -+ // Delete all in-memory accounts - for ( AccountList::Iterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) - delete *it; - mAcctList.clear(); - -- KConfigGroup general(config, "General"); -- num = general.readEntry( "accounts", 0 ); -- -- for (i=1; i<=num; i++) -- { -- groupName.sprintf("Account %d", i); -- KConfigGroup group(config, groupName); -+ // Now loop over all account groups and load the accounts in them -+ KConfig* config = KMKernel::config(); -+ QStringList accountGroupNames = accountGroups(); -+ int accountNum = 1; -+ foreach( const QString &accountGroupName, accountGroupNames ) { -+ KConfigGroup group( config, accountGroupName ); - uint id = group.readEntry( "Id", 0 ); -- if ( !group.readEntry("Enabled", true) ) { -- mDisabledAccounts += id; -- continue; -- } -- - KAccount::Type acctType = KAccount::typeForName( group.readEntry( "Type" ) ); -- acctName = group.readEntry("Name"); -- if (acctName.isEmpty()) acctName = i18n("Account %1", i); -- acct = create(acctType, acctName, id); -- if (!acct) continue; -- add(acct); -- acct->readConfig(group); -+ QString accountName = group.readEntry( "Name" ); -+ if ( accountName.isEmpty() ) -+ accountName = i18n( "Account %1", accountNum++ ); -+ KMAccount *account = create( acctType, accountName, id ); -+ if ( !account ) -+ continue; -+ add( account ); -+ account->readConfig( group ); - } - } - diff --git a/kdepim-4.1.2-kabcdistlistupdater.patch b/kdepim-4.1.2-kabcdistlistupdater.patch deleted file mode 100644 index aa8e270..0000000 --- a/kdepim-4.1.2-kabcdistlistupdater.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Nur kdepim-4.1.2/kaddressbook/CMakeLists.txt kdepim-4.1.2-kabcdistlistupdater/kaddressbook/CMakeLists.txt ---- kdepim-4.1.2/kaddressbook/CMakeLists.txt 2008-08-28 10:07:44.000000000 +0200 -+++ kdepim-4.1.2-kabcdistlistupdater/kaddressbook/CMakeLists.txt 2008-10-14 23:23:30.000000000 +0200 -@@ -15,6 +15,7 @@ - add_subdirectory( pics ) - add_subdirectory( csv-templates ) - add_subdirectory( thumbnailcreator ) -+add_subdirectory( kabcdistlistupdater ) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/interfaces -diff -Nur kdepim-4.1.2/kaddressbook/kabcdistlistupdater/CMakeLists.txt kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/CMakeLists.txt ---- kdepim-4.1.2/kaddressbook/kabcdistlistupdater/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/CMakeLists.txt 2008-10-14 23:37:32.000000000 +0200 -@@ -0,0 +1,5 @@ -+set(kabcdistlistupdater_SRCS kabcdistlistupdater.cpp) -+kde4_add_executable(kabcdistlistupdater ${kabcdistlistupdater_SRCS}) -+target_link_libraries(kabcdistlistupdater ${KDE4_KDECORE_LIBS} kdepim) -+install(TARGETS kabcdistlistupdater ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(FILES kabcdistlistupdater.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -diff -Nur kdepim-4.1.2/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.cpp kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.cpp ---- kdepim-4.1.2/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.cpp 2008-10-15 00:15:08.000000000 +0200 -@@ -0,0 +1,95 @@ -+/* -+ This file is part of libkabc. -+ Copyright (c) 2008 Tobias Koenig -+ Copyright (c) 2008 Kevin Kofler -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. -+*/ -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+void convertDistributionLists() -+{ -+ KConfig cfg( KStandardDirs::locateLocal( "data", "kabc/distlists" ), KConfig::SimpleConfig ); -+ const QMap entryMap = cfg.entryMap( "DistributionLists" ); -+ -+ if ( entryMap.isEmpty() ) // nothing to convert -+ return; -+ -+ QMap::ConstIterator it; -+ for ( it = entryMap.begin(); it != entryMap.end(); ++it ) { -+ const QString listName = it.key(); -+ const QStringList entries = it.value().split( ',', QString::KeepEmptyParts ); -+ -+ KPIM::DistributionList distList; -+ distList.setUid( KRandom::randomString( 10 ) ); -+ distList.setName( listName ); -+ -+ if ( entries.count() > 1 ) { -+ for ( int i = 0; i < entries.count(); i += 2 ) { -+ const QString uid = entries[ i ]; -+ const QString preferredEMail = entries[ i + 1 ]; -+ -+ distList.insertEntry( uid, preferredEMail ); -+ } -+ } -+ -+ KABC::StdAddressBook::self()->insertAddressee( distList ); -+ } -+ -+ KABC::StdAddressBook::save(); -+} -+ -+int main( int argc, char **argv ) -+{ -+ KAboutData aboutData( "kabcdistlistupdater", QByteArray(), ki18n( "Converter tool for distribution lists" ), "0.1" ); -+ aboutData.addAuthor( ki18n( "Tobias Koenig" ), ki18n( "Author" ), "tokoe@kde.org" ); -+ aboutData.addAuthor( ki18n( "Kevin Kofler" ), ki18n( "Porter" ), "kevin.kofler@chello.at" ); -+ -+ KCmdLineArgs::init( argc, argv, &aboutData ); -+ KCmdLineOptions options; -+ options.add( "disable-autostart", ki18n( "Disable automatic startup on login" ) ); -+ KCmdLineArgs::addCmdLineOptions( options ); -+ -+ QCoreApplication app( KCmdLineArgs::qtArgc(), KCmdLineArgs::qtArgv() ); -+ -+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); -+ -+ if ( args->isSet( "disable-autostart" ) ) { -+ kDebug() << "Disable autostart." << endl; -+ -+ KSharedConfigPtr config = KGlobal::config(); -+ KConfigGroup group( config, "Startup" ); -+ group.writeEntry( "EnableAutostart", false ); -+ } -+ -+ convertDistributionLists(); -+} -+ -diff -Nur kdepim-4.1.2/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop ---- kdepim-4.1.2/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop 1970-01-01 01:00:00.000000000 +0100 -+++ kdepim-4.1.2-kabcdistlistupdater/kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop 2008-10-14 23:16:15.000000000 +0200 -@@ -0,0 +1,11 @@ -+# KDE Config File -+[Desktop Entry] -+Name=kabcdistlistupdater -+Exec=kabcdistlistupdater --disable-autostart -+Icon=misc -+Type=Application -+Comment=Tool to update the old distribution lists to the new ones. -+Terminal=false -+NoDisplay=true -+X-KDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true -+OnlyShowIn=KDE; diff --git a/kdepim-4.1.80-libqgpgme-link-fix.patch b/kdepim-4.1.80-libqgpgme-link-fix.patch new file mode 100644 index 0000000..3d66432 --- /dev/null +++ b/kdepim-4.1.80-libqgpgme-link-fix.patch @@ -0,0 +1,24 @@ +diff -Naur kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt +--- kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt 2008-11-04 18:12:56.000000000 +0100 ++++ kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt 2008-11-28 20:28:00.000000000 +0100 +@@ -21,7 +21,7 @@ + kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png") + + kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} ) +-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ) ++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARY} ${KDE4_KDEUI_LIBS} ) + + install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS}) + +diff -Naur kdepim-4.1.80/libkleo/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt +--- kdepim-4.1.80/libkleo/CMakeLists.txt 2008-11-04 18:12:56.000000000 +0100 ++++ kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt 2008-11-28 18:56:14.000000000 +0100 +@@ -108,7 +108,7 @@ + if(WIN32) + target_link_libraries(kleo ${kleo_LIB_LIBS} ${GPGME_VANILLA_LIBRARIES} ) + else(WIN32) +-target_link_libraries(kleo ${kleo_LIB_LIBS} ) ++target_link_libraries(kleo ${kleo_LIB_LIBS} ${KDE4_QGPGME_LIBRARY} ) + endif(WIN32) + set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) + install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kdepim.spec b/kdepim.spec index 5899b0d..77fb9c1 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -1,25 +1,20 @@ - %ifnarch s390 s390x -#define _with_pilot_link 1 +%define _with_pilot_link 1 %endif Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.1.4 -Release: 2%{?dist} +Version: 4.2.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 -Patch0: kdepim-4.1.2-kabcdistlistupdater.patch +Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -# http://websvn.kde.org/?view=rev&revision=914005 -Patch100: bug_169166_fix.patch - Provides: kdepim4 = %{version}-%{release} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} @@ -30,22 +25,20 @@ Requires(postun): xdg-utils BuildRequires: akonadi-devel BuildRequires: bison flex BuildRequires: boost-devel -BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: desktop-file-utils BuildRequires: gnokii-devel BuildRequires: gpgme-devel -BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: libassuan-devel BuildRequires: libXpm-devel libXScrnSaver-devel -BuildRequires: libical-devel # TODO: libmapi from http://www.openchange.org/ #BuildRequires: libmapi-devel -BuildRequires: libopensync-devel +# Not used, has broken deps to boot -- Rex +#BuildRequires: libopensync-devel BuildRequires: libxslt-devel BuildRequires: lockdev-devel -%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12} +%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40} BuildRequires: python-devel BuildRequires: soprano-devel BuildRequires: qca2-devel @@ -54,6 +47,7 @@ BuildRequires: zlib-devel BuildRequires: giflib-devel BuildRequires: openldap-devel BuildRequires: pcre-devel +BuildRequires: libical-devel ##Optional bits Requires(hint): pinentry-gui @@ -64,7 +58,7 @@ Requires(hint): spambayes %description %{summary}, including: -* akregator: feed aggregator +* akregator: feed aggregator * kmail: email client * knode: newsreader * knotes: sticky notes for the desktop @@ -73,7 +67,7 @@ Requires(hint): spambayes %{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices} %package devel -Summary: Development files for %{name} +Summary: Development files for %{name} Group: Development/Libraries Provides: kdepim4-devel = %{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} @@ -94,29 +88,23 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .libqgpgme-link-fix # upstream patches -pushd kmail -%patch100 -p0 -b .kde#169166 -popd - %build - mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} --debug-output .. +%{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 - %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # conflict with oxygen-icon-theme rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png @@ -158,6 +146,9 @@ rm -rf %{buildroot} %doc README README.Kolab %doc COPYING %{_kde4_bindir}/* +%if 0%{?_with_pilot_link:1} +%{_kde4_libdir}/libkpilot_*.so +%endif %{_kde4_libdir}/kde4/*.so %{_kde4_libdir}/strigi/*.so %{_kde4_datadir}/applications/kde4/* @@ -172,36 +163,54 @@ rm -rf %{buildroot} %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_docdir}/HTML/en/* +%{_mandir}/man1/kabcclient.1* %files libs %defattr(-,root,root,-) %{_kde4_libdir}/lib*.so.* -# unversioned library -#{_kde4_libdir}/libkpilot_conduit_base.so %files devel %defattr(-,root,root,-) %{_kde4_includedir}/* %{_kde4_libdir}/lib*.so +%if 0%{?_with_pilot_link:1} +%exclude %{_kde4_libdir}/libkpilot_*.so +%endif %{_kde4_libdir}/kde4/plugins/designer/* -#exclude %{_kde4_libdir}/libkpilot_conduit_base.so %changelog -* Wed Jan 21 2009 Rex Dieter - 4.2.0-1 +- 4.2.0 + +* Thu Jan 15 2009 Rex Dieter 4.1.96-3 +- move libkpilot_*.so -devel -> main pkg + +* Thu Jan 15 2009 Kevin Kofler 4.1.96-2 +- reenable BR pilot-link-devel, add missing BR libmal-devel (for KPilot) + +* Wed Jan 07 2009 Than Ngo 4.1.96-1 +- 4.2rc1 -* Fri Jan 09 2009 Kevin Kofler 4.1.4-1 -- 4.1.4 -- BR libical-devel +* Fri Dec 12 2008 Than Ngo 4.1.85-1 +- 4.2beta2 + +* Fri Nov 28 2008 Lorenzo Villani - 6:4.1.80-3 +- kdepim-4.1.80-libqgpgme-link-fix.patch + fix libqgpgme linking errors + +* Thu Nov 20 2008 Than Ngo 4.1.80-2 +- merged + +* Thu Nov 20 2008 Lorenzo Villani - 6:4.1.80-1 +- 4.1.80 +- BR cmake >= 2.6.2 +- make install/fast +- kdepim-4.1.2-kabcdistlistupdater.patch upstreamed * Wed Nov 12 2008 Than Ngo 4.1.3-1 - 4.1.3 -* Tue Nov 11 2008 Jaroslav Reznik 4.1.2-5 -- revert akregator systray show/hide backport (#471022) -- fix akregator crashes on startup (#469452) - * Sun Oct 26 2008 Kevin Kofler 4.1.2-4 - add missing BR soprano-devel @@ -269,7 +278,7 @@ rm -rf %{buildroot} - fix gnokii detection (thanks to Dirk Müller) * Wed Feb 27 2008 Rex Dieter 6:3.5.9-6 -- "Enterprise headers" makes impossible to select text in +- "Enterprise headers" makes impossible to select text in first paragraph of body (kde#151150) * Mon Feb 18 2008 Than Ngo 6:3.5.9-5 @@ -301,7 +310,7 @@ rm -rf %{buildroot} * Wed Dec 12 2007 Rex Dieter 6:3.5.8-12.20071204.ent - omit crystalsvg icons (f9+) -- kdepim_3.5.6.enterprise.0.20071204.744693 +- kdepim_3.5.6.enterprise.0.20071204.744693 * Thu Nov 29 2007 Rex Dieter 6:3.5.8-10.20071129.ent - kdepim-enterprise branch 20071129 snapshot, r742984 @@ -310,7 +319,7 @@ rm -rf %{buildroot} - omit "compacting mbox..." patch for now (doesn't apply) * Wed Nov 28 2007 Rex Dieter 6:3.5.8-8.20071127.ent -- include/reference kdepim-enterprise-svn_checkout.sh +- include/reference kdepim-enterprise-svn_checkout.sh * Mon Nov 27 2007 Rex Dieter 6:3.5.8-7.20071127.ent - kdepim-enterprise branch 20071127 snapshot, r742277 (rh#401391, kde#152553) @@ -353,7 +362,7 @@ rm -rf %{buildroot} * Mon Aug 20 2007 Rex Dieter - 6:3.5.7-6 - License: GPLv2 -- Provides: kdepim3(-devel) +- Provides: kdepim3(-devel) - (Build)Requires: kdelibs3(-devel) * Tue Jun 19 2007 Rex Dieter - 6:3.5.7-3 @@ -453,7 +462,7 @@ rm -rf %{buildroot} - apply upstream patches * Mon Jun 19 2006 Than Ngo 6:3.5.3-2 -- BR: cyrus-sasl-devel, #195500 +- BR: cyrus-sasl-devel, #195500 * Fri Jun 02 2006 Than Ngo 6:3.5.3-1 - update to 3.5.3 @@ -477,7 +486,7 @@ rm -rf %{buildroot} * Thu Feb 02 2006 Than Ngo 6:3.5.1-1 - update to 3.5.1 -- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream +- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream * Mon Dec 12 2005 Than Ngo 6:3.5.0-1 - apply patch to fix crash when applying pipe through filters @@ -526,7 +535,7 @@ rm -rf %{buildroot} - add missing kandy icons #141165 * Mon Mar 21 2005 Than Ngo 6:3.4.0-3 -- cleanup build dependencies #151673 +- cleanup build dependencies #151673 * Fri Mar 18 2005 Than Ngo 6:3.4.0-2 - fix broken dependencies on kdepim-devel #151508 @@ -581,7 +590,7 @@ rm -rf %{buildroot} * Tue Aug 10 2004 Than Ngo 3.3.0-0.1.rc1 - update to 3.3.0 rc1 -* Wed Aug 04 2004 Than Ngo 6:3.2.92-1 +* Wed Aug 04 2004 Than Ngo 6:3.2.92-1 - update to KDE 3.3 Beta 2 * Sat Jul 03 2004 Than Ngo 6:3.2.91-1 @@ -599,10 +608,10 @@ rm -rf %{buildroot} * Mon Mar 22 2004 Than Ngo 6:3.2.1-4 - fix conflict problem by update, #118709 -* Fri Mar 19 2004 Karsten Hopp 3.2.1-3 +* Fri Mar 19 2004 Karsten Hopp 3.2.1-3 - add Obsoletes: kmail -* Sun Mar 14 2004 Karsten Hopp 3.2.1-2 +* Sun Mar 14 2004 Karsten Hopp 3.2.1-2 - add Provide: kmail * Sun Mar 07 2004 Than Ngo 6:3.2.1-1 @@ -612,7 +621,7 @@ rm -rf %{buildroot} - rebuilt * Mon Mar 01 2004 Than Ngo 3.2.0-1.5 -- add Buildrequires on libart_lgpl-devel #115183 +- add Buildrequires on libart_lgpl-devel #115183 * Tue Feb 24 2004 Than Ngo 6:3.2.0-1.4 - some critical bugs in kmail, #116080 @@ -727,7 +736,7 @@ rm -rf %{buildroot} * Mon Aug 12 2002 Than Ngo 3.0.3-1 - 3.0.3 -- Fixed a bug in clock applet +- Fixed a bug in clock applet * Tue Aug 6 2002 Than Ngo 3.0.2-4 - build against pilot-link-0.11.2 @@ -940,7 +949,7 @@ rm -rf %{buildroot} - snapshot, includes kde 1.1.1 + fixes - kvt removed for security reasons. It is a steaming pile of... -* Mon Apr 19 1999 Preston Brown +* Mon Apr 19 1999 Preston Brown - last snapshot before release * Fri Apr 16 1999 Preston Brown diff --git a/sources b/sources index 0539a74..c44c0f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -297ffe93343bc0dd62c7d90feae0ee6c kdepim-4.1.4.tar.bz2 +a80631de21930b2544c86722138aaa6c kdepim-4.2.0.tar.bz2