diff --git a/.gitignore b/.gitignore index 45ea40c..539c6b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /simplevisor-0.6.tar.gz /simplevisor-0.7.tar.gz +/simplevisor-0.8.tar.gz diff --git a/python-simplevisor.spec b/python-simplevisor.spec index d5604c9..bf72320 100644 --- a/python-simplevisor.spec +++ b/python-simplevisor.spec @@ -8,7 +8,7 @@ %global srcname simplevisor Name: python-simplevisor -Version: 0.7 +Version: 0.8 Release: 1%{?dist} Summary: Python simple daemons supervisor @@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python2-devel Requires: perl-Config-General +BuildRequires: perl-No-Worries Requires: perl-No-Worries %if 0%{?with_python3} BuildRequires: python3-devel @@ -29,6 +30,10 @@ BuildRequires: python3-devel BuildRequires: python-argparse Requires: python-argparse %endif +%if 0%{?fedora} == 19 +BuildRequires: perl-Pod-Usage +Requires: perl-Pod-Usage +%endif # For python < 2.6 python-siplejson is required %if 0%{?fedora} < 11 || 0%{?rhel} <= 6 BuildRequires: python-simplejson @@ -74,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT +%{__python3} setup.py install --with-data-files --skip-build --root $RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/usr/bin/simplevisor $RPM_BUILD_ROOT/usr/bin/simplevisor3 mv $RPM_BUILD_ROOT/usr/bin/simplevisor-control $RPM_BUILD_ROOT/usr/bin/simplevisor3-control sed -i 's|/usr/bin/python|/usr/bin/python3|' $RPM_BUILD_ROOT/usr/bin/simplevisor3-control @@ -84,12 +89,21 @@ install -D -m 644 man/%{srcname}-loop.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname popd %endif # with_python3 -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --with-data-files --skip-build --root $RPM_BUILD_ROOT install -D -m 644 man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}.1; install -D -m 644 man/%{srcname}-control.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}-control.1; install -D -m 644 man/%{srcname}-loop.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}-loop.1; %check +%if 0%{?rhel} == 5 +# syslog in el5 is not configured, workaround for simplevisor-loop +# in order to pass the tests, does not affect functionality during test +mkdir Sys +cp `find %{_libdir}/perl5/5*/ -name "Syslog.pm"` Sys/Syslog.pm +sed -i "s/^.*grep { \$_ ne 'udp' }.*$/# noop/" Sys/Syslog.pm +sed -i "s/^.*udp connect: nobody listening.*$/return 1;/g" Sys/Syslog.pm +export PERL5LIB=.:${PERL5LIB} +%endif %{__python} setup.py test # And remove compiled documentation. rm -f test/*.pyc @@ -132,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Fri Apr 26 2013 Massimo Paladin - 0.8-1 +- Updating to upstream 0.8. + * Mon Jan 28 2013 Massimo Paladin - 0.7-1 - Updating to upstream 0.7. diff --git a/sources b/sources index c451196..095be7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b5363d7ad3d5d46e6956cb38037665 simplevisor-0.7.tar.gz +3681e2dbef9218f7ca1fb9b536043af0 simplevisor-0.8.tar.gz