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

@@ -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

kmplot-4.6.95.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ba18463535e56971bd175ea067c2e2fe08a0625c9ce1eb8692790d02500565d
-size 706428

kmplot-4.7.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea89c003aaac250c05e7e05a2763d2c67ec2d7f71dd5354a4beac11ac019d3ff
+size 705504

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
 

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 <kde@kde.org>
-
 %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/