X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xbindkeys.spec;h=26a29cc2cd5aa029393a9b0819316a138763d859;hb=HEAD;hp=d9f93302c787762899cee773bffd0c8e89a8f735;hpb=d34fbd8aa456dc2786b9976a9af8655999afba5a;p=packages%2Fxbindkeys.git

diff --git a/xbindkeys.spec b/xbindkeys.spec
index d9f9330..26a29cc 100644
--- a/xbindkeys.spec
+++ b/xbindkeys.spec
@@ -1,27 +1,29 @@
+#
+# Conditional build:
+%bcond_without	guile	# disable scheme/guile configuration file style
+#
 Summary:	Binds keys or mouse buttons to shell commands under X
 Summary(pl.UTF-8):	Przypisywanie poleceniom powłoki przycisków myszy lub klawiatury pod X
 Name:		xbindkeys
-Version:	1.8.2
+Version:	1.8.7
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://hocwp.free.fr/xbindkeys/%{name}-%{version}.tar.gz
-# Source0-md5:	ad1abd56e758bc108493ad0e5b862ad3
-URL:		http://hocwp.free.fr/xbindkeys/xbindkeys.html
+Source0:	http://www.nongnu.org/xbindkeys/%{name}-%{version}.tar.gz
+# Source0-md5:	b5e1a9668ba13ff8673836d1d965d951
+URL:		http://www.nongnu.org/xbindkeys/xbindkeys.html
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-BuildRequires:	guile-devel
+%{?with_guile:BuildRequires:	guile-devel}
 BuildRequires:	libtool
 BuildRequires:	xorg-lib-libX11-devel
-Requires:	tk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 xbindkeys is a program that allows you to launch shell commands with
 your keyboard or mouse under X11. It links commands to keys or mouse
 buttons using a simple configuration file, and is independant of the
-window manager. XMMS panel applet for the KDE panel (kicker). It is
-used to be able
+window manager. 
 
 %description -l pl.UTF-8
 xbindkeys jest programem, który pozwala na uruchamianie poleceń
@@ -30,9 +32,26 @@ przypisuje polecenia przyciskom za pomocą prostego pliku
 konfiguracyjnego, niezależnie od zarządcy okien. Pozwala na
 przechwytywanie takich przycisków jak POWER czy WAKE na klawiaturze.
 
+%package xbindkeys_show
+Summary:	Program to show the grabbing keys used in xbindkeys
+Summary(pl.UTF-8):	Program pokazujący przyciski obsługiwane przez xbindkeys
+Group:		X11/Applications
+Requires:	%{name}
+Requires:	tk
+
+%description xbindkeys_show
+xbindkeys_show is a Tk program that shows the grabbing keys used in
+xbindkeys.
+
+%description xbindkeys_show -l pl.UTF-8
+xbindkeys_show jest programem w Tk, który pokazuje przyciski
+obsługiwane aktualnie przez xbindkeys.
+
 %prep
 %setup -q
 
+touch config.rpath
+
 %build
 rm -f aclocal.m4
 %{__libtoolize}
@@ -41,7 +60,8 @@ rm -f aclocal.m4
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-x
+	--with-x \
+	%{!?with_guile: --disable-guile}
 
 %{__make}
 
@@ -58,5 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/xbindkeys
+%{_mandir}/man1/xbindkeys.1*
+
+%files xbindkeys_show
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xbindkeys_show
-%{_mandir}/man1/xbindkeys*
+%{_mandir}/man1/xbindkeys_show.1*