From 78c15561f40153bc4bdfcd7ac0975fcb50daaa324d0a4c797a365879117aec92 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 21 Dec 2012 08:09:19 +0000 Subject: [PATCH] Accepting request 146126 from KDE:Distro:Factory Update to KDE 4.10 RC OBS-URL: https://build.opensuse.org/request/show/146126 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktuberling?expand=0&rev=2 --- ktuberling-4.9.90.tar.xz | 3 -- ktuberling-4.9.95.tar.xz | 3 ++ ktuberling-license-fix.patch | 92 ------------------------------------ ktuberling.changes | 8 ++++ ktuberling.spec | 13 ++--- 5 files changed, 16 insertions(+), 103 deletions(-) delete mode 100644 ktuberling-4.9.90.tar.xz create mode 100644 ktuberling-4.9.95.tar.xz delete mode 100644 ktuberling-license-fix.patch diff --git a/ktuberling-4.9.90.tar.xz b/ktuberling-4.9.90.tar.xz deleted file mode 100644 index 675cea4..0000000 --- a/ktuberling-4.9.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62c8cbc6a8d688c6d177e629eda5dea726d55552d1931539ee99deb5000e5351 -size 4292924 diff --git a/ktuberling-4.9.95.tar.xz b/ktuberling-4.9.95.tar.xz new file mode 100644 index 0000000..59de248 --- /dev/null +++ b/ktuberling-4.9.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:192f838f9102bc76d484344fbf439180f403e62df0cc8482fb1242a2ad374232 +size 4293280 diff --git a/ktuberling-license-fix.patch b/ktuberling-license-fix.patch deleted file mode 100644 index 18a8914..0000000 --- a/ktuberling-license-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -commit 01eb6fccdb4fca437e78f6f6b0845e20455831a8 -Author: Alex Fiestas -Date: Tue Dec 4 10:28:36 2012 +0100 - - When I wrote this I forgot to add a header with the licence - -diff --git a/playgrounddelegate.cpp b/playgrounddelegate.cpp -index 02aca5f..ae2bed1 100644 ---- a/playgrounddelegate.cpp -+++ b/playgrounddelegate.cpp -@@ -1,21 +1,20 @@ --/* -- -- Copyright (C) -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --*/ -+/************************************************************************************* -+ * Copyright (C) 2010-2012 by Alejandro Fiestas Olivares * -+ * * -+ * This program is free software; you can redistribute it and/or * -+ * modify it under the terms of the GNU General Public License * -+ * as published by the Free Software Foundation; either version 2 * -+ * of the License, or (at your option) any later version. * -+ * * -+ * This program 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 General Public License for more details. * -+ * * -+ * You should have received a copy of the GNU General Public License * -+ * along with this program; if not, write to the Free Software * -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * -+ *************************************************************************************/ - - #include "playgrounddelegate.h" - #include -diff --git a/playgrounddelegate.h b/playgrounddelegate.h -index f09fb95..99ab336 100644 ---- a/playgrounddelegate.h -+++ b/playgrounddelegate.h -@@ -1,21 +1,20 @@ --/* -- -- Copyright (C) -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --*/ -+/************************************************************************************* -+ * Copyright (C) 2010-2012 by Alejandro Fiestas Olivares * -+ * * -+ * This program is free software; you can redistribute it and/or * -+ * modify it under the terms of the GNU General Public License * -+ * as published by the Free Software Foundation; either version 2 * -+ * of the License, or (at your option) any later version. * -+ * * -+ * This program 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 General Public License for more details. * -+ * * -+ * You should have received a copy of the GNU General Public License * -+ * along with this program; if not, write to the Free Software * -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * -+ *************************************************************************************/ - - #ifndef PLAYGROUNDDELEGATE_H - #define PLAYGROUNDDELEGATE_H diff --git a/ktuberling.changes b/ktuberling.changes index f1ae0c9..3bad864 100644 --- a/ktuberling.changes +++ b/ktuberling.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 19 19:16:21 UTC 2012 - tittiatcoke@gmail.com + +- Update to 4.9.95 + * This is the first RC release for 4.10. Contains bugfixes +- Removed patch ktuberling-license-fix.patch. This is now fixed + upstream. + ------------------------------------------------------------------- Thu Dec 6 08:12:47 UTC 2012 - idonmez@suse.com diff --git a/ktuberling.spec b/ktuberling.spec index d158255..a552ecc 100644 --- a/ktuberling.spec +++ b/ktuberling.spec @@ -1,7 +1,7 @@ # -# spec file for package ktuberling (Version 4.7.80_20111122) +# spec file for package ktuberling # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,13 @@ Name: ktuberling BuildRequires: libkdegames-devel BuildRequires: xz +Summary: Potato drawing editor License: GPL-2.0+ Group: Amusements/Toys/Other -Summary: Potato drawing editor Url: http://www.kde.org -Version: 4.9.90 -Release: 1 +Version: 4.9.95 +Release: 0 Source0: ktuberling-%{version}.tar.xz -# PATCH-FIX-UPSTREAM ktuberling-license-fix.patch Upstream commit 01eb6fccdb4fca -Patch1: ktuberling-license-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: potatoguy = %{version} Obsoletes: potatoguy < %{version} @@ -42,7 +40,6 @@ face and goodies can be attached onto a potato-like guy. %prep %setup -q -%patch1 -p1 %build %cmake_kde4 -d build