From ab0ef120d72dfba0c3d871f4edd953264f3566a8fdf2c8c3076daec4b1475808 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 1 Mar 2018 11:12:01 +0000 Subject: [PATCH] Accepting request 580210 from GNOME:Next spdx3 OBS-URL: https://build.opensuse.org/request/show/580210 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/uhttpmock?expand=0&rev=10 --- uhttpmock.changes | 5 +++++ uhttpmock.spec | 16 ++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/uhttpmock.changes b/uhttpmock.changes index 8c60bd8..11801a1 100644 --- a/uhttpmock.changes +++ b/uhttpmock.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 11:46:14 UTC 2018 - dimstar@opensuse.org + +- Use SPDX3.0 license tags and package COPYING as %license. + ------------------------------------------------------------------- Sun Jul 12 13:09:09 UTC 2015 - zaitor@opensuse.org diff --git a/uhttpmock.spec b/uhttpmock.spec index 8077571..2922ced 100644 --- a/uhttpmock.spec +++ b/uhttpmock.spec @@ -1,7 +1,7 @@ # # spec file for package uhttpmock # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -21,11 +21,12 @@ Name: uhttpmock Version: 0.5.0 Release: 0 Summary: HTTP web service mocking library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Tools Url: https://gitlab.com/uhttpmock/uhttpmock Source0: https://tecnocode.co.uk/downloads/uhttpmock/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) >= 2.36.0 BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gobject-2.0) @@ -54,7 +55,6 @@ uhttpmock is a project for mocking web service APIs which use HTTP or HTTPS. It provides a library, libuhttpmock, which implements recording and playback of HTTP request/response traces. - %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -75,24 +75,20 @@ make %{?_smp_mflags} %install %make_install -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %post -n libuhttpmock-0_0-0 -p /sbin/ldconfig - %postun -n libuhttpmock-0_0-0 -p /sbin/ldconfig %files -n libuhttpmock-0_0-0 -%defattr(-,root,root) -%doc README COPYING NEWS AUTHORS +%license COPYING +%doc README NEWS AUTHORS %{_libdir}/libuhttpmock-0.0.so.* %files -n typelib-1_0-Uhm-0_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Uhm-0.0.typelib %files devel -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libuhttpmock-0.0/ %{_libdir}/*.so %{_includedir}/libuhttpmock-0.0/