From 93bae0972723e33cd59f9df8e1b5587fbcbd261577eb894c3c07debf119ef60d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 13:57:18 +0000 Subject: [PATCH 1/2] Accepting request 581266 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581266 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libxklavier?expand=0&rev=36 --- libxklavier.changes | 5 +++++ libxklavier.spec | 24 ++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/libxklavier.changes b/libxklavier.changes index f3d185d..bb83c09 100644 --- a/libxklavier.changes +++ b/libxklavier.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:36:47 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Feb 1 15:19:46 UTC 2016 - dimstar@opensuse.org diff --git a/libxklavier.spec b/libxklavier.spec index 92bc55b..830ba78 100644 --- a/libxklavier.spec +++ b/libxklavier.spec @@ -1,7 +1,7 @@ # # spec file for package libxklavier # -# 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 @@ -20,23 +20,22 @@ Name: libxklavier Version: 5.3 Release: 0 Summary: Library with X keyboard related functions -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Development/Libraries/X11 -Url: http://www.freedesktop.org/Software/LibXklavier +URL: http://www.freedesktop.org/Software/LibXklavier Source: http://download.gnome.org/sources/libxklavier/5.3/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: doxygen BuildRequires: gobject-introspection-devel >= 1.30 BuildRequires: gtk-doc BuildRequires: iso-codes-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbfile) Requires: xkbcomp -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library allows you to simplify XKB-related development. @@ -86,40 +85,33 @@ This library allows you to simplify XKB-related development. %build %configure \ --with-pic \ - --with-xkb-base=/usr/share/X11/xkb \ + --with-xkb-base=%{_datadir}/X11/xkb \ --with-xkb-bin-base=%{_bindir} \ --disable-static make %{?_smp_mflags} %install %make_install -rm -v %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %post -n libxklavier16 -p /sbin/ldconfig - %postun -n libxklavier16 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -n libxklavier16 -%defattr(-,root,root) -%doc AUTHORS COPYING.LIB CREDITS ChangeLog NEWS README +%license COPYING.LIB +%doc AUTHORS CREDITS ChangeLog NEWS README %{_libdir}/libxklavier.so.* %files -n typelib-1_0-Xkl-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Xkl-1.0.typelib %files devel -%defattr (-, root, root) %{_includedir}/libxklavier/ %{_libdir}/libxklavier.so %{_libdir}/pkgconfig/libxklavier.pc %{_datadir}/gir-1.0/Xkl-1.0.gir %files doc -%defattr (-, root, root) %{_datadir}/gtk-doc/html/libxklavier %changelog From 8101a8c53224cbf7baab3dcc732b6f19a93a10a4aebf8b1b93f3ce3a472c9353 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 15:54:25 +0000 Subject: [PATCH 2/2] Accepting request 583037 from home:jengelh:branches:GNOME:Factory - Fix RPM groups. Update summaries. Remove --with-pic. OBS-URL: https://build.opensuse.org/request/show/583037 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libxklavier?expand=0&rev=37 --- libxklavier.changes | 5 +++++ libxklavier.spec | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libxklavier.changes b/libxklavier.changes index bb83c09..82869aa 100644 --- a/libxklavier.changes +++ b/libxklavier.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 5 15:43:03 UTC 2018 - jengelh@inai.de + +- Fix RPM groups. Update summaries. Remove --with-pic. + ------------------------------------------------------------------- Wed Feb 28 16:36:47 UTC 2018 - dimstar@opensuse.org diff --git a/libxklavier.spec b/libxklavier.spec index 830ba78..4355324 100644 --- a/libxklavier.spec +++ b/libxklavier.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Library with X keyboard related functions License: LGPL-2.0-or-later Group: Development/Libraries/X11 -URL: http://www.freedesktop.org/Software/LibXklavier +Url: http://www.freedesktop.org/Software/LibXklavier Source: http://download.gnome.org/sources/libxklavier/5.3/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: doxygen @@ -41,7 +41,7 @@ Requires: xkbcomp This library allows you to simplify XKB-related development. %package devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for libxklavier Group: Development/Libraries/X11 Requires: %{name} = %{version} Requires: glibc-devel @@ -62,7 +62,7 @@ Obsoletes: %{name} < %{version} This library allows you to simplify XKB-related development. %package -n typelib-1_0-Xkl-1_0 -Summary: Library with X keyboard related functions -- Introspection bindings +Summary: Introspection bindings for libxklavier Group: System/Libraries %description -n typelib-1_0-Xkl-1_0 @@ -73,7 +73,7 @@ libxklavier. %package doc Summary: Additional Package Documentation for libxklavier -Group: Development/Libraries/X11 +Group: Documentation/HTML Requires: %{name} = %{version} %description doc @@ -84,7 +84,6 @@ This library allows you to simplify XKB-related development. %build %configure \ - --with-pic \ --with-xkb-base=%{_datadir}/X11/xkb \ --with-xkb-bin-base=%{_bindir} \ --disable-static