[packages/moinmoin] - install python to noarch directory; release 2

[qboosh]

commit 52cad7da4f95c9971ac7c5a9e9064a1be8b819a6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 12 13:48:20 2026 +0200

    - install python to noarch directory; release 2

 moinmoin.spec | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/moinmoin.spec b/moinmoin.spec
index eb1845b..7bb1f5c 100644
--- a/moinmoin.spec
+++ b/moinmoin.spec
@@ -3,7 +3,7 @@ Summary:	Wiki Engine
 Summary(pl.UTF-8):	Silnik Wiki
 Name:		moinmoin
 Version:	1.9.11
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/WWW
 Source0:	http://static.moinmo.in/files/%{module}-%{version}.tar.gz
@@ -12,11 +12,11 @@ Source1:	%{name}-apache.conf
 Source2:	%{name}-httpd.conf
 Patch0:		%{name}-config.patch
 URL:		http://www.moinmo.in/
-BuildRequires:	python
-BuildRequires:	python-devel
-BuildRequires:	python-modules > 1:2.3
+BuildRequires:	python >= 1:2.5
+BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python-modules >= 1:2.5
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.714
 Requires:	pydoc
 Requires:	webapps
 %pyrequires_eq	python-modules
@@ -43,21 +43,21 @@ modyfikowalnych stronach WWW.
 %setup -q -n %{module}-%{version}
 %patch -P0 -p1
 
-rm -rf docs/licenses
-rm -f wiki/data/user/README
+%{__rm} -r docs/licenses
+%{__rm} wiki/data/user/README
 
 # omit /usr/bin/env dep and let rpm autogenerate python binary dep
 %{__sed} -i -e '1s,^#!.*python,#!%{__python},' wiki/server/*
 
 # prepare inclusion into %doc
 mkdir -p config
-mv wiki/config/{more_samples,wikifarm} config
+%{__mv} wiki/config/{more_samples,wikifarm} config
 
 # dos, windows,.. blah
 %{__sed} -i -e 's,\r$,,' wiki/data/intermap.txt
 
 %build
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,18 +65,14 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/{cache,lib}/moin}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
-%{__python} setup.py install \
-	--optimize=2 \
-	--prefix=%{_prefix} \
-	--root=$RPM_BUILD_ROOT
+%py_install
 
-mv $RPM_BUILD_ROOT{%{_datadir}/moin/config/*.py,%{_sysconfdir}}
-rm -f $RPM_BUILD_ROOT%{_datadir}/moin/config/*.py[co]
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/moin/config/*.py,%{_sysconfdir}}
 
 # FHS friendly
-mv $RPM_BUILD_ROOT{%{_datadir}/moin/data,/var/lib/moin/data}
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/moin/data,/var/lib/moin/data}
 # it needs rw on underlay, so move it also to /var
-mv $RPM_BUILD_ROOT{%{_datadir}/moin/underlay,/var/lib/moin/underlay}
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/moin/underlay,/var/lib/moin/underlay}
 
 # create dirs / files it creates on its own
 install -d $RPM_BUILD_ROOT/var/lib/moin/data/cache
@@ -103,11 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.py
-%attr(755,root,root) %{_bindir}/*
-%{py_sitedir}/MoinMoin
-%{py_sitedir}/jabberbot
-%{py_sitedir}/moin-*.egg-info
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wikiconfig.py
+%attr(755,root,root) %{_bindir}/moin
+%{py_sitescriptdir}/MoinMoin
+%{py_sitescriptdir}/jabberbot
+%{py_sitescriptdir}/moin-%{version}-py*.egg-info
 %dir %{_datadir}/moin
 %{_datadir}/moin/config
 %dir %{_datadir}/moin/server
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/moinmoin.git/commitdiff/52cad7da4f95c9971ac7c5a9e9064a1be8b819a6