- release 2

[packages/web2ldap.git] / web2ldap.spec

diff --git a/web2ldap.spec b/web2ldap.spec
index ec6057cb7dcf65e1c62e8765e0ec30c642c5d1b7..203bd9bdc1613b40f5d274e90c0745f6797155eb 100644 (file)
--- a/web2ldap.spec
+++ b/web2ldap.spec
@@ -1,16 +1,20 @@
 Summary:       WWW gateway to LDAP server
 Summary(pl.UTF-8):     Bramka WWW do serwera LDAP
 Name:          web2ldap
-Version:       1.1.0a21
-Release:       1
+Version:       1.1.0rc1
+Release:       2
 License:       distributable (mostly GPL)
 Group:         Applications
 Source0:       http://www.web2ldap.de/download/%{name}-%{version}.tar.gz
-# Source0-md5: 657d5b7ee390a6b226f4b9c6f6ece1bf
+# Source0-md5: dd51bfcc7a639f90ca9c29a2bb977f48
+Source1:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-paths.patch
 URL:           http://www.web2ldap.de/
 BuildRequires: python-modules
 BuildRequires: rpm-pythonprov
+Requires:      python-pyasn1
+Requires:      python-pyasn1_modules
 %pyrequires_eq python-modules
 Requires:      python-ldap
 Requires:      python-pyweblib
@@ -42,9 +46,10 @@ To jest:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-for dir in pylib sbin fcgi scgi; do
+for dir in pylib sbin fcgi; do
        python -c "import compileall; compileall.compile_dir('$dir')"
        python -O -c "import compileall; compileall.compile_dir('$dir')"
 done
@@ -52,18 +57,21 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_datadir}/%{name}/htdocs} \
-               $RPM_BUILD_ROOT/var{/run,/lib,/log}/%{name}
+               $RPM_BUILD_ROOT/var{/run,/lib,/log}/%{name} \
+               $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
-cp -R etc/web2ldap $RPM_BUILD_ROOT%{_sysconfdir}
-cp -R fcgi pylib scgi sbin $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -R htdocs/css $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
+cp -a etc/web2ldap $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a fcgi pylib sbin $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a htdocs/css $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
 find $RPM_BUILD_ROOT%{_datadir}/%{name}/pylib -name "*.py" | xargs rm
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/compile*
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/*.py
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/compile*
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/*.py
 echo '#!/bin/sh' > $RPM_BUILD_ROOT%{_sbindir}/%{name}
 echo 'exec python %{_datadir}/%{name}/sbin/%{name}.pyc $*' \
        >> $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
+install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -82,8 +90,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/%{name}/fcgi/web2ldap.py
 %{_datadir}/%{name}/fcgi/*.py[co]
 
-%dir %{_datadir}/%{name}/scgi
-%attr(755,root,root) %{_datadir}/%{name}/scgi/web2ldap.py
-%{_datadir}/%{name}/scgi/*.py[co]
-
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %attr(775,root,http) /var/*/%{name}