From e34ac34203a23c71b3e775b9dcda477f08644345516f0bcb297e6f8109e039b6 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Mon, 19 Sep 2011 16:03:17 +0000
Subject: [PATCH] Accepting request 82264 from KDE:Distro:Factory

- Changed descriptions and summaries (fix for RPMLINT warning)
- Removed tests for obsolete openSUSE versions (fix for RPMLINT warning)
- Cleaned up spec file formatting (forwarded request 82186 from TheBlackCat) (forwarded request 82187 from TheBlackCat)

OBS-URL: https://build.opensuse.org/request/show/82264
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rocs?expand=0&rev=7
---
 rocs.changes |  7 ++++++
 rocs.spec    | 69 ++++++++++++++++++++++------------------------------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/rocs.changes b/rocs.changes
index 2dee72d..396610d 100644
--- a/rocs.changes
+++ b/rocs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 13 12:41:10 UTC 2011 - toddrme2178@gmail.com
+
+- Changed descriptions and summaries (fix for RPMLINT warning)
+- Removed tests for obsolete openSUSE versions (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Thu Sep  1 23:32:25 CEST 2011 - dmueller@suse.de
 
diff --git a/rocs.spec b/rocs.spec
index f267c66..87cedd8 100644
--- a/rocs.spec
+++ b/rocs.spec
@@ -15,11 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           rocs
+BuildRequires:  avogadro-devel
 BuildRequires:  boost-devel
 BuildRequires:  freeglut-devel
+BuildRequires:  glew-devel
 BuildRequires:  gsl-devel
 BuildRequires:  kdebase4-workspace-devel
 BuildRequires:  libcfitsio-devel
@@ -32,15 +32,7 @@ BuildRequires:  libqalculate-devel
 BuildRequires:  libspectre-devel
 BuildRequires:  python-qt4-devel
 BuildRequires:  readline-devel
-%if 0%{?sles_version} == 0
-BuildRequires:  glew-devel
-BuildRequires:  python
-BuildRequires:  python-devel
-%if 0%{?suse_version} > 1120
-BuildRequires:  avogadro-devel
-%endif
 %py_requires
-%endif
 
 # currently in DOESNOTBUILD (2008-07-03)
 %ifnarch ppc ppc64 s390 s390x
@@ -50,7 +42,7 @@ BuildRequires:  ocaml-facile
 Version:        4.7.1
 Release:        1
 License:        GPLv2+
-Summary:        Graph Theory IDE for professors and students
+Summary:        Graph Theory IDE
 Url:            http://edu.kde.org
 Group:          Amusements/Teaching/Mathematics
 Source0:        %{name}-%{version}.tar.bz2
@@ -66,8 +58,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %description
 A Graph Theory IDE for professors and students
 
+%package devel
+License:        GPLv2+
+Summary:        Development files for rocs
+Group:          Development/Libraries/KDE
+Requires:       rocs = %{version}
+
+%description devel
+This package provides development files and headers needed
+to build software using rocs
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch1 -p1
 
 %build
@@ -79,49 +81,36 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 
 %install
   cd build
-%make_install
+  %make_install
   %suse_update_desktop_file %{name}       Education Math
   %kde_post_install
-  %if 0%{?suse_version} > 1020
   %fdupes -s %{buildroot}
-  %endif
 
 %clean
   rm -rf %{buildroot}
 
-%package devel
-License:        GPLv2+
-Summary:        Graph Theory IDE for professors and students
-Group:          Development/Libraries/KDE
-Requires:       rocs = %{version}
-
-%description devel
-A Graph Theory IDE for professors and students:
-
-%post devel -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
+%post   devel -p /sbin/ldconfig
 %postun devel -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/rocs/
-%_kde4_libdir/librocslib.so
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%{_kde4_libdir}/librocslib.so
 
 %files
 %defattr(-,root,root)
-%_kde4_bindir/rocs
-%_kde4_modulesdir/rocs_*
-%_kde4_libdir/librocslib.so.*
-%_kde4_applicationsdir/rocs.desktop
-%_kde4_htmldir/en/rocs/
-%_kde4_appsdir/rocs/
-%_kde4_sharedir/config.kcfg/rocs.kcfg
-%_kde4_configdir/rocs.knsrc
-%_kde4_servicesdir/rocs_*
-%_kde4_servicetypesdir/*.desktop
+%{_kde4_applicationsdir}/rocs.desktop
+%{_kde4_appsdir}/rocs/
+%{_kde4_bindir}/rocs
+%config %{_kde4_configdir}/rocs.knsrc
+%config %{_kde4_configkcfgdir}/rocs.kcfg
+%doc %{_kde4_htmldir}/en/rocs/
+%{_kde4_libdir}/librocslib.so.*
+%{_kde4_modulesdir}/rocs_*
+%{_kde4_servicesdir}/rocs_*
+%{_kde4_servicetypesdir}/*.desktop
 
 %changelog