Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit kdesdk4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 09 Aug 2007 17:00:39 +0200
  • Message-id: <20070809150040.2D80D67832C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdesdk4
checked in at Thu Aug 9 17:00:39 CEST 2007.

--------
--- KDE/kdesdk4/kdesdk4.changes 2007-08-07 09:01:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes        2007-08-09 10:19:54.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug  9 10:19:17 CEST 2007 - stbinner@xxxxxxx
+
+- update to 3.92.0.svn697375
+- fix file conflict
+
+-------------------------------------------------------------------

Old:
----
  r696951.diff

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

Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.g13064/_old  2007-08-09 16:56:52.000000000 +0200
+++ /var/tmp/diff_new_pack.g13064/_new  2007-08-09 16:56:52.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package kdesdk4 (Version 3.92.0)
+# spec file for package kdesdk4 (Version 3.92.0.svn697375)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -13,16 +13,15 @@
 BuildRequires:  db-devel flex kdebase4-devel kdepim4 subversion-devel
 License:        GPL v2 or later
 Group:          System/GUI/KDE
-Summary:        kdesdk package
+Summary:        kdesdk Package
 URL:            http://www.kde.org/
-Version:        3.92.0
-Release:        9
+Version:        3.92.0.svn697375
+Release:        1
 Source0:        kdesdk.tar.bz2
 Source1:        _upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       kdebase4-runtime
 Patch2:         desktop-files.diff
-Patch3:         r696951.diff
 Suggests: kdesdk4-scripts
 Suggests: kde4-cervisia
 Suggests: kde4-kbabel
@@ -38,8 +37,7 @@
 Suggests: kde4-umbrello
 
 %description
-This package suggests the packages which are built from the kdesdk
-module.
+This package suggests the packages, built from the kdesdk module.
 
 
 
@@ -48,9 +46,8 @@
     The KDE Team <kde@xxxxxxx>
 
 %prep
-%setup -q -n kdesdk-3.92.0
+%setup -q -n kdesdk
 %patch2
-%patch3
 
 %build
   %cmake_kde4 -d build
@@ -70,7 +67,7 @@
   %suse_update_desktop_file    kate           TextEditor
   %suse_update_desktop_file    kapptemplate
   mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
-  mv $RPM_BUILD_ROOT/usr/man/man1/cervisia.1 $RPM_BUILD_ROOT/usr/share/man/man1/cervisia.1
+  rm $RPM_BUILD_ROOT/usr/man/man1/cervisia.1
   %kde_post_install
 
 %post -p /sbin/ldconfig
@@ -188,7 +185,6 @@
 /usr/bin/cvsaskpass
 /usr/%_lib/kde4/libcervisiapart.so
 /usr/%_lib/libkdeinit4_cervisia.so
-/usr/share/man/man1/cervisia.1.gz
 /usr/share/applications/kde4/cervisia.desktop
 
 %_kde_share_dir/apps/cervisia
@@ -772,6 +768,9 @@
 %doc %lang(en) /usr/share/doc/HTML/en/kapptemplate
 
 %changelog
+* Thu Aug 09 2007 - stbinner@xxxxxxx
+- update to 3.92.0.svn697375
+- fix file conflict
 * Tue Aug 07 2007 - stbinner@xxxxxxx
 - fix build after strigi update
 * Sun Jul 29 2007 - stbinner@xxxxxxx

++++++ kdesdk.tar.bz2 ++++++
++++ 11203 lines of diff (skipped)



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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread