packages: thrift/thrift.spec - fix python packaging - package pkgconfig fil...

[glen]

Author: glen                         Date: Wed Mar 31 06:47:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix python packaging
- package pkgconfig files
- license is apache 2.0

---- Files affected:
packages/thrift:
   thrift.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/thrift/thrift.spec
diff -u packages/thrift/thrift.spec:1.5 packages/thrift/thrift.spec:1.6
--- packages/thrift/thrift.spec:1.5	Wed Mar 31 08:36:40 2010
+++ packages/thrift/thrift.spec	Wed Mar 31 08:47:50 2010
@@ -1,16 +1,20 @@
 # $Revision$, $Date$
 # TODO
 # - BR for java, ruby, perl, more general BR
-# - Separate packages per each lang ?
+# - package -libs & ldconfig
+# - Separate packages per each lang
+# - fix perl: missing vendordir on install
+# - fix java: not installing to %{_javadir}
 # - Fix ruby install
-# - Add Mono ?
-# - thrift-python -> python-trift ?
+# - Add Mono
+# - avoid downloading from net when build building java
+# - libthriftnb.so lacks some libs when linking
 Summary:	Framework for scalable cross-language services development
 Summary(pl.UTF-8):	Szkielet budowania skalowalnych usług dla różnych języków programowania
 Name:		thrift
 Version:	0.2.0
 Release:	0.2
-License:	- enter GPL/GPL v2/GPL v3/LGPL/BSD/BSD-like/other license name here)
+License:	Apache v2.0
 Group:		Development/Libraries
 # http://www.apache.net.pl/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
 Source0:	http://www.apache.net.pl/incubator/thrift/%{version}-incubating/%{name}-%{version}-incubating.tar.gz
@@ -19,6 +23,8 @@
 URL:		http://incubator.apache.org/thrift/
 BuildRequires:	boost-devel >= 1.33.1
 BuildRequires:	python-devel >= 1:2.4
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	zlib-devel >= 1.2.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,16 +54,16 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe thrift.
 
-%package python
+%package -n python-%{name}
 Summary:	Python thrift interface
 Summary(pl.UTF-8):	Interfejs thrift dla Pythona
 Group:		Development/Languages/Python
 Requires:	%{name} = %{version}-%{release}
 
-%description python
+%description -n python-%{name}
 Python thrift interface.
 
-%description python -l pl.UTF-8
+%description -n python-%{name} -l pl.UTF-8
 Interfejs thrift dla Pythona.
 
 %prep
@@ -75,24 +81,40 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/thrift
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}.la
-%{_libdir}/lib%{name}z.so
-%{_libdir}/lib%{name}z.la
+%{_libdir}/libthrift.so
+%{_libdir}/libthrift.la
+%{_libdir}/libthriftz.so
+%{_libdir}/libthriftz.la
 %{_includedir}/%{name}
+%{_pkgconfigdir}/thrift-nb.pc
+%{_pkgconfigdir}/thrift-z.pc
+%{_pkgconfigdir}/thrift.pc
 
-%files python
+%files -n python-%{name}
 %defattr(644,root,root,755)
-%{py_sitedir}
+%dir %{py_sitedir}
+%dir %{py_sitedir}/%{name}
+%dir %{py_sitedir}/%{name}/protocol
+%{py_sitedir}/%{name}/protocol/*.py[co]
+%attr(755,root,root) %{py_sitedir}/%{name}/protocol/fastbinary.so
+%dir %{py_sitedir}/%{name}/server
+%{py_sitedir}/%{name}/server/*.py[co]
+%dir %{py_sitedir}/%{name}/transport
+%{py_sitedir}/%{name}/transport/*.py[co]
+%{py_sitedir}/%{name}/*.py[co]
 %if "%{py_ver}" > "2.4"
 %{py_sitedir}/Thrift-*.egg-info
 %endif
@@ -103,6 +125,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/03/31 06:47:50  glen
+- fix python packaging
+- package pkgconfig files
+- license is apache 2.0
+
 Revision 1.5  2010/03/31 06:36:40  glen
 - cleanup template leftovers
 - restore changelog
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/thrift/thrift.spec?r1=1.5&r2=1.6&f=u