diff --git a/brltty.spec b/brltty.spec index 1a78e4f..7d8fc9f 100644 --- a/brltty.spec +++ b/brltty.spec @@ -7,9 +7,6 @@ %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %define tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} -%define _exec_prefix %{nil} -%define _libdir /%{_lib} - %define _jnidir %{_prefix}/%{_lib}/java # with speech dispatcher iff on Fedora: @@ -91,6 +88,7 @@ Group: Development/System License: LGPLv2+ Requires: brlapi = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI +Conflicts: filesystem < 3 %description -n brlapi-devel This package provides the header files, static archive, shared object @@ -154,6 +152,9 @@ for i in -I/usr/lib/jvm/java/include{,/linux}; do done # there is no curses packages in BuildRequires, so the package builds # without them in mock; let's express this decision explicitly + +### FIXME: the configure script expects /usr/lib/java to be present + %configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \ %if %{with_speech_dispatcher} --with-speechd=%{_prefix} \ @@ -186,8 +187,6 @@ done rm -rf $RPM_BUILD_ROOT # does not seem to be parallel safe make install -rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so" -ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5 @@ -197,7 +196,7 @@ rm Documents/Manual-*/*/{*.mk,*.made,Makefile*} mv Documents/BrlAPIref/{html,BrlAPIref} # Don't want static lib -rm -rf $RPM_BUILD_ROOT/%{_lib}/libbrlapi.a +rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a %clean rm -rf $RPM_BUILD_ROOT @@ -271,7 +270,7 @@ exit 0 %files -n brlapi-devel %defattr(-,root,root) -%{_prefix}/%{_lib}/libbrlapi.so +%{_libdir}/libbrlapi.so %{_includedir}/brltty %{_includedir}/brlapi*.h %doc %{_mandir}/man3/brlapi_*.3*