diff --git a/libgnomekbd.changes b/libgnomekbd.changes index ca364d0..3462737 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:34:49 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Tue Sep 12 10:14:57 UTC 2017 - dimstar@opensuse.org diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 4cb7c66..6a2f2ff 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -1,7 +1,7 @@ # # spec file for package libgnomekbd # -# 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,9 +20,9 @@ Name: libgnomekbd Version: 3.26.0 Release: 0 Summary: GNOME Keyboard Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/GNOME -Url: http://www.gnome.org/ +URL: http://www.gnome.org/ Source: http://download.gnome.org/sources/libgnomekbd/3.26/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE Patch0: libgnomekbd-default-group-switch.patch @@ -30,17 +30,17 @@ Patch0: libgnomekbd-default-group-switch.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: intltool +BuildRequires: pkgconfig BuildRequires: translation-update-upstream -%if 0%{?BUILD_FROM_VCS} -BuildRequires: gnome-common -%endif BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libxklavier) >= 5.2 Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +%endif %description GNOME keyboard library, utility and applet. @@ -54,6 +54,7 @@ Requires: %{name} = %{version} GNOME keyboard library, utility and applet. %lang_package + %prep %setup -q translation-update-upstream @@ -65,20 +66,17 @@ translation-update-upstream %build %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -%{__rm} -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - %post /sbin/ldconfig %glib2_gsettings_schema_post @@ -90,9 +88,9 @@ rm -rf %{buildroot} %desktop_database_postun %files -%defattr(-, root, root) # NEWS README are empty -%doc AUTHORS COPYING.LIB ChangeLog ChangeLog.libgswitchit ChangeLog.libkbdraw +%license COPYING.LIB +%doc AUTHORS ChangeLog ChangeLog.libgswitchit ChangeLog.libkbdraw %{_bindir}/gkbd-keyboard-display %{_libdir}/*so.* %{_libdir}/girepository-1.0/Gkbd-3.0.typelib @@ -109,7 +107,6 @@ rm -rf %{buildroot} %files lang -f %{name}.lang %files devel -%defattr(-, root, root) %{_includedir}/libgnomekbd/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc