From 394fced88f74025528041a226eee37bebb31aa7a00347fb4bfde4e057be6d8de Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 09:57:54 +0000 Subject: [PATCH] Accepting request 583503 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583503 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairomm1_0?expand=0&rev=3 --- cairomm1_0.changes | 5 +++++ cairomm1_0.spec | 25 +++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cairomm1_0.changes b/cairomm1_0.changes index 01f580a..a9bb6a7 100644 --- a/cairomm1_0.changes +++ b/cairomm1_0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:24:00 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Fri Dec 2 14:39:49 UTC 2016 - dimstar@opensuse.org diff --git a/cairomm1_0.spec b/cairomm1_0.spec index cc76364..7205164 100644 --- a/cairomm1_0.spec +++ b/cairomm1_0.spec @@ -1,7 +1,7 @@ # -# spec file for package cairomm +# spec file for package cairomm1_0 # -# Copyright (c) 2016 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,23 +16,23 @@ # -Name: cairomm1_0 %define _name cairomm +Name: cairomm1_0 Version: 1.12.2 Release: 0 Summary: C++ Interface for Cairo -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/GNOME -Url: http://cairographics.org +URL: http://cairographics.org Source: http://cairographics.org/releases/%{_name}-%{version}.tar.gz Source99: baselibs.conf # needs doxygen for the documentation BuildRequires: doxygen BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(sigc++-2.0) >= 2.5.1 -BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides a C++ interface for Cairo. @@ -67,20 +67,18 @@ This package provides a C++ interface for Cairo. make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n libcairomm-1_0-1 -p /sbin/ldconfig - %postun -n libcairomm-1_0-1 -p /sbin/ldconfig %files -n libcairomm-1_0-1 -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_libdir}/*.so.* %files devel -%defattr (-, root, root) %{_libdir}/*.so %dir %{_libdir}/cairomm-1.0/ %{_libdir}/cairomm-1.0/include @@ -88,7 +86,6 @@ rm -f %{buildroot}%{_libdir}/*.la %{_includedir}/* %files doc -%defattr (-, root, root) %{_datadir}/devhelp/books/cairomm-1.0 %{_datadir}/doc/cairomm-1.0 # Avoid BuildRequires on devhelp