From c5b8e1285bae4e2382f75d4595b3e197e02347fb43fef5e3dc0c323553ef1e04 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 27 Jul 2011 15:29:33 +0000 Subject: [PATCH] Accepting request 77258 from KDE:Distro:Factory forward to factory OBS-URL: https://build.opensuse.org/request/show/77258 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmplot?expand=0&rev=3 --- 4_6_BRANCH.diff | 7 ----- kmplot-4.6.95.tar.bz2 | 3 --- kmplot-4.7.0.tar.bz2 | 3 +++ kmplot.changes | 8 ++++++ kmplot.spec | 62 +++++++++++++++++++++++-------------------- 5 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 4_6_BRANCH.diff delete mode 100644 kmplot-4.6.95.tar.bz2 create mode 100644 kmplot-4.7.0.tar.bz2 diff --git a/4_6_BRANCH.diff b/4_6_BRANCH.diff deleted file mode 100644 index 9d92079..0000000 --- a/4_6_BRANCH.diff +++ /dev/null @@ -1,7 +0,0 @@ -package: kdeedu-4.2.87svn969966.tar.bz2 -kdemod: kdeedu ---- BRANCH_STATUS -+++ BRANCH_STATUS -@@ -0,0 +1,2 @@ -+current HEAD: 970680 -+svn di between //trunk/KDE/kdeedu@969966 and //trunk/KDE/kdeedu diff --git a/kmplot-4.6.95.tar.bz2 b/kmplot-4.6.95.tar.bz2 deleted file mode 100644 index b413554..0000000 --- a/kmplot-4.6.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ba18463535e56971bd175ea067c2e2fe08a0625c9ce1eb8692790d02500565d -size 706428 diff --git a/kmplot-4.7.0.tar.bz2 b/kmplot-4.7.0.tar.bz2 new file mode 100644 index 0000000..1a6bd3b --- /dev/null +++ b/kmplot-4.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea89c003aaac250c05e7e05a2763d2c67ec2d7f71dd5354a4beac11ac019d3ff +size 705504 diff --git a/kmplot.changes b/kmplot.changes index c7d0bdd..7612133 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 22 20:25:05 CEST 2011 - dmueller@suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + ------------------------------------------------------------------- Sat Jul 9 09:58:38 CEST 2011 - dmueller@suse.de diff --git a/kmplot.spec b/kmplot.spec index 3d8d1f0..2ec5843 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -18,70 +18,74 @@ Name: kmplot -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 -%py_requires +%py_requires %endif # 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.0 +Release: 1 License: GPLv2+ -Group: Productivity/Scientific/Math Summary: Mathematical Function Plotter Url: http://edu.kde.org -Version: 4.6.95 -Release: 1 -Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +Group: Productivity/Scientific/Math +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: fdupes Requires: libkeduvocdocument4 Suggests: libkeduvocdocument4 Provides: kde4-kmplot = 4.3.0 Obsoletes: kde4-kmplot < 4.3.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Mathematical function plotter for KDE - -Authors: --------- - The KDE Team - %prep -%setup -q -n %{name}-%version -%patch0 -p0 +%setup -q -n %{name}-%{version} %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 Math %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} %post -p /sbin/ldconfig @@ -92,7 +96,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %_kde4_bindir/kmplot %_kde4_applicationsdir/kmplot.desktop %_kde4_modulesdir/libkmplotpart.so -%{_prefix}/share/dbus-1/interfaces/org.kde.kmplot.*.xml +%{_datadir}/dbus-1/interfaces/org.kde.kmplot.*.xml %_kde4_htmldir/en/kmplot/ %_kde4_iconsdir/hicolor/*/apps/kmplot.* %_kde4_appsdir/kmplot/