From 3bc8bea59f2e51daed3d8e9923719702fccdc651a68e1e2d930b32a6fb1d9748 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 1 Mar 2018 10:22:22 +0000 Subject: [PATCH] Accepting request 581241 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581241 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=45 --- libical.changes | 5 +++++ libical.spec | 22 ++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/libical.changes b/libical.changes index 3dda994..1bf03dd 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:35:25 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Jun 19 19:54:50 UTC 2017 - mgorse@suse.com diff --git a/libical.spec b/libical.spec index 9061787..5ce79cc 100644 --- a/libical.spec +++ b/libical.spec @@ -1,7 +1,7 @@ # # spec file for package libical # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,14 @@ # +%define sonum 2 Name: libical Version: 2.0.0 Release: 0 -%define sonum 2 Summary: An Implementation of Basic iCAL Protocols -License: MPL-1.0 or LGPL-2.1 +License: MPL-1.0 OR LGPL-2.1-only Group: Development/Libraries/C and C++ -Url: http://sourceforge.net/projects/freeassociation/ - +URL: http://sourceforge.net/projects/freeassociation/ #Git-Clone: https://github.com/libical/libical Source: https://github.com/libical/libical/releases/download/v%{version}/%{name}-%{version}.tar.gz Source2: baselibs.conf @@ -41,9 +40,8 @@ Patch5: libical-timezone-use-after-free.patch Patch6: libical-boo1015964-use-after-free.patch BuildRequires: cmake >= 2.4 BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(icu-i18n) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libical is an open source implementation of the IETF's iCalendar @@ -100,7 +98,7 @@ component properties, parameters, and subcomponents. %prep %setup -q -%patch -P 1 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -116,27 +114,23 @@ make -j1 rm examples/CMakeLists.txt %post -n %{name}%{sonum} -p /sbin/ldconfig - %postun -n %{name}%{sonum} -p /sbin/ldconfig %files -n %{name}%{sonum} -%defattr(-,root,root) -%doc AUTHORS ReadMe.txt ReleaseNotes.txt COPYING LICENSE TEST THANKS TODO +%license COPYING +%doc AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/libical.pc %{_includedir}/libical/ %{_libdir}/cmake/LibIcal/ %files devel-static -%defattr(-,root,root) %{_libdir}/*.a %files doc -%defattr(-,root,root) %doc doc/*.txt %doc examples/