From 32572841bc34ac8a4129f0468f354d5123b22b0c Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:05:35 +0100 Subject: [PATCH 1/6] Fix Source and Url of rpm spec file. Signed-off-by: Oleg Girko --- rpm/python-boss-skynet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/python-boss-skynet.spec b/rpm/python-boss-skynet.spec index 2e93682..f4e448a 100644 --- a/rpm/python-boss-skynet.spec +++ b/rpm/python-boss-skynet.spec @@ -2,7 +2,7 @@ Summary: Boss Python SkyNET Name: python-boss-skynet Version: 0.6.3 Release: 1 -Source0: %{name}_%{version}.orig.tar.gz +Source0: %{name}-%{version}.tar.gz License: UNKNOWN Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -14,7 +14,7 @@ Requires: python, python-ruote-amqp >= 2.1.0, python-amqplib, supervisor, python Requires(post): pwdutils BuildArch: noarch Vendor: David Greaves -Url: http://github.com/lbt/boss-python-skynet/ +Url: https://github.com/MeeGoIntegration/python-boss-skynet %description UNKNOWN From 21165ccc55fca395a2ff2d12c0f5955cafa01b60 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:08:24 +0100 Subject: [PATCH 2/6] Fix URLs in debian control file. Signed-off-by: Oleg Girko --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ec89731..f2daff2 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Priority: optional Build-Depends: python (>= 2.6.0), python-setuptools (>= 0.6b3), debhelper (>= 7.0.50~), python-support (>= 0.8.4), python-sphinx, bash-completion Standards-Version: 3.9.2 Homepage: http://wiki.meego.com/Release_Infrastructure/BOSS/SkyNET -Vcs-Git: git://gitorious.org/meego-infrastructure-tools/boss-python-skynet.git -Vcs-Browser: http://meego.gitorious.org/meego-infrastructure-tools/boss-python-skynet +Vcs-Git: https://github.com/MeeGoIntegration/python-boss-skynet.git +Vcs-Browser: https://github.com/MeeGoIntegration/python-boss-skynet Package: python-boss-skynet Architecture: all From 75aa21c897ec4ffee3fcc19d0bc22563107ffb85 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:09:19 +0100 Subject: [PATCH 3/6] Require /usr/sbin/useradd instead of pwdutils for better portability. Signed-off-by: Oleg Girko --- rpm/python-boss-skynet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/python-boss-skynet.spec b/rpm/python-boss-skynet.spec index f4e448a..1b756b4 100644 --- a/rpm/python-boss-skynet.spec +++ b/rpm/python-boss-skynet.spec @@ -11,7 +11,7 @@ Obsoletes: boss-skynet < 0.6.0 Provides: boss-skynet BuildRequires: python, python-distribute, supervisor Requires: python, python-ruote-amqp >= 2.1.0, python-amqplib, supervisor, python-setproctitle -Requires(post): pwdutils +Requires(post): /usr/sbin/useradd BuildArch: noarch Vendor: David Greaves Url: https://github.com/MeeGoIntegration/python-boss-skynet From 529b18aea5e2d9cd8632f1dfc175410b34c48100 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:11:00 +0100 Subject: [PATCH 4/6] Change permissions of /var/log/supervisor to match ones of supervisor Signed-off-by: Oleg Girko --- rpm/python-boss-skynet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/python-boss-skynet.spec b/rpm/python-boss-skynet.spec index 1b756b4..fa8ff98 100644 --- a/rpm/python-boss-skynet.spec +++ b/rpm/python-boss-skynet.spec @@ -28,6 +28,7 @@ make %install make PREFIX=%{_prefix} DESTDIR=%{buildroot} install mkdir -p %{buildroot}/var/log/supervisor +chmod 770 %{buildroot}/var/log/supervisor %clean rm -rf $RPM_BUILD_ROOT From 6aea64329ee510a3dead6319a6e392461d2d0686 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:11:43 +0100 Subject: [PATCH 5/6] Require setuptools Python module instead of distribute. The disttibute python module has been merged into setuptools long ago, at version 0.7. Also, distribute is not used in code here, just setuptools. Signed-off-by: Oleg Girko --- rpm/python-boss-skynet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/python-boss-skynet.spec b/rpm/python-boss-skynet.spec index fa8ff98..248e18a 100644 --- a/rpm/python-boss-skynet.spec +++ b/rpm/python-boss-skynet.spec @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prefix: %{_prefix} Obsoletes: boss-skynet < 0.6.0 Provides: boss-skynet -BuildRequires: python, python-distribute, supervisor +BuildRequires: python, python-setuptools, supervisor Requires: python, python-ruote-amqp >= 2.1.0, python-amqplib, supervisor, python-setproctitle Requires(post): /usr/sbin/useradd BuildArch: noarch From 628a67e4d9b15a956c5ff237094834b617e4affd Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Wed, 31 Aug 2016 16:24:58 +0100 Subject: [PATCH 6/6] Allow to specify prefix to install data in Makefile. After pathnames in setup.py file were changed to relative ones, files listed as data_files are installed inside prefix, causing wrong filenames. Allowing to specify where to install data_files helps to solve this problem. Signed-off-by: Oleg Girko --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 941303f..3c07c69 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,8 @@ docs: python setup.py build_sphinx install: - python setup.py -q install --root=$(DESTDIR) --prefix=$(PREFIX) + python setup.py -q install --root=$(DESTDIR) --prefix=$(PREFIX) \ + --install-data=$(DATADIR) clean: python setup.py clean