[packages/xfce4-xkb-plugin] - up to 0.8.2

mrozowik mrozowik at pld-linux.org
Mon Dec 28 12:23:44 CET 2020


commit 55460c4ca0c5c503f32f0415acc726eadb911273
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Mon Dec 28 11:23:30 2020 +0000

    - up to 0.8.2

 xfce4-xkb-plugin.spec |  9 ++++-----
 xklavier.patch        | 11 -----------
 2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/xfce4-xkb-plugin.spec b/xfce4-xkb-plugin.spec
index e126dac..ac0dde2 100644
--- a/xfce4-xkb-plugin.spec
+++ b/xfce4-xkb-plugin.spec
@@ -1,13 +1,12 @@
 Summary:	Displays and switched the current keyboard layout
 Summary(pl.UTF-8):	Wyświetlanie i przełączanie bieżącego układu klawiatury
 Name:		xfce4-xkb-plugin
-Version:	0.8.1
+Version:	0.8.2
 Release:	1
 License:	BSD-like
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	72530bf59d7cd902326469e5a7a9892b
-Patch0:		xklavier.patch
+# Source0-md5:	8e10f98a44082a2df6a997caab9a0b21
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
 BuildRequires:	garcon-devel
 BuildRequires:	gettext-tools
@@ -32,7 +31,6 @@ przedstawiającą flagę narodową.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -51,7 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{ur_PK,uz at Latn}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hy_AM,hye,ie,ur_PK,uz at Latn}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libxkb.la
 
 %find_lang %{name}
 
diff --git a/xklavier.patch b/xklavier.patch
deleted file mode 100644
index 4185202..0000000
--- a/xklavier.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce4-xkb-plugin-0.8.1/configure.ac~	2017-09-08 22:51:33.000000000 +0200
-+++ xfce4-xkb-plugin-0.8.1/configure.ac	2019-08-25 21:56:39.782881196 +0200
-@@ -81,7 +81,7 @@
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.1])
--XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.4])
-+XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.3])
- XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.40])
- XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.14])
- XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.4.0])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-xkb-plugin.git/commitdiff/55460c4ca0c5c503f32f0415acc726eadb911273



More information about the pld-cvs-commit mailing list