Spec file cleanup for recent rpmbuild

This commit is contained in:
Kalev Lember 2013-04-04 14:32:48 +02:00
parent 39225410ad
commit 424e2591fa

View File

@ -1,7 +1,6 @@
%define pkg_version 4.3 %define pkg_version 4.3
%define api_version 0.5.6 %define api_version 0.5.6
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")} %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
@ -26,7 +25,6 @@ Patch1: brltty-autoconf-quote.patch
#Patch2: brltty-4.2-S_ISCHR.patch #Patch2: brltty-4.2-S_ISCHR.patch
Patch3: brltty-parallel.patch Patch3: brltty-parallel.patch
Patch4: brltty-loadLibrary.patch Patch4: brltty-loadLibrary.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Summary: Braille display driver for Linux/Unix Summary: Braille display driver for Linux/Unix
BuildRequires: byacc glibc-kernheaders BuildRequires: byacc glibc-kernheaders
BuildRequires: autoconf BuildRequires: autoconf
@ -201,7 +199,6 @@ while read file; do
done done
%install %install
rm -rf $RPM_BUILD_ROOT
# does not seem to be parallel safe # does not seem to be parallel safe
make install JAVA_JAR_DIR=%{_jnidir} \ make install JAVA_JAR_DIR=%{_jnidir} \
JAVA_JNI_DIR=%{_libdir}/brltty \ JAVA_JNI_DIR=%{_libdir}/brltty \
@ -219,9 +216,6 @@ mv Documents/BrlAPIref/{html,BrlAPIref}
# Don't want static lib # Don't want static lib
rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
%clean
rm -rf $RPM_BUILD_ROOT
%post %post
devices="/dev/vcsa /dev/vcsa0 /dev/vcc/a" devices="/dev/vcsa /dev/vcsa0 /dev/vcc/a"
install=true install=true
@ -247,7 +241,6 @@ exit 0
%postun -n brlapi -p /sbin/ldconfig %postun -n brlapi -p /sbin/ldconfig
%files %files
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/brltty.conf %config(noreplace) %{_sysconfdir}/brltty.conf
%{_sysconfdir}/brltty/ %{_sysconfdir}/brltty/
%{_bindir}/brltty %{_bindir}/brltty
@ -280,7 +273,6 @@ exit 0
%{_libdir}/brltty/libbrlttyxas.so %{_libdir}/brltty/libbrlttyxas.so
%files -n brlapi %files -n brlapi
%defattr(-,root,root)
%{_bindir}/vstp %{_bindir}/vstp
%{_bindir}/xbrlapi %{_bindir}/xbrlapi
%{_libdir}/brltty/libbrlttybba.so %{_libdir}/brltty/libbrlttybba.so
@ -291,7 +283,6 @@ exit 0
%doc %{_mandir}/man1/vstp.* %doc %{_mandir}/man1/vstp.*
%files -n brlapi-devel %files -n brlapi-devel
%defattr(-,root,root)
%{_prefix}/%{_lib}/libbrlapi.so %{_prefix}/%{_lib}/libbrlapi.so
%{_includedir}/brltty %{_includedir}/brltty
%{_includedir}/brlapi*.h %{_includedir}/brlapi*.h
@ -299,22 +290,18 @@ exit 0
%doc Documents/BrlAPIref/BrlAPIref/ %doc Documents/BrlAPIref/BrlAPIref/
%files -n tcl-brlapi %files -n tcl-brlapi
%defattr(-,root,root)
%{tcl_sitearch}/brlapi-%{api_version} %{tcl_sitearch}/brlapi-%{api_version}
%files -n python-brlapi %files -n python-brlapi
%defattr(-,root,root)
%{python_sitearch}/brlapi.so %{python_sitearch}/brlapi.so
%{python_sitearch}/Brlapi-%{api_version}-py%{pyver}.egg-info %{python_sitearch}/Brlapi-%{api_version}-py%{pyver}.egg-info
%files -n brlapi-java %files -n brlapi-java
%defattr(-,root,root)
%{_libdir}/brltty/libbrlapi_java.so %{_libdir}/brltty/libbrlapi_java.so
%{_jnidir}/brlapi.jar %{_jnidir}/brlapi.jar
%if 0%{?with_ocaml} %if 0%{?with_ocaml}
%files -n ocaml-brlapi %files -n ocaml-brlapi
%defattr(-,root,root)
%{_prefix}/%{_lib}/ocaml/brlapi/ %{_prefix}/%{_lib}/ocaml/brlapi/
%{_prefix}/%{_lib}/ocaml/stublibs/ %{_prefix}/%{_lib}/ocaml/stublibs/
%endif %endif