Hello community,

here is the log from the commit of package kdepim4-runtime for openSUSE:Factory
checked in at Fri Jul 22 16:54:50 CEST 2011.



--------
--- KDE/kdepim4-runtime/kdepim4-runtime.changes 2011-04-21 22:21:57.000000000 
+0200
+++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes        
2011-07-21 15:03:28.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 21 13:03:12 UTC 2011 - [email protected]
+
+- Update to 4.6.95 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  4_4_BRANCH.diff
  kdepim-runtime-4.4.11.1.tar.bz2

New:
----
  akonadi.png
  kdepim-runtime-4.6.95.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.ryg7it/_old  2011-07-22 16:52:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ryg7it/_new  2011-07-22 16:52:31.000000000 +0200
@@ -18,108 +18,99 @@
 
 
 Name:           kdepim4-runtime
-BuildRequires:  cyrus-sasl-devel libqca2-devel
-BuildRequires:  boost-devel gpgme-devel libkdepimlibs4-devel
-BuildRequires:  libkde4-devel libsoprano-devel soprano-backend-redland
-BuildRequires:  fdupes libassuan-devel
+BuildRequires:  boost-devel
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  gpgme-devel
+BuildRequires:  libkde4-devel
+BuildRequires:  libkdepimlibs4-devel
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  libqca2-devel
+BuildRequires:  libsoprano-devel
+BuildRequires:  python-devel
+BuildRequires:  soprano-backend-redland
+%define with_kitchensync 0
+%define with_kpilot 1
+%define with_kmobiletools 0
+%define with_korn 0
+%define with_kcontactmanager 0
+%if %with_kitchensync
+BuildRequires:  libopensync-devel
+%endif
+Version:        4.6.95
+Release:        1
 License:        LGPLv2.1+
-Group:          System/GUI/KDE
 Summary:        Base package of kdepim
 Url:            http://www.kde.org
-Version:        4.4.11.1
-Release:        1
-Source0:        kdepim-runtime-%version.tar.bz2
-Patch:          4_4_BRANCH.diff
+Group:          System/GUI/KDE
+Source0:        kdepim-runtime-%{version}.tar.bz2
+Source1:        akonadi.png
+# PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch6:         disable-knut.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
-Requires(post):     shared-mime-info
-Requires(postun):   shared-mime-info
+BuildRequires:  fdupes
+BuildRequires:  libassuan-devel
+BuildRequires:  libmal1-devel
+BuildRequires:  libpisock-devel
+BuildRequires:  libqjson-devel
 Suggests:       libkdepim4
 Provides:       kde4-akonadi = 4.2.90
 Obsoletes:      kde4-akonadi <= 4.2.90
+Obsoletes:      kdepim4-runtime-devel < 4.5.81svn1202101
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%kde4_runtime_requires
 
 %description
 This package contains the Akonadi files of the kdepim module.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %prep
-%setup -q -n kdepim-runtime-%version
-%patch -p2
+%setup -q -n kdepim-runtime-%{version}
 %patch6
 
 %build
 %ifarch ppc64
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
   %cmake_kde4 -d build
   %make_jobs
 
 %install
   cd build
-  %makeinstall
+%makeinstall
   cd ..
   #remove menu entries of development tools
-  rm $RPM_BUILD_ROOT/usr/share/applications/kde4/akonadi*.desktop
+  mkdir -p %{buildroot}%{_datadir}/pixmaps
+  install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_datadir}/pixmaps/
+  %suse_update_desktop_file -u akonaditray           Network  Email
   %kde_post_install
-  %fdupes -s $RPM_BUILD_ROOT
+  %fdupes -s %{buildroot}
   %kde_post_install
+  rm %{buildroot}%_kde4_libdir/*.so
 
-%post
-/sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-
-%postun
-/sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %clean
-  rm -rf $RPM_BUILD_ROOT
+  rm -rf %{buildroot}
   rm -rf filelists
 
-%package devel
-License:        LGPLv2.1+
-Group:          System/GUI/KDE
-Summary:        KDE Personal Information Management Base Package: Build 
Environment
-Requires:       kdepim4-runtime = %version
-Provides:       kde4-akonadi-devel = 4.2.90
-Obsoletes:      kde4-akonadi-devel <= 4.2.90
-
-%description devel
-This packages contains development files of the kdepim-runtime module.
-
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
-
-%files devel 
-%defattr(-,root,root)
-%_kde4_libdir/*.so
-#/usr/include/kabc
-
 %files
 %defattr(-,root,root)
 %_kde4_bindir/*
 %_kde4_libdir/*.so.*
 %_kde4_modulesdir/*
-/usr/share/akonadi
-/usr/share/dbus-1/interfaces/*
+%{_datadir}/akonadi
+%{_datadir}/dbus-1/interfaces/*
 %_kde4_appsdir/akonadi
+%_kde4_appsdir/akonadi_maildispatcher_agent/
 %_kde4_sharedir/services
 %_kde4_configdir/*
 %_kde4_iconsdir/hicolor/64x64/apps/kolab.png
-/usr/share/mime/packages/kdepim-mime.xml
-/usr/share/autostart/kaddressbookmigrator.desktop
+%{_datadir}/mime/packages/*.xml
+%{_datadir}/autostart/kaddressbookmigrator.desktop
+%_kde4_applicationsdir/accountwizard.desktop
+%{_datadir}/pixmaps/akonadi.png
+%_kde4_iconsdir/hicolor/*/apps/ox.png
+%_kde4_applicationsdir/akonaditray.desktop
+%_kde4_servicetypesdir/davgroupwareprovider.desktop
 
 %changelog

++++++ disable-knut.diff ++++++
--- /var/tmp/diff_new_pack.ryg7it/_old  2011-07-22 16:52:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ryg7it/_new  2011-07-22 16:52:31.000000000 +0200
@@ -1,11 +1,11 @@
---- resources/CMakeLists.txt
-+++ resources/CMakeLists.txt
-@@ -30,7 +30,7 @@
- add_subdirectory( imap )
- add_subdirectory( kabc )
- add_subdirectory( kcal )
--add_subdirectory( knut )
-+#add_subdirectory( knut )
- add_subdirectory( kolabproxy )
- add_subdirectory( localbookmarks )
- add_subdirectory( maildir )
+--- resources/CMakeLists.txt.orig      2010-07-17 15:43:52.982914971 +0200
++++ resources/CMakeLists.txt   2010-07-17 15:43:58.658928661 +0200
+@@ -45,7 +45,7 @@
+
+ if (NOT WINCE)
+   add_subdirectory( birthdays )
+-  add_subdirectory( knut )
++  #add_subdirectory( knut )
+   add_subdirectory( mixedmaildir )
+   add_subdirectory( mailtransport_dummy )
+   add_subdirectory( mbox )

++++++ kdepim-runtime-4.4.11.1.tar.bz2 -> kdepim-runtime-4.6.95.tar.bz2 ++++++
++++ 125094 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to