SPECS: moinmoin.spec - update to 1.5.3 - add webapps config

glen glen at pld-linux.org
Sat Jun 3 00:33:15 CEST 2006


Author: glen                         Date: Fri Jun  2 22:33:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 1.5.3
- add webapps config

---- Files affected:
SPECS:
   moinmoin.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/moinmoin.spec
diff -u SPECS/moinmoin.spec:1.16 SPECS/moinmoin.spec:1.17
--- SPECS/moinmoin.spec:1.16	Thu Jan 12 01:36:49 2006
+++ SPECS/moinmoin.spec	Sat Jun  3 00:33:08 2006
@@ -1,25 +1,35 @@
 # $Revision$, $Date$
 # TODO
 # - for lighttpd: http://permalink.gmane.org/gmane.comp.web.lighttpd/3140
+# - http://moinmoin.wikiwikiweb.de/HelpOnInstalling/FastCgi
 %define	module	moin
 Summary:	Wiki Engine
 Summary(pl):	Silnik Wiki
 Name:		moinmoin
-Version:	1.5.0
-Release:	1
+Version:	1.5.3
+Release:	0.5
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/moin/%{module}-%{version}.tar.gz
-# Source0-md5:	afaa8f07e6506b1076640f7d239aa1b6
+# Source0-md5:	e95ec46ee8de9527a39793108de22f7d
+Source1:	%{name}-apache.conf
+Patch0:		%{name}-config.patch
 URL:		http://moinmoin.wikiwikiweb.de/
 BuildRequires:	python
 BuildRequires:	python-devel
 BuildRequires:	python-modules > 1:2.3
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	pydoc
+Requires:	webapps
 %pyrequires_eq	python-modules
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
+%define		_sysconfdir	%{_webapps}/%{_webapp}
+
 %description
 MoinMoin is a nice and easy WikiEngine with advanced features - said
 in a few words, it is about collaboration on easily editable web
@@ -32,24 +42,80 @@
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
+
 rm -rf docs/licenses
+rm -f wiki/data/user/README
+rm -f wiki/server/mointwisted.cmd
+rm -rf wiki/data/cache
+
+# omit /usr/bin/env dep and let rpm autogenerate python binary dep
+%{__sed} -i -e  '1s,^#!.*python,#!%{__python},' wiki/server/*
+mv wiki/server/moinmodpy.htaccess .
+
+# prepare inclusion into %doc
+mkdir -p 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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/{cache,lib}/moin}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+
+python setup.py install \
+	--optimize=2 \
+	--root=$RPM_BUILD_ROOT
+
+mv $RPM_BUILD_ROOT{%{_datadir}/moin/config/*.py,%{_sysconfdir}}
+rm -f $RPM_BUILD_ROOT%{_datadir}/moin/config/*.py[co]
+
+# FHS friendly
+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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- apache1
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog docs/*
+%doc ChangeLog docs/* config
+%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_sitescriptdir}/MoinMoin
-%{_datadir}/moin
+%dir %{_datadir}/moin
+%{_datadir}/moin/config
+%{_datadir}/moin/htdocs
+%dir %{_datadir}/moin/server
+%attr(755,root,root) %{_datadir}/moin/server/*
+
+%dir /var/lib/moin
+%defattr(660,root,http,770)
+/var/lib/moin/underlay
+%dir /var/lib/moin/data
+%config(missingok,noreplace) %verify(not md5 mtime size) /var/lib/moin/data/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -57,6 +123,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/06/02 22:33:08  glen
+- update to 1.5.3
+- add webapps config
+
 Revision 1.16  2006/01/12 00:36:49  undefine
 - up to 1.5.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/moinmoin.spec?r1=1.16&r2=1.17&f=u



More information about the pld-cvs-commit mailing list