|
|
@@ -2,13 +2,15 @@ Summary: library providing high-level API for X Keyboard Extension
|
|
|
Summary(ja): X キーボード拡張の高レベル API を提供するライブラリ
|
|
|
Name: libxklavier
|
|
|
Version: 5.0
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
License: LGPL
|
|
|
Group: System Environment/Libraries
|
|
|
URL: http://www.freedesktop.org/wiki/Software/LibXklavier
|
|
|
|
|
|
Source: %{name}-%{version}.tar.bz2
|
|
|
-Patch0: libxklavier-3.1-crash.patch
|
|
|
+# http://bugs.freedesktop.org/show_bug.cgi?id=22687
|
|
|
+Patch0: flags.patch
|
|
|
+Patch2: catch-more-xerrors.patch
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: doxygen
|
|
|
@@ -35,11 +37,16 @@ Libraries, include files, etc you can use to develop libxklavier applications.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#patch0 -p1 -b .crash
|
|
|
+%patch0 -p1 -b .flags
|
|
|
+%patch2 -p1 -b .catch-more-xerrors
|
|
|
|
|
|
%build
|
|
|
|
|
|
-%configure --with-xkb-base=/usr/share/X11/xkb --disable-static
|
|
|
+%configure \
|
|
|
+ --disable-static \
|
|
|
+ --with-xkb-base='%{_datadir}/X11/xkb' \
|
|
|
+ --with-xkb-bin-base='%{_bindir}'
|
|
|
+
|
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
@@ -47,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%makeinstall
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|
|
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|
|
|
|
|
%clean
|
|
|
rm -rf %{buildroot}
|
|
|
@@ -60,19 +67,21 @@ rm -rf %{buildroot}
|
|
|
%defattr(-, root, root)
|
|
|
%doc AUTHORS ChangeLog NEWS README COPYING.LIB
|
|
|
%{_libdir}/lib*.so.*
|
|
|
-#{_datadir}/libxklavier
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-, root, root)
|
|
|
%doc doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.css
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
-#{_libdir}/*.a
|
|
|
%{_libdir}/*.so
|
|
|
%{_includedir}/*
|
|
|
%{_datadir}/gtk-doc/html/libxklavier/
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Apr 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.0-2
|
|
|
+- import patch0,2 from fedora
|
|
|
+- add "--with-xkb-bin-base" configure option
|
|
|
+
|
|
|
* Sun Mar 14 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.0-1
|
|
|
- new upstream release
|
|
|
- add BuildRequires: libX11-devel, xorg-x11-proto-devel
|
daisuke