rpms/brltty/devel brltty.spec,1.25,1.26

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/pkgs/rpms/brltty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12725

Modified Files:
	brltty.spec 
Log Message:
* Wed Jan 09 2008 Tomas Janousek <tjanouse at redhat.com> - 3.9-1.1
- specfile update to comply with tcl packaging guidelines



Index: brltty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- brltty.spec	7 Jan 2008 11:40:14 -0000	1.25
+++ brltty.spec	9 Jan 2008 16:35:36 -0000	1.26
@@ -1,12 +1,15 @@
 %define pkg_version 3.9
 %define api_version 0.5.1
 
-%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-%define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")
+%{!?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")}
+
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: brltty
 Version: %{pkg_version}
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -81,7 +84,7 @@
 Group: Development/System
 License: LGPLv2+
 Requires: brlapi = %{api_version}
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel tcl
 Summary: Tcl binding for BrlAPI.
 %description -n tcl-brlapi
 This package provides the Tcl binding for BrlAPI.
@@ -197,8 +200,8 @@
 
 %files -n tcl-brlapi
 %defattr(-,root,root)
-%{_libdir}/tcl*/brlapi-%{api_version}/libbrlapi_tcl.so
-%{_libdir}/tcl*/brlapi-%{api_version}/pkgIndex.tcl
+%{tcl_sitearch}/brlapi-%{api_version}/libbrlapi_tcl.so
+%{tcl_sitearch}/brlapi-%{api_version}/pkgIndex.tcl
 
 %files -n python-brlapi
 %defattr(-,root,root)
@@ -212,6 +215,9 @@
 
 
 %changelog
+* Wed Jan 09 2008 Tomas Janousek <tjanouse at redhat.com> - 3.9-1.1
+- specfile update to comply with tcl packaging guidelines
+
 * Mon Jan 07 2008 Tomas Janousek <tjanouse at redhat.com> - 3.9-1
 - update to latest upstream (3.9)