Author: glen Date: Sun Jun 6 11:53:33 2010 GMT Module: packages Tag: HEAD ---- Log message: - rename binding packages, finish python files, cleanups; rel 1
---- Files affected: packages/flowd: flowd.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/flowd/flowd.spec diff -u packages/flowd/flowd.spec:1.10 packages/flowd/flowd.spec:1.11 --- packages/flowd/flowd.spec:1.10 Wed Sep 24 16:51:28 2008 +++ packages/flowd/flowd.spec Sun Jun 6 13:53:27 2010 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): flowd - demon zbierania danych NetFlow Name: flowd Version: 0.9.1 -Release: 0.1 +Release: 1 License: BSD Group: Applications/Networking Source0: http://www.mindrot.org/files/flowd/%{name}-%{version}.tar.gz @@ -48,30 +48,31 @@ zapisywanych przepływów, ma rozdzielenie uprawnień w celu ograniczenia wpływu własnych błedów na bezpieczeństwo. -%package perl +%package -n perl-Flowd Summary: Perl API to access flowd logfiles Summary(pl.UTF-8): Perlowe API do dostępu do plików logów flowd Group: Development/Languages/Perl +Obsoletes: flowd-perl -%description perl +%description -n perl-Flowd This is a Perl API to the binary flowd network flow log format and an example reader application. -%description perl -l pl.UTF-8 +%description -n perl-Flowd -l pl.UTF-8 Ten pakiet zawiera API Perla dla binarnego formatu plików logów przepływów sieciowych flowd oraz przykładowy program czytający. -%package python +%package -n python-flowd Summary: Python API to access flowd logfiles Summary(pl.UTF-8): Pythonowe API do dostępu do plików logów flowd Group: Applications/Networking -Requires: python +Obsoletes: python-flowd -%description python +%description -n python-flowd This is a Python API to the binary flowd network flow log format and an example reader application. -%description python -l pl.UTF-8 +%description -n python-flowd -l pl.UTF-8 Ten pakiet zawiera API Pythona dla binarnego formatu plików logów przepływów sieciowych flowd oraz przykładowy program czytający. @@ -100,23 +101,21 @@ %prep %setup -q - %patch0 -p1 %build %configure -# --enable-gcc-warnings \ - %{__make} +CFLAGS="%{rpmcflags}" \ +%{__python} setup.py build + cd Flowd-perl %{__perl} Makefile.PL \ INSTALLDIRS=vendor %{__make} %{?with_tests:%{__make} test} -#python setup.py install --root=$RPM_BUILD_ROOT --optimize=2 - %install rm -rf $RPM_BUILD_ROOT @@ -125,14 +124,18 @@ # Misc stuff install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install flowd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/flowd +install -p flowd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/flowd # Perl module %{__make} -C Flowd-perl pure_install \ DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Flowd/.packlist + # Python module -./setup.py install --optimize 1 --root=$RPM_BUILD_ROOT +%{__python} setup.py install \ + --optimize=2 \ + --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -160,7 +163,6 @@ %files %defattr(644,root,root,755) %doc ChangeLog LICENSE README TODO -#%%dir %%attr(111,root,root) %{_var}/empty %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/flowd.conf %attr(754,root,root) /etc/rc.d/init.d/flowd %attr(755,root,root) %{_bindir}/flowd-reader @@ -169,18 +171,22 @@ %{_mandir}/man8/flowd.8* %{_mandir}/man8/flowd-reader.8* -%files perl +%files -n perl-Flowd %defattr(644,root,root,755) -#%%doc reader.pl +%doc reader.pl %{perl_vendorarch}/Flowd.pm %dir %{perl_vendorarch}/auto/Flowd %{perl_vendorarch}/auto/Flowd/Flowd.bs %attr(755,root,root) %{perl_vendorarch}/auto/Flowd/Flowd.so %{_mandir}/man3/Flowd.3pm* -%files python +%files -n python-flowd %defattr(644,root,root,755) %doc reader.py +%attr(755,root,root) %{py_sitedir}/flowd.so +%if "%{py_ver}" > "2.4" +%{py_sitedir}/flowd-*.egg-info +%endif %files tools %defattr(644,root,root,755) @@ -197,6 +203,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2010/06/06 11:53:27 glen +- rename binding packages, finish python files, cleanups; rel 1 + Revision 1.10 2008/09/24 14:51:28 pawelz - added patch0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/flowd/flowd.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
