Accepting request 77271 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/77271
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rocs?expand=0&rev=3

rocs.spec

@@ -18,77 +18,81 @@
 
 
 Name:           rocs
-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:          Amusements/Teaching/Mathematics
 Summary:        Graph Theory IDE for professors and students
 Url:            http://edu.kde.org
-Version:        4.6.95
-Release:        1
-Source0:        %{name}-%version.tar.bz2
-Patch0:         4_6_BRANCH.diff
+Group:          Amusements/Teaching/Mathematics
+Source0:        %{name}-%{version}.tar.bz2
 Patch1:         desktop-files.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
+BuildRequires:  fdupes
 Requires:       libkeduvocdocument4
 Suggests:       libkeduvocdocument4
 Provides:       kde4-rocs = 4.3.0
 Obsoletes:      kde4-rocs < 4.3.0
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%kde4_runtime_requires
 
 %description
 A Graph Theory IDE for professors and students
 
-
-Authors:
---------
-    The KDE Team <kde@kde.org>
-
 %prep
-%setup -q -n %{name}-%version
-%patch0 -p0
+%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 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}
 
 %package devel
 License:        GPLv2+
-Group:          Amusements/Teaching/Mathematics
 Summary:        Graph Theory IDE for professors and students:
+Group:          Amusements/Teaching/Mathematics
 Requires:       rocs
 
 %description devel
@@ -100,7 +104,7 @@ A Graph Theory IDE for professors and students:
 
 %files devel
 %defattr(-,root,root)
-/usr/include/rocs/
+%{_includedir}/rocs/
 %_kde4_libdir/librocslib.so
 
 %post -p /sbin/ldconfig