Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit kdeartwork4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 15 Aug 2007 20:25:29 +0200
  • Message-id: <20070815182530.00284678180@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdeartwork4
checked in at Wed Aug 15 20:25:29 CEST 2007.

--------
--- KDE/kdeartwork4/kdeartwork4.changes 2007-08-09 10:08:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeartwork4/kdeartwork4.changes        2007-08-15 10:02:47.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 15 10:02:44 CEST 2007 - stbinner@xxxxxxx
+
+- fix more file conflicts
+
+-------------------------------------------------------------------
kdeartwork4-noarch.changes: same change

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

Other differences:
------------------
++++++ kdeartwork4-noarch.spec ++++++
--- /var/tmp/diff_new_pack.U15965/_old  2007-08-15 20:24:51.000000000 +0200
+++ /var/tmp/diff_new_pack.U15965/_new  2007-08-15 20:24:51.000000000 +0200
@@ -14,12 +14,12 @@
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
-License:        No license agreement found in package, this package contains only pictures, sounds and icons, but no code. I can not define any license. This package will be part of the official KDE 2.2 release.
+License:        this package contains only pictures, sounds and icons, but no code. I can not define any license. This package will be part of the official KDE 2.2 release.
 Group:          System/GUI/KDE
 Summary:        kdeartwork base package
 URL:            http://www.kde.org
 Version:        3.92.0
-Release:        2
+Release:        3
 Source0:        kdeartwork.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -432,6 +432,11 @@
 rm $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/apps/systemtray.png
 rm $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/devices/laptop.png
 rm $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/64x64/mimetypes/kig_doc.png
+rm $RPM_BUILD_ROOT/usr/share/icons/crystalsvg/16x16/apps/ksysguardd.png
+rm $RPM_BUILD_ROOT/usr/share/icons/Locolor/16x16/apps/kbabel.png
+rm $RPM_BUILD_ROOT/usr/share/icons/Locolor/32x32/apps/kbabel.png
+rm $RPM_BUILD_ROOT/usr/share/icons/Locolor/16x16/apps/ktimemon.png
+rm $RPM_BUILD_ROOT/usr/share/icons/Locolor/32x32/apps/ktimemon.png
   %if %suse_version > 1020
   %fdupes -s $RPM_BUILD_ROOT
   %endif
@@ -535,6 +540,8 @@
 /usr/share/wallpapers
 
 %changelog
+* Wed Aug 15 2007 - stbinner@xxxxxxx
+- fix more file conflicts
 * Thu Aug 09 2007 - stbinner@xxxxxxx
 - update to 3.92.0.svn697375
 - fix file conflicts

++++++ kdeartwork4.spec ++++++
--- /var/tmp/diff_new_pack.U15965/_old  2007-08-15 20:24:51.000000000 +0200
+++ /var/tmp/diff_new_pack.U15965/_new  2007-08-15 20:24:51.000000000 +0200
@@ -11,12 +11,12 @@
 
 Name:           kdeartwork4
 BuildRequires:  kdebase4-devel xscreensaver
-License:        No license agreement found in package, this package contains only pictures, sounds and icons, but no code. I can not define any license. This package will be part of the official KDE 2.2 release.
+License:        this package contains only pictures, sounds and icons, but no code. I can not define any license. This package will be part of the official KDE 2.2 release.
 Group:          System/GUI/KDE
 Summary:        kdeartwork base package
 URL:            http://www.kde.org
 Version:        3.92.0.svn697375
-Release:        1
+Release:        7
 Source0:        kdeartwork.tar.bz2
 Source1:        _upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -148,6 +148,8 @@
 %_kde_share_dir/apps/kstyle/themes/phase.themerc
 
 %changelog
+* Wed Aug 15 2007 - stbinner@xxxxxxx
+- fix more file conflicts
 * Thu Aug 09 2007 - stbinner@xxxxxxx
 - update to 3.92.0.svn697375
 - fix file conflicts




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



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