openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package Kooldock

--- kooldock-0.4.7-bufferoverflow.patch.orig
+++ kooldock-0.4.7-bufferoverflow.patch
@@ -0,0 +1,11 @@
+--- src/main.cpp~	2009-03-12 17:36:26.000000000 +0100
++++ src/main.cpp	2009-03-12 17:36:26.000000000 +0100
+@@ -38,7 +38,7 @@
+    {
+       char cmd[1024];
+       fprintf(stderr, "kooldock: crashHandler called\n");
+-      snprintf(cmd, 1025, "%s &", argv0.ascii());
++      snprintf(cmd, sizeof cmd, "%s &", argv0.ascii());
+       system(cmd); // try to restart according to argv[0]
+    }
+ }
--- kooldock-0.4.7-gcc43.patch.orig
+++ kooldock-0.4.7-gcc43.patch
@@ -0,0 +1,10 @@
+--- src/xosd.cpp.orig	2009-03-12 16:56:52.000000000 +0100
++++ src/xosd.cpp	2009-03-12 16:57:12.000000000 +0100
+@@ -1,5 +1,7 @@
+ #include "xosd.h"
+ 
++#include <cstdlib>
++
+ #include <qpainter.h>
+ #include <qbitmap.h>
+ #include <qstring.h>
--- kooldock.spec.orig
+++ kooldock.spec
@@ -1,3 +1,19 @@
+#
+# spec file for package kooldock (Version 0.4.7)
+#
+# Copyright 2007 Donnie S Bhayangkara <dsbhayangkara@gmail.com>
+# Copyright 2009 Buschmann <buschmann23@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+
 # norootforbuild
 
 %define _prefix	/opt/kde3
@@ -8,20 +24,17 @@
 Name:		kooldock
 Version:	%{rversion}
 Release:	%{rrelease}%{releasesuffix}
-%if %suse_version < 1020
-Distribution:	SUSE Linux %(echo "%{suse_version}" | %__sed -e 's/.$//' -e ':a;s/$.$$/\.\1/g')
-%else
-Distribution:	openSUSE %(echo "%{suse_version}" | %__sed -e 's/.$//' -e ':a;s/$.$$/\.\1/g')
-%endif
 Summary:	A KDE Dock
 Source0:	%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
+Patch0:         %{name}-%{version}-gcc43.patch
+Patch1:         kooldock-0.4.7-bufferoverflow.patch
 URL:		http://sourceforge.net/projects/kooldock
-Packager:	Donnie S Bhayangkara - http://donnie.110mb.com
+#Packager:	Donnie S Bhayangkara - http://donnie.110mb.com
 Group:		System/GUI/KDE
 License:	GPL
 BuildRoot:	%{_tmppath}/build-%{name}-%{version}
-BuildRequires:	autoconf automake update-desktop-files
+BuildRequires:	autoconf automake update-desktop-files fdupes
 BuildRequires: 	kdelibs3-devel
 BuildRequires: 	libstdc++-devel
 
@@ -44,14 +57,16 @@ Authors:
 	Matias Fernandez <radix@kde.cl>
 	Francisco Guidi <francisco@guidi.com>
 
-	Developement after v0.3:
+	Development after v0.3:
 	Blase Stanek <bisiek@op.pl>
 
-%if %suse_version >= 930
+%if !0%{?opensuse_bs}
 %debug_package
 %endif
 %prep
 %setup -q -n "kooldock"
+%patch0
+%patch1
 %{?suse_update_config:%{suse_update_config -f}}
 
 %build
@@ -65,20 +80,37 @@ Authors:
 %__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/kde/kooldock.desktop"
 %suse_update_desktop_file -r "%{name}" KDE Utility DesktopUtility
 
-find %{buildroot} -type f -o -type l | sed "s|^%{buildroot}||" >master.list
+%__mkdir -p %{buildroot}/usr/share/pixmaps
+%__cp %{buildroot}/opt/kde3/share/icons/crystalsvg/128x128/apps/kooldock.png %{buildroot}/usr/share/pixmaps/kooldock.png
 
-%if %suse_version < 930
-%__strip "%{buildroot}%{_bindir}"/*
-%endif
+%fdupes %{buildroot}/opt/kde3/share
+
+%find_lang %{name}
 
 %clean
 %__rm -rf "%{buildroot}"
 
-%files -f master.list
+%files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.CVS TODO
+%doc AUTHORS ChangeLog COPYING README TODO
+/opt/kde3/bin/kooldock                                              
+/opt/kde3/share/applications/kde/kooldock.desktop
+/opt/kde3/share/apps/kooldock
+/opt/kde3/share/icons/crystalsvg/128x128/apps/kooldock.png
+/opt/kde3/share/icons/crystalsvg/16x16/apps/kooldock.png
+/opt/kde3/share/icons/crystalsvg/32x32/apps/kooldock.png
+/opt/kde3/share/icons/crystalsvg/64x64/apps/kooldock.png
+/usr/share/pixmaps/kooldock.png
 
 %changelog
+* Thu Mar 12 2009 Buschmann <buschmann23@opensuse.org> 0.4.7
+- using debug_package macro only outside the Build Service,
+  which has its own mechanism
+- removing obsolete suse version checks
+- removing Distribution tag, which is set by the Build Service
+- adding kooldock-0.4.7-gcc43.patch
+- adding kooldock-0.4.7-bufferoverflow.patch
+
 * Sun Sep 23 2007 Donnie S Bhayangkara <dsbhayangkara@gmail.com> 0.4.7
 - new upstream version:
   * Improved icon positioning.

Places

File project.diff of Package Kooldock

Places