Accepting request 77261 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/77261
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktouch?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

ktouch-4.6.95.tar.bz2

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

ktouch-4.7.0.tar.bz2

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

ktouch.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 22 20:26:51 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 10:00:25 CEST 2011 - dmueller@suse.de
 

ktouch.spec

@@ -18,70 +18,74 @@
 
 
 Name:           ktouch
-BuildRequires:  boost-devel freeglut-devel kdebase4-workspace-devel
+BuildRequires:  boost-devel
-BuildRequires:  gsl-devel libeigen2-devel libspectre-devel python-qt4-devel
+BuildRequires:  freeglut-devel
-BuildRequires:  libgmm++-devel readline-devel
+BuildRequires:  gsl-devel
-BuildRequires:  libcfitsio-devel libindi-devel libqalculate-devel
+BuildRequires:  kdebase4-workspace-devel
-BuildRequires:  libopenbabel-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:          Amusements/Teaching/Other
 Summary:        Touch Typing Tutor
 Url:            http://edu.kde.org
-Version:        4.6.95
+Group:          Amusements/Teaching/Other
-Release:        1
+Source0:        %{name}-%{version}.tar.bz2
-Source0:        %{name}-%version.tar.bz2
+BuildRequires:  fdupes
-Patch0:         4_6_BRANCH.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
 Requires:       libkeduvocdocument4
 Suggests:       libkeduvocdocument4
 Provides:       kde4-ktouch = 4.3.0
 Obsoletes:      kde4-ktouch < 4.3.0
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%kde4_runtime_requires
 
 %description
 A KDE program that helps you to learn and practice touch typing.
 
-
-Authors:
---------
-    The KDE Team <kde@kde.org>
-
 %prep
-%setup -q -n %{name}-%version
+%setup -q -n %{name}-%{version}
-%patch0 -p0
 
 %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 X-KDE-Edu-Teaching
   %kde_post_install
-  %if %suse_version > 1020
+  %if 0%{?suse_version} > 1020
-  %fdupes -s $RPM_BUILD_ROOT
+  %fdupes -s %{buildroot}
   %endif
 
 %clean
-  rm -rf $RPM_BUILD_ROOT
+  rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig