commit 3fdbf89971829e98cef5baba56af5c38762b3c79
Merge: ba3901f c48ae21
Author: Mateusz Korniak <[email protected]>
Date: Sun Nov 29 22:35:25 2015 +0100
Version 1.3.0-1.
pg_activity.spec | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
---
diff --cc pg_activity.spec
index 5e94ac3,7f68ee7..d42bac2
--- a/pg_activity.spec
+++ b/pg_activity.spec
@@@ -2,22 -2,18 +2,19 @@@
# Move man dir to proper place ?
# NOTE:
-# Not sure if should be build as separte packages for py 3.x / 2.x and
binary package ?
-# Are modules used by other soft? If not just switch to py 3.x when there is
release available
+# Not sure if should be build as separate packages for py 3.x / 2.x with
different binaries? Same conflicting binaries?
+# Are modules used by other soft? If not, just switch to py 3.x ?
# Conditional build:
- %bcond_with doc # don't build doc
%bcond_without tests # do not perform "make test"
+%bcond_without python2 # CPython 2.x module
+%bcond_without python3 # CPython 3.x module
%define module pgactivity
- Summary: -
- Summary(pl.UTF-8): -
- # Name must match the python module/package name (as in 'import' statement)
+ Summary: A top like application for PostgreSQL server activity monitoring
Name: pg_activity
-Version: 1.2.0
-Release: 0.1
+Version: 1.3.0
+Release: 1
License: distributable
Group: Libraries/Python
Source0: https://github.com/julmon/pg_activity/archive/v%{version}.tar.gz
@@@ -52,88 -34,29 +49,81 @@@ htop like application for PostgreSQL se
%description -l pl.UTF-8
Podobna do htop aplikacja monitorująca aktywność PostgresSQL
+%package -n python3-%{module}
+Summary: -
+Summary(pl.UTF-8): -
+Group: Libraries/Python
+Requires: python3-modules
+Requires: python3-psutil
+Requires: python3-psycopg2
+
+%description -n python3-%{module}
+
+%description -n python3-%{module} -l pl.UTF-8
+
+%package apidocs
+Summary: %{module} API documentation
+Summary(pl.UTF-8): Dokumentacja API %{module}
+Group: Documentation
+
+%description apidocs
+API documentation for %{module}.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API %{module}.
+
%prep
- # %setup -q -n %{module}-%{version}
%setup -q
- # setup copy of source in py3 dir
- set -- *
- install -d py3
- cp -a "$@" py3
-
%build
-%{__python} setup.py build %{?with_tests:test} \
- --with-man
+%if %{with python2}
+%py_build
+%endif
+
+%if %{with python3}
+%py3_build
+%endif
+
+%if %{with doc}
+cd docs
+%{__make} -j1 html
+rm -rf _build/html/_sources
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
- --skip-build \
- --optimize=2 \
- --root=$RPM_BUILD_ROOT
-
+%if %{with python2}
+%py_install
%py_postclean
+%endif
+%if %{with python3}
+%py3_install
+%endif
++# %py_postclean
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{with python2}
%files
%defattr(644,root,root,755)
- %doc README.md docs
+ %doc README.md
+ %attr(755,root,root) %{_bindir}/pg_activity
%dir %{py_sitescriptdir}/%{module}
%{py_sitescriptdir}//%{module}/*.py[co]
- %attr(755,root,root) %{_bindir}/pg_activity
- %if "%{py_ver}" > "2.4"
%{py_sitescriptdir}/%{name}-%{version}-py*.egg-info
+%endif
- %endif
+
+%if %{with python3}
+%files -n python3-%{module}
+%defattr(644,root,root,755)
+%doc README.md docs
+%{py3_sitescriptdir}/%{module}
+%{py3_sitescriptdir}/%{name}-%{version}-py*.egg-info
+%endif
+
+%if %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/_build/html/*
+%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pg_activity.git/commitdiff/3fdbf89971829e98cef5baba56af5c38762b3c79
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
