From 407222a12072b39ded1370985f24add35467836ca734afa328bc18f606359e35 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Thu, 1 Mar 2018 01:48:02 +0000 Subject: [PATCH] Accepting request 581180 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581180 OBS-URL: https://build.opensuse.org/package/show/M17N/uchardet?expand=0&rev=6 --- uchardet.changes | 5 +++++ uchardet.spec | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/uchardet.changes b/uchardet.changes index cc653e2..e0c7d39 100644 --- a/uchardet.changes +++ b/uchardet.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 20:22:45 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Wed Feb 8 23:51:40 UTC 2017 - dimstar@opensuse.org diff --git a/uchardet.spec b/uchardet.spec index 43cf2f4..66635a0 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,7 +1,7 @@ # # spec file for package uchardet # -# Copyright (c) 2013 SUSE LINUX Products 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 @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define major 0 +%define major 0 Name: uchardet Version: 0.0.6 Release: 0 -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Universal Charset Detection Library -Url: https://www.freedesktop.org/wiki/Software/uchardet/ +License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Group: Productivity/Text/Utilities +URL: https://www.freedesktop.org/wiki/Software/uchardet/ Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description uchardet is a C language binding of the original C++ implementation of @@ -93,9 +92,10 @@ rm -f %{buildroot}%{_libdir}/libuchardet.a %files %defattr(-,root,root,-) -%doc AUTHORS COPYING +%license COPYING +%doc AUTHORS %{_bindir}/%{name} -%doc %{_mandir}/man?/* +%{_mandir}/man?/* %files -n libuchardet%{major} %defattr(-,root,root,-) @@ -103,7 +103,8 @@ rm -f %{buildroot}%{_libdir}/libuchardet.a %files -n libuchardet-devel %defattr(-,root,root,-) -%doc AUTHORS COPYING +%license COPYING +%doc AUTHORS %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc