[brltty] Don't install the library in /lib now that we have UsrMove

Kalev Lember kalev at fedoraproject.org
Thu Apr 4 21:59:02 UTC 2013


commit d6b55194492e2dd3dedded11690c744938b72d76
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Thu Apr 4 23:52:22 2013 +0200

    Don't install the library in /lib now that we have UsrMove

 brltty.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/brltty.spec b/brltty.spec
index 116dce2..5caf77e 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -13,7 +13,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -228,8 +228,6 @@ make install JAVA_JAR_DIR=%{_jnidir} \
              JAVA_JNI=yes
 popd
 
-rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so"
-ln -s ../../%{_lib}/libbrlapi.so.0.5 "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbrlapi.so"
 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
@@ -308,7 +306,7 @@ exit 0
 %doc %{_mandir}/man1/vstp.*
 
 %files -n brlapi-devel
-%{_prefix}/%{_lib}/libbrlapi.so
+%{_libdir}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
 %doc %{_mandir}/man3/brlapi_*.3*
@@ -331,11 +329,14 @@ exit 0
 
 %if 0%{?with_ocaml}
 %files -n ocaml-brlapi
-%{_prefix}/%{_lib}/ocaml/brlapi/
-%{_prefix}/%{_lib}/ocaml/stublibs/
+%{_libdir}/ocaml/brlapi/
+%{_libdir}/ocaml/stublibs/
 %endif
 
 %changelog
+* Thu Apr 04 2013 Kalev Lember <kalevlember at gmail.com> - 4.5-2
+- Don't install the library in /lib now that we have UsrMove
+
 * Thu Apr 04 2013 Kalev Lember <kalevlember at gmail.com> - 4.5-1
 - Update to 4.5
 - Add Python 3 support (python3-brlapi)


More information about the scm-commits mailing list