X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=bbkeys.spec;h=790e72a9366ceca2fcde20acb0419af1e115ee27;hb=5a9a82571b8c05b27984828fda26f5d2d9d75d51;hp=867cb17be1b2633e5ff395f8d99a8430cd8c1226;hpb=a9a6740421cc2e23878dada95c6dc4d4c6bd5009;p=packages%2Fbbkeys.git

diff --git a/bbkeys.spec b/bbkeys.spec
index 867cb17..790e72a 100644
--- a/bbkeys.spec
+++ b/bbkeys.spec
@@ -1,27 +1,29 @@
 Summary:	bbkeys, a completely configurable key-combo grabber for blackbox
 Summary(pl):	Ca³kowicie konfigurowalny przechwytywacz klawiszy dla blackboksa
 Name:		bbkeys
-Version:	0.8.4
-Release:	3
+Version:	0.8.6
+Release:	2
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/bbkeys/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/bbkeys/%{name}-%{version}.tar.gz
 Patch0:		%{name}-sysconfdir.patch
+Patch1:		%{name}-ac_fixes.patch
+Patch2:		%{name}-etc_dir.patch
 URL:		http://bbkeys.sourceforge.net/
+BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	XFree86-devel
+BuildRequires:	libstdc++-devel
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
+%define		_sysconfdir		/etc/default
 
 %description
 bbkeys is a configurable key-grabber designed for the blackbox window
 manager which is written by Brad Hughes. It is based on the bbtools
 object code created by John Kennis and re-uses some of the blackbox
 window manager classes as well. bbkeys is easily configurable via
-directly hand-editting the user's ~/.bbkeysrc file, or by using the
+directly hand-editing the user's ~/.bbkeysrc file, or by using the
 provided gui configuration tool, bbkeysconf (for lack of a better name
 yet).
 
@@ -30,33 +32,36 @@ bbkeys jest konfigurowalnym programem do przechwytywania klawiszy
 zaprojektowanym dla zarz±dcy okien blackbox, napisanego przez Brada
 Hughesa. Bazuje na kodzie obiektowym bbtools napisanym przez Johna
 Kennisa, u¿ywa tak¿e niektórych klas blackboksa. bbkeys s± ³atwo
-konfigurowalne przez bezpo¶redni±edycjê pliku u¿ytkownika ~/.bbkeysrc,
+konfigurowalne przez bezpo¶redni± edycjê pliku u¿ytkownika ~/.bbkeysrc,
 albo poprzez graficzny interfejs bbkeysconf (z braku lepszej nazwy).
 
 %prep
-%setup -q
+%setup  -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-aclocal
-autoconf
-automake -a -c -f
+rm -f missing
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 %configure
-%{__make} CXX="%{__cc}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 
-gzip -9nf README AUTHORS ChangeLog NEWS TODO
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc README AUTHORS ChangeLog NEWS TODO
+%dir %{_sysconfdir}/bbtools
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/bbtools/%{name}.*
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/*/*
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/bbtools/%{name}.*