Hello community, here is the log from the commit of package kalzium for openSUSE:Factory checked in at Wed Sep 21 17:07:08 CEST 2011.
-------- --- kalzium/kalzium.changes 2011-08-08 11:55:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kalzium/kalzium.changes 2011-09-20 22:00:42.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Sep 20 19:57:52 UTC 2011 - idon...@suse.com + +- Add kalzium-fix-license.patch to fix license strings, upstream + commit e6899b2cbdf9344cf636811d956259f44fe1187a bnc#716360 + +------------------------------------------------------------------- +Thu Sep 1 23:13:03 CEST 2011 - dmuel...@suse.de + +- update to 4.7.1 + * Bugfixes over KDE 4.7.0 + * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kalzium-4.7.0.tar.bz2 New: ---- kalzium-4.7.1.tar.bz2 kalzium-fix-license.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalzium.spec ++++++ --- /var/tmp/diff_new_pack.7YNTRz/_old 2011-09-21 17:07:03.000000000 +0200 +++ /var/tmp/diff_new_pack.7YNTRz/_new 2011-09-21 17:07:03.000000000 +0200 @@ -18,14 +18,24 @@ Name: kalzium -BuildRequires: boost-devel freeglut-devel kdebase4-workspace-devel -BuildRequires: gsl-devel libeigen2-devel libspectre-devel python-qt4-devel -BuildRequires: libgmm++-devel readline-devel -BuildRequires: libcfitsio-devel libindi-devel libqalculate-devel -BuildRequires: libopenbabel-devel +BuildRequires: boost-devel +BuildRequires: freeglut-devel +BuildRequires: gsl-devel +BuildRequires: kdebase4-workspace-devel +BuildRequires: libcfitsio-devel +BuildRequires: libeigen2-devel +BuildRequires: libgmm++-devel +BuildRequires: libindi-devel BuildRequires: libkdeedu4-devel +BuildRequires: libopenbabel-devel +BuildRequires: libqalculate-devel +BuildRequires: libspectre-devel +BuildRequires: python-qt4-devel +BuildRequires: readline-devel %if 0%{?sles_version} == 0 -BuildRequires: glew-devel python python-devel +BuildRequires: glew-devel +BuildRequires: python +BuildRequires: python-devel %if 0%{?suse_version} > 1120 BuildRequires: avogadro-devel %endif @@ -34,68 +44,60 @@ # currently in DOESNOTBUILD (2008-07-03) %ifnarch ppc ppc64 s390 s390x -BuildRequires: ocaml ocaml-facile +BuildRequires: ocaml +BuildRequires: ocaml-facile %endif -BuildRequires: fdupes +Version: 4.7.1 +Release: 1 License: GPLv2+ -Group: Productivity/Scientific/Chemistry Summary: Periodic Table of Elements Url: http://edu.kde.org -Version: 4.7.0 -Release: 2 -Source0: %{name}-%version.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +Group: Productivity/Scientific/Chemistry +Source0: %{name}-%{version}.tar.bz2 +Patch1: kalzium-fix-license.patch +BuildRequires: fdupes Requires: libkeduvocdocument4 Suggests: libkeduvocdocument4 Provides: kde4-kalzium = 4.3.0 Obsoletes: kde4-kalzium < 4.3.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Kalzium shows a periodic table of the elements. - -Authors: --------- - The KDE Team <k...@kde.org> - %prep -%setup -q -n %{name}-%version +%setup -q -n %{name}-%{version} +%patch1 -p1 %build %ifarch ppc ppc64 -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build %make_jobs %install cd build - %makeinstall +%make_install %suse_update_desktop_file %{name} Education Chemistry %kde_post_install - %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT + %if 0%{?suse_version} > 1020 + %fdupes -s %{buildroot} %endif %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} %package devel -License: GPL v2 or later -Group: Development/Libraries/KDE +License: GPLv2+ Summary: Periodic Table of Elements +Group: Development/Libraries/KDE Requires: kalzium = %{version} %description devel Kalzium shows a periodic table of the elements. - - -Authors: --------- - The KDE Team <k...@kde.org> - %files devel %defattr(-,root,root) %_kde4_libdir/libcompoundviewer.so ++++++ kalzium-4.7.0.tar.bz2 -> kalzium-4.7.1.tar.bz2 ++++++ Files old/kalzium-4.7.0/doc/index.cache.bz2 and new/kalzium-4.7.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/libscience/spectrum.h new/kalzium-4.7.1/libscience/spectrum.h --- old/kalzium-4.7.0/libscience/spectrum.h 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/libscience/spectrum.h 2011-08-22 15:23:46.000000000 +0200 @@ -48,7 +48,7 @@ /** * a peak is one line in the spectrum of an element */ - class peak + class SCIENCE_EXPORT peak { public: peak() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/applet/bodr/plasma_kalzium.desktop new/kalzium-4.7.1/plasmoid/applet/bodr/plasma_kalzium.desktop --- old/kalzium-4.7.0/plasmoid/applet/bodr/plasma_kalzium.desktop 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/applet/bodr/plasma_kalzium.desktop 2011-08-22 15:23:46.000000000 +0200 @@ -37,6 +37,7 @@ Name[ru]=Химические данные Name[sv]=Kemisk information Name[tr]=Kimyasal Veriler +Name[ug]=خىمىيىلىك سانلىق-مەلۇمات Name[uk]=Хімічні дані Name[x-test]=xxChemical Dataxx Name[zh_CN]=化学数据 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/applet/concentrationPlasmoid/concentrationCalculator.desktop new/kalzium-4.7.1/plasmoid/applet/concentrationPlasmoid/concentrationCalculator.desktop --- old/kalzium-4.7.0/plasmoid/applet/concentrationPlasmoid/concentrationCalculator.desktop 2011-07-07 16:04:00.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/applet/concentrationPlasmoid/concentrationCalculator.desktop 2011-09-01 22:47:19.000000000 +0200 @@ -10,6 +10,7 @@ Name[en_GB]=Kalzium concentration Calculator Name[es]=Calculadora de concentraciones de Kalzium Name[et]=Kalziumi kontsentratsioonikalkulaator +Name[fi]=Kalziumin konsentraatiolaskin Name[fr]=Calculateur de concentration Kalzium Name[gl]=Calculador de concentracións de Kalzium Name[it]=Calcolatore di concentrazione di Kalzium @@ -28,6 +29,7 @@ Name[ru]=Калькулятор концентраций Name[sv]=Kalzium koncentrationsberäkning Name[tr]=Kalzium Konsantrasyon Hesaplayıcı +Name[ug]=Kalzium قويۇقلۇق ھېسابلىغۇچ Name[uk]=Калькулятор концентрації Kalzium Name[x-test]=xxKalzium concentration Calculatorxx Name[zh_CN]=Kalzium 浓度计算器 @@ -43,6 +45,7 @@ Comment[en_GB]=Kalzium concentration Calculator Comment[es]=Calculadora de concentraciones de Kalzium Comment[et]=Kalziumi kontsentratsioonikalkulaator +Comment[fi]=Kalziumin konsentraatiolaskin Comment[fr]=Calculateur de concentration Kalzium Comment[gl]=Calculador de concentracións de Kalzium Comment[it]=Calcolatore di concentrazione di Kalzium @@ -61,6 +64,7 @@ Comment[ru]=Калькулятор концентраций Kalzium Comment[sv]=Kalzium koncentrationsberäkning Comment[tr]=Kalzium Konsantrasyon Hesaplayıcı +Comment[ug]=Kalzium قويۇقلۇق ھېسابلىغۇچ Comment[uk]=Калькулятор концентрації Kalzium Comment[x-test]=xxKalzium concentration Calculatorxx Comment[zh_CN]=Kalzium 浓度计算器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/applet/gasPlasmoid/gasCalculator.desktop new/kalzium-4.7.1/plasmoid/applet/gasPlasmoid/gasCalculator.desktop --- old/kalzium-4.7.0/plasmoid/applet/gasPlasmoid/gasCalculator.desktop 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/applet/gasPlasmoid/gasCalculator.desktop 2011-09-01 22:47:19.000000000 +0200 @@ -10,6 +10,7 @@ Name[en_GB]=Kalzium gas Calculator Name[es]=Calculadora de gases de Kalzium Name[et]=Kalziumi gaasikalkulaator +Name[fi]=Kalziumin kaasulaskin Name[fr]=Calculateur de gaz Kalzium Name[gl]=Calculadora de gases de Kalzium Name[it]=Calcolatore di gas di Kalzium @@ -28,6 +29,7 @@ Name[ru]=Газовый калькулятор Name[sv]=Kalzium gasberäkning Name[tr]=Kalzium Gaz Hesaplayıcı +Name[ug]=Kalzium گاز ھېسابلىغۇچ Name[uk]=Калькулятор газів Kalzium Name[x-test]=xxKalzium gas Calculatorxx Name[zh_CN]=Kalzium 气体计算器 @@ -43,6 +45,7 @@ Comment[en_GB]=Kalzium gas Calculator Comment[es]=Calculadora de gases de Kalzium Comment[et]=Kalziumi gaasikalkulaator +Comment[fi]=Kalziumin kaasulaskin Comment[fr]=Calculateur de gaz Kalzium Comment[gl]=Calculadora de gases de Kalzium Comment[it]=Calcolatore di gas di Kalzium @@ -61,6 +64,7 @@ Comment[ru]=Газовый калькулятор Kalzium Comment[sv]=Kalzium gasberäkning Comment[tr]=Kalzium Gaz Hesaplayıcı +Comment[ug]=Kalzium گاز ھېسابلىغۇچ Comment[uk]=Калькулятор газів Kalzium Comment[x-test]=xxKalzium gas Calculatorxx Comment[zh_CN]=Kalzium 气体计算器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp new/kalzium-4.7.1/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp --- old/kalzium-4.7.0/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp 2011-08-22 15:23:46.000000000 +0200 @@ -42,6 +42,7 @@ m_MassLabel( 0 ), m_switchButton( 0 ) { + KGlobal::locale()->insertCatalog("kalzium"); // Some Applet settings setAspectRatioMode ( Plasma::IgnoreAspectRatio ); setHasConfigurationInterface ( true ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop new/kalzium-4.7.1/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop --- old/kalzium-4.7.0/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop 2011-07-19 23:34:22.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/applet/psePlasmoid/plasma-applet-Molmasscalculator.desktop 2011-09-01 22:47:19.000000000 +0200 @@ -10,6 +10,7 @@ Name[en_GB]=Molar mass calculator Name[es]=Calculadora de masas molares Name[et]=Molaarmassi kalkulaator +Name[fi]=Moolimassalaskin Name[fr]=Calculateur de masse molaire Name[gl]=Calculadora da masa molecular Name[it]=Calcolatore di massa molare @@ -41,6 +42,7 @@ Comment[en_GB]=Small periodic table of elements with a molar mass calculator Comment[es]=Pequeña tabla periódica con una calculadora de masas molares Comment[et]=Väike keemiliste elementide tabel molaarmassi kalkulaatoriga +Comment[fi]=Pieni alkuaineiden jaksollinen järjestelmä moolimassalaskimella Comment[fr]=Tableau périodique des éléments miniature avec un calculateur de masse molaire Comment[gl]=Pequena táboa periódica dos elementos cunha calculadora da masa molecular Comment[it]=Piccola tavola periodica degli elementi con una calcolatrice di massa molare diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/plasmoid/engine/plasma-dataengine-kalzium.desktop new/kalzium-4.7.1/plasmoid/engine/plasma-dataengine-kalzium.desktop --- old/kalzium-4.7.0/plasmoid/engine/plasma-dataengine-kalzium.desktop 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/plasmoid/engine/plasma-dataengine-kalzium.desktop 2011-08-22 15:23:46.000000000 +0200 @@ -59,6 +59,7 @@ Name[ta]=கால்சியம் Name[tg]=Kalzium Name[tr]=Kalzium +Name[ug]=Kalzium Name[uk]=Kalzium Name[vi]=Kalzium Name[xh]=Kalzium @@ -103,6 +104,7 @@ Comment[ru]=Химические данные Comment[sv]=Kemisk data Comment[tr]=Kimyasal Veri +Comment[ug]=خىمىيىلىك سانلىق-مەلۇمات Comment[uk]=Хімічні дані Comment[x-test]=xxChemical Dataxx Comment[zh_CN]=化学数据 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-4.7.0/src/kalzium.desktop new/kalzium-4.7.1/src/kalzium.desktop --- old/kalzium-4.7.0/src/kalzium.desktop 2011-05-20 22:33:53.000000000 +0200 +++ new/kalzium-4.7.1/src/kalzium.desktop 2011-08-22 15:23:46.000000000 +0200 @@ -123,6 +123,7 @@ Name[ta]=கால்சியம் Name[tg]=Kalzium Name[tr]=Kalzium +Name[ug]=Kalzium Name[uk]=Kalzium Name[vi]=Kalzium Name[xh]=Kalzium ++++++ kalzium-fix-license.patch ++++++ From: Etienne Rebetez <etienne.rebe...@oberwallis.ch> Date: Tue, 20 Sep 2011 19:15:28 +0000 Subject: Change the GPL Version from 3 to 2 in order to complie to the X-Git-Url: http://quickgit.kde.org/?p=kalzium.git&a=commitdiff&h=e6899b2cbdf9344cf636811d956259f44fe1187a --- Change the GPL Version from 3 to 2 in order to complie to the rest of the kalzium licences. --- --- a/src/kalziumunitcombobox.cpp +++ b/src/kalziumunitcombobox.cpp @@ -3,7 +3,7 @@ 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 + 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, --- a/src/kalziumunitcombobox.h +++ b/src/kalziumunitcombobox.h @@ -3,7 +3,7 @@ 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 + 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, --- a/src/psetable/periodictablestates.cpp +++ b/src/psetable/periodictablestates.cpp @@ -4,7 +4,7 @@ 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 + 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, --- a/src/psetable/periodictablestates.h +++ b/src/psetable/periodictablestates.h @@ -3,7 +3,7 @@ Kalzium 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 + the Free Software Foundation, either version 2 of the License, or (at your option) any later version. Kalzium is distributed in the hope that it will be useful, --- a/src/unitsettingsdialog.cpp +++ b/src/unitsettingsdialog.cpp @@ -4,7 +4,7 @@ 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 + 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, --- a/src/unitsettingsdialog.h +++ b/src/unitsettingsdialog.h @@ -4,7 +4,7 @@ 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 + 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, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
