From 30ee56d9bdf6d2e00c35d0f4b5c32dd4db74c2f51e937b02e38d9f9a2aa59243 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Apr 2008 14:30:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=10 --- FIXME.diff | 11 - fix-desktop-file.diff | 11 + kst-1.5.0.tar.bz2 | 3 - kst-1.6.0.tar.bz2 | 3 + kst-gplv3-relicense.diff | 601 --------------------------------------- kst.changes | 5 + kst.spec | 18 +- 7 files changed, 29 insertions(+), 623 deletions(-) delete mode 100644 FIXME.diff create mode 100644 fix-desktop-file.diff delete mode 100644 kst-1.5.0.tar.bz2 create mode 100644 kst-1.6.0.tar.bz2 delete mode 100644 kst-gplv3-relicense.diff diff --git a/FIXME.diff b/FIXME.diff deleted file mode 100644 index e0f8220..0000000 --- a/FIXME.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kst/src/kst/kst.desktop 2007/08/04 11:29:30 1.1 -+++ kst/src/kst/kst.desktop 2007/08/04 11:30:10 -@@ -3,7 +3,7 @@ - Exec=kst -caption "%c" %i %m - Icon=kst - DocPath=kst/index.html --MimeType=application/x-kst -+MimeType=application/x-kst; - #Categories=Qt;KDE;Science; - Name=Kst - Name[hi]=केएसटी diff --git a/fix-desktop-file.diff b/fix-desktop-file.diff new file mode 100644 index 0000000..c8bf6e6 --- /dev/null +++ b/fix-desktop-file.diff @@ -0,0 +1,11 @@ +--- kst/src/kst/kst.desktop 2008/04/24 09:08:39 1.1 ++++ kst/src/kst/kst.desktop 2008/04/24 09:08:50 +@@ -4,7 +4,7 @@ + Icon=kst + DocPath=kst/index.html + MimeType=application/x-kst; +-Categories=Qt;KDE;Utility;X-KDE-Science & Math-PIM; ++Categories=Qt;KDE; + X-DCOP-ServiceType=Multi + X-KDE-StartupNotify=false + Name=Kst diff --git a/kst-1.5.0.tar.bz2 b/kst-1.5.0.tar.bz2 deleted file mode 100644 index b0adc20..0000000 --- a/kst-1.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5f577ce5d69d86b9a79c5370c51cabb0f6bb974efb6af93fa40c05ae8311fb7 -size 15374437 diff --git a/kst-1.6.0.tar.bz2 b/kst-1.6.0.tar.bz2 new file mode 100644 index 0000000..c9d8d2d --- /dev/null +++ b/kst-1.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2807ed46dd92b75f2a78e449bb89abe36e2fd243dac8b440dfca75f931ea043a +size 14823020 diff --git a/kst-gplv3-relicense.diff b/kst-gplv3-relicense.diff deleted file mode 100644 index 13328ce..0000000 --- a/kst-gplv3-relicense.diff +++ /dev/null @@ -1,601 +0,0 @@ -Index: src/extensions/js/kjsembed/tools/headers/qcanvas.h -=================================================================== ---- src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 784997) -+++ src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 785267) -@@ -1,37 +1,40 @@ - /********************************************************************** --** - ** - ** Definition of QCanvas classes - ** - ** Created : 991211 - ** --** Copyright (C) 1999-2002 Trolltech AS. All rights reserved. -+** Copyright (C) 1999-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the canvas module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition licenses may use this --** file in accordance with the Qt Commercial License Agreement provided --** with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extensions/js/kjsembed/tools/headers/qdir.h -=================================================================== ---- src/extensions/js/kjsembed/tools/headers/qdir.h (revision 784997) -+++ src/extensions/js/kjsembed/tools/headers/qdir.h (revision 785267) -@@ -1,37 +1,40 @@ - /**************************************************************************** --** - ** - ** Definition of QDir class - ** - ** Created : 950427 - ** --** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. -+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the tools module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses may use this file in accordance with the Qt Commercial License --** Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extensions/js/kjsembed/tools/headers/qtimer.h -=================================================================== ---- src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 784997) -+++ src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 785267) -@@ -1,37 +1,40 @@ - /**************************************************************************** --** - ** - ** Definition of QTimer class - ** - ** Created : 931111 - ** --** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses may use this file in accordance with the Qt Commercial License --** Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extensions/js/kjsembed/tools/headers/qpen.h -=================================================================== ---- src/extensions/js/kjsembed/tools/headers/qpen.h (revision 784997) -+++ src/extensions/js/kjsembed/tools/headers/qpen.h (revision 785267) -@@ -1,37 +1,40 @@ - /**************************************************************************** --** - ** - ** Definition of QPen class - ** - ** Created : 940112 - ** --** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses may use this file in accordance with the Qt Commercial License --** Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extensions/js/kjsembed/tools/headers/qbrush.h -=================================================================== ---- src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 784997) -+++ src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 785267) -@@ -1,37 +1,40 @@ - /**************************************************************************** --** - ** - ** Definition of QBrush class - ** - ** Created : 940112 - ** --** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses may use this file in accordance with the Qt Commercial License --** Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/libkst/kstwaitcondition_unix.cpp -=================================================================== ---- src/libkst/kstwaitcondition_unix.cpp (revision 784997) -+++ src/libkst/kstwaitcondition_unix.cpp (revision 785267) -@@ -5,33 +5,37 @@ - ** - ** Created : 20010725 - ** --** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. -+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. - ** - ** This file is part of the tools module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses for Unix/X11 or for Qt/Embedded may use this file in accordance --** with the Qt Commercial License Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/libkst/kstwaitcondition.h -=================================================================== ---- src/libkst/kstwaitcondition.h (revision 784997) -+++ src/libkst/kstwaitcondition.h (revision 785267) -@@ -5,33 +5,35 @@ - ** - ** Created : 931107 - ** --** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. --** - ** This file is part of the tools module of the Qt GUI Toolkit. - ** --** This file may be distributed under the terms of the Q Public License --** as defined by Trolltech AS of Norway and appearing in the file --** LICENSE.QPL included in the packaging of this file. --** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. --** --** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition --** licenses may use this file in accordance with the Qt Commercial License --** Agreement provided with the Software. --** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --** --** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for --** information about Qt Commercial License Agreements. --** See http://www.trolltech.com/qpl/ for QPL licensing information. --** See http://www.trolltech.com/gpl/ for GPL licensing information. --** --** Contact info@trolltech.com if any conditions of this licensing are --** not clear to you. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. -+** -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extdate/kstextdatetime.cpp -=================================================================== ---- src/extdate/kstextdatetime.cpp (revision 784997) -+++ src/extdate/kstextdatetime.cpp (revision 785267) -@@ -6,7 +6,7 @@ - ** This file may be distributed and/or modified under the terms of the - ** GNU General Public License version 2 as published by the Free Software - ** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. -+** packaging of this file, or (at your option) any later version. - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -Index: src/extdate/kstextdatetime.h -=================================================================== ---- src/extdate/kstextdatetime.h (revision 784997) -+++ src/extdate/kstextdatetime.h (revision 785267) -@@ -6,7 +6,7 @@ - ** This file may be distributed and/or modified under the terms of the - ** GNU General Public License version 2 as published by the Free Software - ** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. -+** packaging of this file, or (at your option) any later version. - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -Index: src/extdate/kstextdatetimeedit.cpp -=================================================================== ---- src/extdate/kstextdatetimeedit.cpp (revision 784997) -+++ src/extdate/kstextdatetimeedit.cpp (revision 785267) -@@ -8,15 +8,35 @@ - ** Original qatetimeedit.cpp Copyright (C) 2000-2002 Trolltech AS. All rights reserved. - **>> ExtDate modifications (C) 2004 Jason Harris - ** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. -+** This file is part of the tools module of the Qt GUI Toolkit. - ** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. - ** --** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - -Index: src/extdate/kstextdatetimeedit.h -=================================================================== ---- src/extdate/kstextdatetimeedit.h (revision 784997) -+++ src/extdate/kstextdatetimeedit.h (revision 785267) -@@ -10,15 +10,35 @@ - ** >> modifications to introduce ExtDate (C) 2004 Jason Harris - ** >> ExtDate modifications are licensed under the GPL: http://www.gnu.org/licenses/gpl.html - ** --** This file may be distributed and/or modified under the terms of the --** GNU General Public License version 2 as published by the Free Software --** Foundation and appearing in the file LICENSE.GPL included in the --** packaging of this file. -+** This file is part of the tools module of the Qt GUI Toolkit. - ** --** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** This file may be used under the terms of the GNU General -+** Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the files LICENSE.GPL2 -+** and LICENSE.GPL3 included in the packaging of this file. -+** Alternatively you may (at your option) use any later version -+** of the GNU General Public License if such license has been -+** publicly approved by Trolltech ASA (or its successors, if any) -+** and the KDE Free Qt Foundation. - ** --** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** Please review the following information to ensure GNU General -+** Public Licensing requirements will be met: -+** http://trolltech.com/products/qt/licenses/licensing/opensource/. -+** If you are unsure which license is appropriate for your use, please -+** review the following information: -+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -+** or contact the sales department at sales@trolltech.com. -+** -+** This file may be used under the terms of the Q Public License as -+** defined by Trolltech ASA and appearing in the file LICENSE.QPL -+** included in the packaging of this file. Licensees holding valid Qt -+** Commercial licenses may use this file in accordance with the Qt -+** Commercial License Agreement provided with the Software. -+** -+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -+** herein. - ** - **********************************************************************/ - diff --git a/kst.changes b/kst.changes index 54e87e2..18683ea 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 24 10:05:01 CEST 2008 - stbinner@suse.de + +- update to 1.6.0: no changelog provided + ------------------------------------------------------------------- Fri Mar 14 12:20:35 CET 2008 - dmueller@suse.de diff --git a/kst.spec b/kst.spec index 8d0cf6a..287f046 100644 --- a/kst.spec +++ b/kst.spec @@ -1,5 +1,5 @@ # -# spec file for package kst (Version 1.5.0) +# spec file for package kst (Version 1.6.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,14 +20,13 @@ BuildRequires: fdupes License: GPL v2 or later Group: Productivity/Graphics/Visualization/Graph Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -Version: 1.5.0 +Version: 1.6.0 Release: 1 Url: http://extragear.kde.org/apps/kst/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 -Patch: FIXME.diff -Patch2: kst-gplv3-relicense.diff Requires: %{name}-lang = %{version} +Patch: fix-desktop-file.diff %description Kst is a data plotting and viewing program. Some of the features @@ -65,6 +64,7 @@ Authors: %endif %package devel +License: GPL v2 or later Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Group: Productivity/Scientific/Math Requires: kst = %{version} @@ -104,7 +104,6 @@ Authors: %setup -q %patch pushd kst -%patch2 popd . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -117,7 +116,8 @@ make %{?jobs:-j %jobs} %install . /etc/opt/kde3/common_options make DESTDIR=${RPM_BUILD_ROOT} install -%suse_update_desktop_file %name Science Math +rm $RPM_BUILD_ROOT/opt/kde3/share/applnk/Graphics/kst.desktop +%suse_update_desktop_file %name Qt KDE Education Science Math %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT %endif @@ -162,6 +162,8 @@ rm -rf ${RPM_BUILD_ROOT} /opt/kde3/share/config/colors %changelog +* Thu Apr 24 2008 stbinner@suse.de +- update to 1.6.0: no changelog provided * Fri Mar 14 2008 dmueller@suse.de - fixed specfile * Thu Mar 13 2008 dmueller@suse.de @@ -209,7 +211,7 @@ rm -rf ${RPM_BUILD_ROOT} * countless bugfixes * Mon Feb 20 2006 stbinner@suse.de - cleanup BuildRequires: after gsl-devel dependency fix -* Wed Feb 15 2006 stbinner@suse.de +* Thu Feb 16 2006 stbinner@suse.de - update to version 1.2 * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires @@ -217,7 +219,7 @@ rm -rf ${RPM_BUILD_ROOT} - fix build * Thu Oct 27 2005 stbinner@suse.de - update to version 1.1.1 -* Mon Oct 10 2005 stbinner@suse.de +* Tue Oct 11 2005 stbinner@suse.de - fix include hints for Qt 3.3.5 * Wed Oct 05 2005 stbinner@suse.de - fix some %%files entries for 64 bit