commit brltty for openSUSE:Factory
Hello community, here is the log from the commit of package brltty for openSUSE:Factory checked in at 2014-06-02 07:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brltty (Old) and /work/SRC/openSUSE:Factory/.brltty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brltty" Changes: -------- --- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2014-03-20 07:03:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brltty.new/brltty.changes 2014-06-02 07:00:19.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 19 15:10:37 UTC 2014 - schwab@suse.de + +- remove ocaml conditional, it is always available now +- don't fail if brlapi.cmxa wasn't built + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brltty.spec ++++++ --- /var/tmp/diff_new_pack.qKfEi2/_old 2014-06-02 07:00:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qKfEi2/_new 2014-06-02 07:00:21.000000000 +0200 @@ -21,11 +21,6 @@ %define api_version 0.6.1 %define sover 0_6 %define soname libbrlapi%{sover} -%ifarch aarch64 -%bcond_with ocaml -%else -%bcond_without ocaml -%endif Name: brltty Version: 5.0 @@ -43,30 +38,28 @@ BuildRequires: bison BuildRequires: byacc -BuildRequires: libbraille-devel -BuildRequires: linux-glibc-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bluez) -BuildRequires: pkgconfig(dbus-1) BuildRequires: espeak-devel BuildRequires: fdupes -BuildRequires: gpm-devel BuildRequires: gettext +BuildRequires: gpm-devel BuildRequires: java-devel BuildRequires: jpackage-utils -BuildRequires: pkgconfig(speech-dispatcher) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: libbraille-devel +BuildRequires: linux-glibc-devel BuildRequires: ncurses-devel -%if %{with ocaml} BuildRequires: ocaml -%endif BuildRequires: pkg-config BuildRequires: python-Cython BuildRequires: python-devel BuildRequires: systemd-rpm-macros BuildRequires: tcl-devel BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(speech-dispatcher) %{?systemd_requires} %description @@ -315,16 +308,14 @@ # ghost brlapi.key touch %{buildroot}%{_sysconfdir}/brlapi.key # Don't include source files in binary package -rm %{buildroot}%{_libdir}/ocaml/brlapi/brlapi.{mli,cmxa} +rm -f %{buildroot}%{_libdir}/ocaml/brlapi/brlapi.{mli,cmxa} # Install systemd unit file mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sbindir} install -m644 Autostart/Systemd/%{name}.service %{buildroot}%{_unitdir} ln -sf ../../%{_unitdir}/%{name}.service %{buildroot}%{_sbindir}/rc%{name} %{__rm} %{buildroot}%{_libdir}/libbrlapi.a -%if %{with ocaml} %{__rm} %{buildroot}%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a -%endif # fix missing executable bits test ! -x %{buildroot}%{_bindir}/brltty-config chmod a+x %{buildroot}%{_bindir}/brltty-config @@ -350,7 +341,6 @@ %{__mkdir} -p %{buildroot}%{tcl_sitearch} %{__mv} %{buildroot}%{_libdir}/brlapi-%{api_version} %{buildroot}%{tcl_sitearch}/ - %pre -n %{soname} getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null @@ -455,12 +445,10 @@ %{_jnidir}/libbrlapi_java.so %{_javadir}/brlapi.jar -%if %{with ocaml} %files -n ocaml-brlapi %defattr(-, root, root) %{_libdir}/ocaml/brlapi/ %{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so* -%endif %files -n python-brlapi %defattr(-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de