rpms/comedilib/devel comedilib.spec,1.5,1.6

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/comedilib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30286

Modified Files:
	comedilib.spec 
Log Message:
do not package static lib, fix python macros


Index: comedilib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/comedilib/devel/comedilib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- comedilib.spec	24 Jul 2009 19:15:43 -0000	1.5
+++ comedilib.spec	21 May 2010 15:17:48 -0000	1.6
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		comedilib
 Version:	0.8.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Data Acquisition library for the Comedi driver
 License:	LGPLv2
 Group:		System Environment/Kernel
@@ -37,7 +37,8 @@ acquisition hardware.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking
+# Ruby bindings don't build
+%configure --disable-dependency-tracking --disable-static --disable-ruby-binding
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -46,7 +47,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install 
-#rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/_comedi.la
 
 %post -p /sbin/ldconfig
 
@@ -63,28 +65,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/pcmcia/comedi
 %config(noreplace)%{_sysconfdir}/pcmcia/comedi.*
 %{_libdir}/libcomedi.so.*
-%{python_sitelib}/comedi*
-%exclude %{python_sitelib}/*.pyc
-%exclude %{python_sitelib}/*.pyo
+%{python_sitearch}/comedi*
+%exclude %{python_sitearch}/*.pyc
+%exclude %{python_sitearch}/*.pyo
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libcomedi.so
-%{_libdir}/libcomedi.a
 %{_libdir}/pkgconfig/*
-%{python_sitelib}/_comedi.so
-%exclude %{_libdir}/*.la
-%exclude %{python_sitelib}/*.la
-%exclude %{python_sitelib}/*.a
+%{python_sitearch}/_comedi.so
 %{_includedir}/comedi*
-%{_datadir}/doc/%{name}
-%{_datadir}/doc/%{name}/html/*
-%{_datadir}/doc/%{name}/*.conf
+%{_datadir}/doc/%{name}/
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 21 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.1-6
+- disable static libs
+- fix python macros
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild