Skip to content

Commit 33d8b5d

Browse files
committed
Fix building under SUSE
1 parent 6f71dda commit 33d8b5d

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

Makefile.pkg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ deb: prepare_builddir
2525
cp -av build/mamonsu*.deb .
2626

2727
rpm: prepare_builddir $(BUILDDIR)/packaging/rpm/SPECS/$(SPEC)
28+
mkdir -p $(BUILDDIR)/packaging/rpm/RPMS $(BUILDDIR)/packaging/rpm/BUILD $(BUILDDIR)/packaging/rpm/SRPMS
2829
rpmbuild -ba --define '_topdir $(BUILDDIR)/packaging/rpm'\
2930
$(BUILDDIR)/packaging/rpm/SPECS/$(SPEC)
3031
cp -av $(BUILDDIR)/packaging/rpm/RPMS/noarch/mamonsu*.rpm .

packaging/rpm/SPECS/mamonsu.suse.spec

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
%define _datarootdir %{_prefix}/share
12
Name: mamonsu
23
Version: 2.2.9
34
Release: 1%{?dist}
@@ -7,44 +8,47 @@ License: BSD
78
Source0: http://pypi.python.org/packages/source/m/mamonsu/mamonsu-%{version}.tar.gz
89
Source1: mamonsu.init
910
Source2: mamonsu-logrotate.in
10-
BuildRequires: python2-devel
11+
BuildRequires: python-devel
1112
BuildRequires: python-setuptools
1213
BuildArch: noarch
14+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
1315
Requires: python-setuptools
1416

1517
%description
1618
Monitoring agent for PostgreSQL.
17-
19+
1820
%prep
1921
%setup -q
2022

2123
%build
2224
%{__python} setup.py build
2325

2426
%install
25-
%{__python} setup.py install --skip-build --root %{buildroot}
27+
%{__python} setup.py install --prefix %{_prefix} --skip-build --root %{buildroot}
2628
export PYTHONPATH=%{buildroot}%{python_sitelib}
2729

28-
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
29-
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/init.d
30-
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d
31-
%{__mkdir} -p %{buildroot}/%{_datarootdir}/%{name}
30+
%{__mkdir} -p %{buildroot}%{_sysconfdir}/%{name}
31+
%{__mkdir} -p %{buildroot}%{_sysconfdir}/init.d
32+
%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d
33+
%{__mkdir} -p %{buildroot}%{_datarootdir}/%{name}
3234

33-
%{__install} -m 0644 -p packaging/conf/example.conf %{buildroot}/%{_sysconfdir}/%{name}/agent.conf
34-
%{__install} -m 0644 -p packaging/conf/template.xml %{buildroot}/%{_datarootdir}/%{name}/template.xml
35-
%{__install} -m 0644 -p examples/*.py %{buildroot}/%{_datarootdir}/%{name}/
36-
%{__install} -m 0755 -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/%{name}
37-
%{__install} -m 0644 -p %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
35+
%{__install} -m 0644 -p packaging/conf/example.conf %{buildroot}%{_sysconfdir}/%{name}/agent.conf
36+
%{__install} -m 0644 -p packaging/conf/template.xml %{buildroot}%{_datarootdir}/%{name}/template.xml
37+
%{__install} -m 0644 -p examples/*.py %{buildroot}%{_datarootdir}/%{name}/
38+
%{__install} -m 0755 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
39+
%{__install} -m 0644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
3840

3941
%files
4042
%doc README.rst
43+
%defattr(644,root,root,755)
4144
%config(noreplace) %{_sysconfdir}/%{name}/agent.conf
4245
%{python_sitelib}/%{name}/
4346
%{python_sitelib}/%{name}-%{version}*
4447
%{_sysconfdir}/%{name}
4548
%{_datarootdir}/%{name}
46-
%{_sysconfdir}/init.d/%{name}
4749
%{_sysconfdir}/logrotate.d/%{name}
50+
%defattr(755,root,root,755)
51+
%{_sysconfdir}/init.d/%{name}
4852
%{_bindir}/%{name}
4953

5054
%clean

0 commit comments

Comments
 (0)