From db67dd353a53c4c4b85ab7052beaabf43e5a9c312871cb55572c86329e900486 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 18 Sep 2014 09:03:57 +0000
Subject: [PATCH] Accepting request 250056 from
 home:jengelh:branches:devel:libraries:c_c++

- Use %cmake
- Improve on RPM group classification
- Drop strange Recommends:

OBS-URL: https://build.opensuse.org/request/show/250056
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=27
---
 libical.changes | 11 +++++++++++
 libical.spec    | 33 +++++++++++++--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/libical.changes b/libical.changes
index 05cb277..8b3883c 100644
--- a/libical.changes
+++ b/libical.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 18 08:28:26 UTC 2014 - jengelh@inai.de
+
+- Use %cmake macros so that %optflags reliably lands on the build
+  command lines
+- Improve on RPM group classification
+- Drop strange Recommends: from libical-doc to libical1
+  (the latter does not offer any directly-usable feature when
+  the docs are installed).
+- Documentation subpackage should be noarch
+
 -------------------------------------------------------------------
 Sat Jun 15 20:38:04 UTC 2013 - schwab@linux-m68k.org
 
diff --git a/libical.spec b/libical.spec
index a248019..8d90f73 100644
--- a/libical.spec
+++ b/libical.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libical
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@ Group:          Development/Libraries/C and C++
 Url:            http://sourceforge.net/projects/freeassociation/
 Source:         libical-%{version}.tar.gz
 Source2:        baselibs.conf
-BuildRequires:  cmake
+BuildRequires:  cmake >= 2.4
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -39,7 +39,7 @@ component properties, parameters, and subcomponents.
 
 %package -n %{name}%{sonum}
 Summary:        An Implementation of Basic iCAL Protocols
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 
@@ -50,7 +50,7 @@ parses iCal components and provides a C API for manipulating the
 component properties, parameters, and subcomponents.
 
 %package devel
-Summary:        An implementation of basic iCAL protocols
+Summary:        Development files for libical, an implementation of basic iCAL protocols
 Group:          Development/Libraries/C and C++
 Requires:       %{name}%{sonum} = %{version}
 
@@ -61,7 +61,7 @@ parses iCal components and provides a C API for manipulating the
 component properties, parameters, and subcomponents.
 
 %package devel-static
-Summary:        An implementation of basic iCAL protocols
+Summary:        Additional static library for development with libical
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 
@@ -72,9 +72,11 @@ parses iCal components and provides a C API for manipulating the
 component properties, parameters, and subcomponents.
 
 %package doc
-Summary:        An Implementation of Basic iCAL Protocols
-Group:          Development/Libraries/C and C++
-Recommends:     %{name}%{sonum} = %{version}
+Summary:        Example source code for libical-using programs
+Group:          Documentation/Other
+%if 0%{?suse_version} >= 1120
+BuildArch:      noarch
+%endif
 
 %description doc
 Libical is an open source implementation of the IETF's iCalendar
@@ -86,20 +88,11 @@ component properties, parameters, and subcomponents.
 %setup -q
 
 %build
-mkdir build
-pushd build
-cmake  -DCMAKE_SKIP_RPATH=ON \
-       -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-       -DLIB_SUFFIX="$(echo %_lib | cut -b4-)" \
-       -DCMAKE_C_FLAGS="%{optflags}" \
-       ..
-make
-popd
+%cmake
+make %{?_smp_mflags}
 
 %install
-pushd build
-%make_install
-popd
+%cmake_install
 rm examples/CMakeLists.txt
 rm examples/Makefile.*