- rel 5 (rebuild with fixed %useradd/%groupadd macros)

[packages/Zope3.git] / Zope3.spec

diff --git a/Zope3.spec b/Zope3.spec
index cd9b9f74c3a85978a9c6a9b150b8d227a91cb7b5..fc599de1d0e6cdaac9288bcf871a61d4a1a620b9 100644 (file)
--- a/Zope3.spec
+++ b/Zope3.spec
@@ -1,15 +1,15 @@
+#
 Summary:       An application server and portal toolkit for building Web sites
 Summary(es):   Un servidor de aplicaciones y un conjunto de herramientas para la construcción de sitios Web
 Summary(pl):   Serwer aplikacji i toolkit portalowy do tworzenia serwisów WWW
 Summary(pt_BR):        Um servidor de aplicações e um conjunto de ferramentas para construção de sites Web
 Name:          Zope3
-Version:       3.1.0
-%define                sub_ver c1
-Release:       0.%{sub_ver}.0.2
+Version:       3.2.0
+Release:       5
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
-Source0:       http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz
-# Source0-md5: e22eeeae5de89c0eea9edabe3f2c3c4d
+Source0:       http://www.zope.org/Products/Zope3/%{version}final/Zope-%{version}.tgz
+# Source0-md5: dbbb708281ebcf7186aa7aa3ee46844c
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -17,30 +17,30 @@ Source4:    mkzope3instance
 Source5:       installzope3package
 Patch0:                %{name}-skeleton_path.patch
 URL:           http://dev.zope.org/Zope3
-BuildRequires: python-devel >= 1:2.4.1
 BuildRequires: perl-base
+BuildRequires: python-devel >= 1:2.4.1
 BuildRequires: rpmbuild(macros) >= 1.213
-Requires:      rc-scripts
+Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun):  rc-scripts
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(post,preun):  /sbin/chkconfig
 Requires:      expat >= 1.95.7
 Requires:      logrotate
 Requires:      python >= 2.4.1
-Requires:      python-modules >= 2.4.1
 Requires:      python-libs >= 2.4.1
+Requires:      python-modules >= 2.4.1
 Requires:      python-zope = %{epoch}:%{version}-%{release}
+Requires:      rc-scripts
 %pyrequires_eq python
 Provides:      group(zope)
 Provides:      user(zope)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                zope_libdir /usr/lib/zope3
+%define                zope_libdir /usr/%{_lib}/zope3
 %define                zope_datadir /usr/share/zope3
 
 %description
@@ -127,15 +127,14 @@ powinny mie
 od "zope.interface".
 
 %prep
-%setup -q -n Zope-%{version}%{sub_ver}
+%setup -q -n Zope-%{version}
 %patch0 -p1
-
-cp %{SOURCE4} ./mkzope3instance
-chmod a+x ./mkzope3instance
+install -m755 %{SOURCE4} ./mkzope3instance
 
 %build
 ./configure \
        --prefix=%{zope_libdir} \
+       --with-python=%{__python} \
        --force
 %{__make}
 
@@ -148,7 +147,7 @@ install -d $RPM_BUILD_ROOT{%{py_sitedir},%{_sbindir},%{zope_datadir}/lib/python}
 $RPM_BUILD_ROOT%{_sysconfdir}/zope3/main
 
 python install.py -q install --skip-build --home "%{zope_libdir}" --root "$RPM_BUILD_ROOT"
-mv $RPM_BUILD_ROOT%{zope_libdir}/lib/python/zope  $RPM_BUILD_ROOT%{py_sitedir}
+mv $RPM_BUILD_ROOT%{zope_libdir}/%{_lib}/python/zope  $RPM_BUILD_ROOT%{py_sitedir}
 rm $RPM_BUILD_ROOT%{zope_libdir}/zopeskel/bin/{*.bat.in,zopeservice*}
 mv $RPM_BUILD_ROOT%{zope_libdir}/zopeskel $RPM_BUILD_ROOT%{_sysconfdir}/zope3
 
@@ -159,19 +158,21 @@ from zope.app.server.mkzopeinstance import main
 sys.exit(main(from_checkout=False))
 EOF
 
-PYTHONPATH="$RPM_BUILD_ROOT%{py_sitedir}:$RPM_BUILD_ROOT%{zope_libdir}/lib/python" \
+# plain text
+echo "1" | PYTHONPATH="$RPM_BUILD_ROOT%{py_sitedir}:$RPM_BUILD_ROOT%{zope_libdir}/%{_lib}/python" \
        DESTDIR="$RPM_BUILD_ROOT" ./mkzope3instance main \
 -u zope:zope -s $RPM_BUILD_ROOT%{_sysconfdir}/zope3/zopeskel
 
 cat >> $RPM_BUILD_ROOT%{py_sitedir}/zope/app/__init__.py <<EOF
 import sys
-sys.path.insert(0,"%{zope_libdir}/lib/python")
+sys.path.insert(0,"%{zope_libdir}/%{_lib}/python")
 sys.path.insert(0,"%{zope_datadir}/lib/python")
 EOF
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}/zope
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/zope
-%py_postclean
+# breaks pyskel
+# %%py_postclean
 
 for f in zconfig zconfig_schema2html zopetest; do
        ln -sf %{zope_libdir}/bin/"$f" $RPM_BUILD_ROOT%{_sbindir}/"$f"
@@ -199,17 +200,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add zope3
-if [ -f /var/lock/subsys/zope3-main ]; then
-       /etc/rc.d/init.d/zope3 restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/zopew start\" to start Zope 3 daemon."
-fi
+%service zope3 restart "Zope 3 daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/zope3 ]; then
-               /etc/rc.d/init.d/zope3 stop
-       fi
+       %service zope3 stop
        /sbin/chkconfig --del zope3
 fi
 
@@ -228,7 +223,7 @@ fi
 %dir %{zope_libdir}/bin
 %attr(755,root,root) %{zope_libdir}/bin/*
 %{zope_libdir}/include
-%{zope_libdir}/lib
+%{zope_libdir}/%{_lib}
 %{zope_datadir}
 %{py_sitedir}/zope/app
 %attr(775,root,zope) %dir /var/run/zope3
@@ -249,6 +244,8 @@ fi
 %attr(751,root,zope) %dir %{_sysconfdir}/zope3/main/package-includes
 %attr(640,root,zope) %dir %{_sysconfdir}/zope3/main/*.conf
 %{_sysconfdir}/zope3/main/*.zcml
+%{_sysconfdir}/zope3/main/*.pem
+%{_sysconfdir}/zope3/main/ssh_host_rsa_key
 %{_sysconfdir}/zope3/main/package-includes/*.zcml
 %{_sysconfdir}/zope3/main/package-includes/README.txt
 %dir %{_sysconfdir}/zope3/zopeskel