diff --git a/python-zdaemon.changes b/python-zdaemon.changes index e4baf8b..0c8c908 100644 --- a/python-zdaemon.changes +++ b/python-zdaemon.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Feb 16 18:16:37 UTC 2014 - os-dev@jacraig.com + +- Update to 4.0.0: + * Note / test support for Python 3.2. +- Add requirement for python-ZConfig, see setup.py. +- Update source URL, .zip not available for this version. + +------------------------------------------------------------------- +Fri Feb 7 13:17:03 UTC 2014 - p.drouand@gmail.com + +- Fix wrong implementation + +------------------------------------------------------------------- +Fri Feb 7 12:43:58 UTC 2014 - p.drouand@gmail.com + +- Implement update-alternative + ------------------------------------------------------------------- Thu Oct 24 11:17:46 UTC 2013 - speilicke@suse.com diff --git a/python-zdaemon.spec b/python-zdaemon.spec index e593609..80ef38b 100644 --- a/python-zdaemon.spec +++ b/python-zdaemon.spec @@ -1,7 +1,7 @@ # # spec file for package python-zdaemon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,19 @@ %define modname zdaemon -Name: python-zdaemon -Version: 4.0.0a1 +Name: python-%{modname} +Version: 4.0.0 Release: 0 Summary: Daemon process control library and tools License: ZPL-2.1 -Group: Development/Libraries/Python +Group: Development/Languages/Python Url: http://pypi.python.org/pypi/zdaemon -Source: https://pypi.python.org/packages/source/z/zdaemon/%{modname}-%{version}.zip -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} +Source: https://pypi.python.org/packages/source/z/zdaemon/%{modname}-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: unzip +BuildRequires: update-alternatives +Requires(pre): update-alternatives +Requires: python-ZConfig BuildArch: noarch %description @@ -41,15 +41,33 @@ although it is not limited to running Python-based applications %prep %setup -q -n %{modname}-%{version} +sed -i "s|%{modname} =|%{modname}-%{py_ver} =|" setup.py %build python setup.py build %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# create a dummy target for /etc/alternatives/zdaemon +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/%{modname} +ln -s -f %{_sysconfdir}/alternatives/%{modname} %{buildroot}/%{_bindir}/%{modname} -%files -f INSTALLED_FILES +%post +update-alternatives \ + --install %{_bindir}/%{modname} %{modname} %{_bindir}/%{modname}-%{py_ver} 20 + +%preun +if [ $1 -eq 0 ] ; then + update-alternatives --remove %{modname} %{_bindir}/%{modname}-%{py_ver} +fi + +%files %defattr(-,root,root) %doc README.txt CHANGES.txt +%ghost %{_sysconfdir}/alternatives/%{modname} +%{python_sitelib} +%{_bindir}/%{modname} +%{_bindir}/%{modname}-%{py_ver} %changelog diff --git a/zdaemon-4.0.0.tar.gz b/zdaemon-4.0.0.tar.gz new file mode 100644 index 0000000..4178246 --- /dev/null +++ b/zdaemon-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f +size 55486 diff --git a/zdaemon-4.0.0a1.zip b/zdaemon-4.0.0a1.zip deleted file mode 100644 index 61acb5d..0000000 --- a/zdaemon-4.0.0a1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c01a5fb2d438dcffc5e42aab25fe571c13eb7fbc4b0e3170b77f03aefcafda98 -size 69115