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

baggins baggins at pld-linux.org
Sun Aug 25 22:02:08 CEST 2019


commit 874c077fe025905f1f47bee8dfea2fa45e45b073
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 25 22:01:26 2019 +0200

    - up to 0.8.1

 xfce4-xkb-plugin.spec | 21 ++++++++++++++-------
 xklavier.patch        | 11 +++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/xfce4-xkb-plugin.spec b/xfce4-xkb-plugin.spec
index 6795220..e126dac 100644
--- a/xfce4-xkb-plugin.spec
+++ b/xfce4-xkb-plugin.spec
@@ -1,18 +1,19 @@
 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.7.1
-Release:	3
+Version:	0.8.1
+Release:	1
 License:	BSD-like
 Group:		X11/Applications
-Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5:	2f68e0d53baf68ecc1a7165ad33c26a9
+Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	72530bf59d7cd902326469e5a7a9892b
+Patch0:		xklavier.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
 BuildRequires:	garcon-devel
 BuildRequires:	gettext-tools
 BuildRequires:	librsvg-devel >= 2.18.0
 BuildRequires:	libwnck-devel >= 2.12.0
-BuildRequires:	libxklavier-devel >= 4.0
+BuildRequires:	libxklavier-devel >= 5.3
 BuildRequires:	pkgconfig
 BuildRequires:	xfce4-dev-tools >= 4.12.0
 BuildRequires:	xfce4-panel-devel >= 4.12.0
@@ -31,8 +32,14 @@ przedstawiającą flagę narodową.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-static
 
@@ -54,6 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING README
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-xkb-plugin
-%{_datadir}/xfce4/panel-plugins/xkb-plugin.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libxkb.so
+%{_datadir}/xfce4/panel/plugins/xkb.desktop
 %{_datadir}/xfce4/xkb
diff --git a/xklavier.patch b/xklavier.patch
new file mode 100644
index 0000000..4185202
--- /dev/null
+++ b/xklavier.patch
@@ -0,0 +1,11 @@
+--- 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/874c077fe025905f1f47bee8dfea2fa45e45b073



More information about the pld-cvs-commit mailing list