[svn] r4879 - in trunk/rpms: . pyvnc2swf rsstool vnc2swf yasm zope
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Nov 13 12:59:44 CET 2006
Author: dag
Date: 2006-11-13 12:59:42 +0100 (Mon, 13 Nov 2006)
New Revision: 4879
Added:
trunk/rpms/pyvnc2swf/
trunk/rpms/pyvnc2swf/pyvnc2swf.spec
trunk/rpms/zope/zope-2.7.spec
trunk/rpms/zope/zope-2.8.spec
Removed:
trunk/rpms/zope/zope-2.7.0.spec
Modified:
trunk/rpms/rsstool/rsstool.spec
trunk/rpms/vnc2swf/vnc2swf.spec
trunk/rpms/yasm/yasm.spec
trunk/rpms/zope/zope.init.in
trunk/rpms/zope/zope.logrotate.in
Log:
Updates
Added: trunk/rpms/pyvnc2swf/pyvnc2swf.spec
===================================================================
--- trunk/rpms/pyvnc2swf/pyvnc2swf.spec (rev 0)
+++ trunk/rpms/pyvnc2swf/pyvnc2swf.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -0,0 +1,86 @@
+# $Id$
+# Authority: dag
+# Upstream: <vnc2swf-users$lists,sourceforge,net>
+# Upstream: Yusuke Shinyama <yusuke$cs,nyu,edu>
+
+Summary: Flash movie recording tool for VNC
+Name: pyvnc2swf
+Version: 0.9.1
+Release: 1
+Summary: A VNC session recorder to Flash movie
+License: GPL
+Group: User Interface/Desktops
+URL: http://www.unixuser.org/~euske/vnc2swf/
+
+Source: http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: python-devel >= 2.4
+Requires: python >= 2.4, python-game >= 1.6
+BuildArch: noarch
+
+%description
+pyvnc2swf is a screen recorder for Flash movie. It captures
+screen motion through VNC protocol and converts it into a
+Shockwave Flash (SWF) file.
+
+%prep
+%setup
+
+%{__cat} <<'EOF' >pyvnc2swf
+#!/bin/sh
+PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/vnc2swf.py $@
+EOF
+
+%{__cat} <<'EOF' >pyvnc2swf-edit
+#!/bin/sh
+PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/edit.py $@
+EOF
+
+%{__cat} <<'EOF' >pyvnc2swf-play
+#!/bin/sh
+PYTHONPATH=${PYTHONPATH-}${PYTHONPATH+:}%{_datadir}/pyvnc2swf %{__python} %{_datadir}/pyvnc2swf/play.py $@
+EOF
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -Dp -m0755 pyvnc2swf %{buildroot}%{_bindir}/pyvnc2swf
+%{__install} -Dp -m0755 pyvnc2swf-edit %{buildroot}%{_bindir}/pyvnc2swf-edit
+%{__install} -Dp -m0755 pyvnc2swf-play %{buildroot}%{_bindir}/pyvnc2swf-play
+%{__install} -Dp -m0755 recordwin.sh %{buildroot}%{_bindir}/recordwin.sh
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/pyvnc2swf/
+%{__install} -m0644 *.py %{buildroot}%{_datadir}/pyvnc2swf/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0775}
+%doc *.txt *.html
+%{_bindir}/pyvnc2swf
+%{_bindir}/pyvnc2swf-edit
+%{_bindir}/pyvnc2swf-play
+%{_bindir}/recordwin.sh
+%{_datadir}/pyvnc2swf/
+
+%changelog
+* Sun Nov 12 2006 Dag Wieers <dag at wieers.com> - 0.9.1-1
+- Updated to release 0.9.1.
+
+* Sun Nov 12 2006 Dag Wieers <dag at wieers.com> - 0.5.0-2
+- Removed ming requirement.
+
+* Fri Nov 11 2005 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1
+- Updated to release 0.5.0.
+
+* Tue Mar 15 2005 Dag Wieers <dag at wieers.com> - 0.4.2-2
+- Build against newer ming.
+
+* Thu Mar 10 2005 Dag Wieers <dag at wieers.com> - 0.4.2-2
+- Updated to release 0.4.2.
+
+* Fri May 14 2004 Dag Wieers <dag at wieers.com> - 0.4.1-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/pyvnc2swf/pyvnc2swf.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/rsstool/rsstool.spec
===================================================================
--- trunk/rpms/rsstool/rsstool.spec 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/rsstool/rsstool.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -4,7 +4,7 @@
Summary: Read, parse, merge and write RSS (and Atom) feeds
Name: rsstool
-Version: 0.9.8
+Version: 0.9.9
Release: 1
License: GPL
Group: Applications/Text
@@ -41,6 +41,9 @@
%{_bindir}/rsstool
%changelog
+* Sun Nov 12 2006 Dag Wieers <dag at wieers.com> - 0.9.9-1
+- Updated to release 0.9.9.
+
* Tue Nov 07 2006 Dag Wieers <dag at wieers.com> - 0.9.8-1
- Updated to release 0.9.8.
Modified: trunk/rpms/vnc2swf/vnc2swf.spec
===================================================================
--- trunk/rpms/vnc2swf/vnc2swf.spec 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/vnc2swf/vnc2swf.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -4,18 +4,14 @@
%{?dist: %{expand: %%define %dist 1}}
-%{?fc1:%define _without_xorg 1}
-%{?el3:%define _without_xorg 1}
-%{?rh9:%define _without_xorg 1}
-%{?rh8:%define _without_xorg 1}
-%{?rh7:%define _without_xorg 1}
-%{?el2:%define _without_xorg 1}
-%{?rh6:%define _without_xorg 1}
+%{!?dist:%define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
Summary: Recording tool for VNC
Name: vnc2swf
Version: 0.5.0
-Release: 1.2
+Release: 2
License: GPL
Group: User Interface/Desktops
URL: http://www.unixuser.org/~euske/vnc2swf/
@@ -23,9 +19,9 @@
Source: http://www.unixuser.org/~euske/vnc2swf/vnc2swf-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: ming-devel, libdnet-devel, libstdc++-devel, zlib-devel, gcc-c++
-%{?_without_xorg:BuildRequires: XFree86-devel}
-%{!?_without_xorg:BuildRequires: libXt-devel, libXext, libXaw-devel}
+BuildRequires: libdnet-devel, libstdc++-devel, zlib-devel, gcc-c++
+%{?_with_modxorg:BuildRequires: libXt-devel, libXext, libXaw-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
%description
vnc2swf is a recoding tool for Flash.
@@ -39,7 +35,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}" prefix="%{_prefix}"
%clean
%{__rm} -rf %{buildroot}
@@ -51,8 +47,8 @@
%{_bindir}/vnc2swf
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1.2
-- Rebuild for Fedora Core 5.
+* Sun Nov 12 2006 Dag Wieers <dag at wieers.com> - 0.5.0-2
+- Removed ming requirement.
* Fri Nov 11 2005 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1
- Updated to release 0.5.0.
Modified: trunk/rpms/yasm/yasm.spec
===================================================================
--- trunk/rpms/yasm/yasm.spec 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/yasm/yasm.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -7,6 +7,7 @@
%{?rh9:%define _without_gettextdevel 1}
%{?rh7:%define _without_gettextdevel 1}
%{?el2:%define _without_gettextdevel 1}
+%{?el2:%define _without_xmlto 1}
Summary: Complete rewrite of the NASM assembler
Name: yasm
@@ -17,8 +18,9 @@
URL: http://www.tortall.net/projects/yasm/
Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, xmlto
+BuildRequires: bison, byacc
+%{!?_without_xmlto:BuildRequires:xmlto}
%{!?_without_gettextdevel:BuildRequires: gettext-devel}
%{?_without_gettextdevel:BuildRequires: gettext}
@@ -58,7 +60,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%clean
Deleted: trunk/rpms/zope/zope-2.7.0.spec
===================================================================
--- trunk/rpms/zope/zope-2.7.0.spec 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/zope/zope-2.7.0.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -1,166 +0,0 @@
-# $Id$
-# Authority: matthias
-
-%define real_name Zope
-%define real_version 2.7.2-0
-%define python %{_bindir}/python
-%define python_minver 2.3.3
-%define zope_user zope
-%define zope_group zope
-
-%define zope_home %{_prefix}/lib/zope
-%define software_home %{zope_home}/lib/python
-%define instance_home %{_var}/lib/zope
-%define client_home %{instance_home}/data
-%define run_dir %{_var}/run/zope
-%define log_dir %{_var}/log/zope
-%define config_file %{_sysconfdir}/zope.conf
-
-%define zopectl %{_bindir}/zopectl
-%define runzope %{_bindir}/runzope
-
-
-Summary: Web application server for flexible content management applications
-Name: zope
-Version: 2.7.2
-Release: 0.1
-License: ZPL
-Group: System Environment/Daemons
-URL: http://www.zope.org/
-Source0: http://zope.org/Products/Zope/%{version}/%{real_name}-%{real_version}.tgz
-Source1: zope.init.in
-Source2: zope.logrotate.in
-Patch: Zope-2.7.0-config.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: python >= %{python_minver}
-Requires(pre): /usr/sbin/useradd
-Requires(post): /usr/sbin/userdel
-Requires(preun,postun): /sbin/chkconfig, /sbin/service
-BuildRequires: python >= %{python_minver}, python-devel >= %{python_minver}
-
-%description
-Zope is an open source application server for building content managements,
-intranets, portals, and custom applications. The Zope community consists of
-hundreds of companies and thousands of developers all over the world, working
-on building the platform and Zope applications. Zope is written in Python, a
-highly-productive, object-oriented scripting language.
-
-
-%prep
-%setup -n %{real_name}-%{version}-0
-%patch -p1 -b .config
-
-
-%build
-./configure \
- --with-python=%{python} \
- --prefix=%{buildroot}%{zope_home} \
- --optimize
-%{__make} %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot} rpm-skel
-
-# Copy over files from the default skel to the rpm-skel
-%{__install} -Dp -m 644 skel/etc/zope.conf.in rpm-skel/etc/zope.conf.in
-%{__install} -Dp -m 755 skel/bin/runzope.in rpm-skel%{_bindir}/runzope.in
-%{__install} -Dp -m 755 skel/bin/zopectl.in rpm-skel%{_bindir}/zopectl.in
-
-# Create all required additional directories
-for dir in %{zope_home} %{software_home} %{client_home} %{log_dir} %{run_dir} \
- %{instance_home}/{Products,bin}; do
- %{__mkdir_p} %{buildroot}$dir
-done
-
-# Install additional files in the rpm-skel
-%{__install} -Dp -m 755 %{SOURCE1} rpm-skel%{_sysconfdir}/rc.d/init.d/zope.in
-%{__install} -Dp -m 644 %{SOURCE2} rpm-skel%{_sysconfdir}/logrotate.d/zope.in
-
-# Install the skel, translating paths, into the build root
-%{python} "utilities/copyzopeskel.py" \
- --sourcedir="rpm-skel" \
- --targetdir="%{buildroot}" \
- --replace="INSTANCE_HOME:%{instance_home}" \
- --replace="CLIENT_HOME:%{client_home}" \
- --replace="RUN_DIR:%{run_dir}" \
- --replace="LOG_DIR:%{log_dir}" \
- --replace="SOFTWARE_HOME:%{software_home}" \
- --replace="ZOPE_HOME:%{zope_home}" \
- --replace="ZOPE_USER:%{zope_user}" \
- --replace="CONFIG_FILE:%{config_file}" \
- --replace="PYTHON:%{python}" \
- --replace="ZOPECTL:%{zopectl}" \
- --replace="RUNZOPE:%{runzope}"
-
-# Now, copy all the other files over
-%{__make} install
-
-# Symlink to include in the docs
-%{__ln_s} %{zope_home}/doc docs
-
-# Workaround
-%{__ln_s} %{runzope} %{buildroot}%{instance_home}/bin/
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%pre
-/usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \
- %{zope_user} 2>/dev/null || :
-
-
-%post
-/sbin/chkconfig --add zope
-
-
-%preun
-if [ $1 -eq 0 ]; then
- /sbin/service zope stop >/dev/null 2>&1 || :
- /sbin/chkconfig --del zope
-fi
-
-
-%postun
-if [ $1 -eq 0 ]; then
- /usr/sbin/userdel %{zope_user} 2>/dev/null || :
-fi
-
-
-%files
-%defattr(-, root, root, 0755)
-%doc docs
-%config(noreplace) %{config_file}
-%config(noreplace) %{_sysconfdir}/logrotate.d/zope
-%config %{_sysconfdir}/rc.d/init.d/zope
-%attr(0755, root, root) %{runzope}
-%attr(0755, root, root) %{zopectl}
-%dir %{zope_home}/
-%{zope_home}/bin/
-%{zope_home}/doc/
-%{zope_home}/import/
-%{zope_home}/lib/
-%exclude %{zope_home}/skel/
-%attr(0700, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home}/
-%attr(0755, %{zope_user}, %{zope_group}) %dir %{_var}/log/zope/
-%attr(0755, %{zope_user}, %{zope_group}) %dir %{_var}/run/zope/
-
-
-%changelog
-* Wed Oct 20 2004 Matthias Saou <http://freshrpms.net/> 2.7.2-0.1
-- Update to 2.7.2.
-- Minor spec updates and cleanups.
-
-* Wed Jul 14 2004 Matthias Saou <http://freshrpms.net/> 2.7.1-0.1
-- Update to 2.7.1.
-
-* Thu Mar 4 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.7
-- SVN import, minor tweaks.
-
-* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6
-- Initial RPM release.
-- The startup/stop needs to be modified further.
-- Currently "zopectl" returns an error although Zope does start...
-
Copied: trunk/rpms/zope/zope-2.7.spec (from rev 4871, trunk/rpms/zope/zope-2.7.0.spec)
===================================================================
--- trunk/rpms/zope/zope-2.7.spec (rev 0)
+++ trunk/rpms/zope/zope-2.7.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -0,0 +1,166 @@
+# $Id$
+# Authority: matthias
+
+%define real_name Zope
+%define real_version 2.7.2-0
+%define python %{_bindir}/python
+%define python_minver 2.3.3
+%define zope_user zope
+%define zope_group zope
+
+%define zope_home %{_prefix}/lib/zope
+%define software_home %{zope_home}/lib/python
+%define instance_home %{_var}/lib/zope
+%define client_home %{instance_home}/data
+%define run_dir %{_var}/run/zope
+%define log_dir %{_var}/log/zope
+%define config_file %{_sysconfdir}/zope.conf
+
+%define zopectl %{_bindir}/zopectl
+%define runzope %{_bindir}/runzope
+
+
+Summary: Web application server for flexible content management applications
+Name: zope
+Version: 2.7.2
+Release: 0.1
+License: ZPL
+Group: System Environment/Daemons
+URL: http://www.zope.org/
+Source0: http://zope.org/Products/Zope/%{version}/%{real_name}-%{real_version}.tgz
+Source1: zope.init.in
+Source2: zope.logrotate.in
+Patch: Zope-2.7.0-config.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: python >= %{python_minver}
+Requires(pre): /usr/sbin/useradd
+Requires(post): /usr/sbin/userdel
+Requires(preun,postun): /sbin/chkconfig, /sbin/service
+BuildRequires: python >= %{python_minver}, python-devel >= %{python_minver}
+
+%description
+Zope is an open source application server for building content managements,
+intranets, portals, and custom applications. The Zope community consists of
+hundreds of companies and thousands of developers all over the world, working
+on building the platform and Zope applications. Zope is written in Python, a
+highly-productive, object-oriented scripting language.
+
+
+%prep
+%setup -n %{real_name}-%{version}-0
+%patch -p1 -b .config
+
+
+%build
+./configure \
+ --with-python=%{python} \
+ --prefix=%{buildroot}%{zope_home} \
+ --optimize
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot} rpm-skel
+
+# Copy over files from the default skel to the rpm-skel
+%{__install} -Dp -m 644 skel/etc/zope.conf.in rpm-skel/etc/zope.conf.in
+%{__install} -Dp -m 755 skel/bin/runzope.in rpm-skel%{_bindir}/runzope.in
+%{__install} -Dp -m 755 skel/bin/zopectl.in rpm-skel%{_bindir}/zopectl.in
+
+# Create all required additional directories
+for dir in %{zope_home} %{software_home} %{client_home} %{log_dir} %{run_dir} \
+ %{instance_home}/{Products,bin}; do
+ %{__mkdir_p} %{buildroot}$dir
+done
+
+# Install additional files in the rpm-skel
+%{__install} -Dp -m 755 %{SOURCE1} rpm-skel%{_sysconfdir}/rc.d/init.d/zope.in
+%{__install} -Dp -m 644 %{SOURCE2} rpm-skel%{_sysconfdir}/logrotate.d/zope.in
+
+# Install the skel, translating paths, into the build root
+%{python} "utilities/copyzopeskel.py" \
+ --sourcedir="rpm-skel" \
+ --targetdir="%{buildroot}" \
+ --replace="INSTANCE_HOME:%{instance_home}" \
+ --replace="CLIENT_HOME:%{client_home}" \
+ --replace="RUN_DIR:%{run_dir}" \
+ --replace="LOG_DIR:%{log_dir}" \
+ --replace="SOFTWARE_HOME:%{software_home}" \
+ --replace="ZOPE_HOME:%{zope_home}" \
+ --replace="ZOPE_USER:%{zope_user}" \
+ --replace="CONFIG_FILE:%{config_file}" \
+ --replace="PYTHON:%{python}" \
+ --replace="ZOPECTL:%{zopectl}" \
+ --replace="RUNZOPE:%{runzope}"
+
+# Now, copy all the other files over
+%{__make} install
+
+# Symlink to include in the docs
+%{__ln_s} %{zope_home}/doc docs
+
+# Workaround
+%{__ln_s} %{runzope} %{buildroot}%{instance_home}/bin/
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%pre
+/usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \
+ %{zope_user} 2>/dev/null || :
+
+
+%post
+/sbin/chkconfig --add zope
+
+
+%preun
+if [ $1 -eq 0 ]; then
+ /sbin/service zope stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del zope
+fi
+
+
+%postun
+if [ $1 -eq 0 ]; then
+ /usr/sbin/userdel %{zope_user} 2>/dev/null || :
+fi
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc docs
+%config(noreplace) %{config_file}
+%config(noreplace) %{_sysconfdir}/logrotate.d/zope
+%config %{_sysconfdir}/rc.d/init.d/zope
+%attr(0755, root, root) %{runzope}
+%attr(0755, root, root) %{zopectl}
+%dir %{zope_home}/
+%{zope_home}/bin/
+%{zope_home}/doc/
+%{zope_home}/import/
+%{zope_home}/lib/
+%exclude %{zope_home}/skel/
+%attr(0700, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home}/
+%attr(0755, %{zope_user}, %{zope_group}) %dir %{_var}/log/zope/
+%attr(0755, %{zope_user}, %{zope_group}) %dir %{_var}/run/zope/
+
+
+%changelog
+* Wed Oct 20 2004 Matthias Saou <http://freshrpms.net/> 2.7.2-0.1
+- Update to 2.7.2.
+- Minor spec updates and cleanups.
+
+* Wed Jul 14 2004 Matthias Saou <http://freshrpms.net/> 2.7.1-0.1
+- Update to 2.7.1.
+
+* Thu Mar 4 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.7
+- SVN import, minor tweaks.
+
+* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6
+- Initial RPM release.
+- The startup/stop needs to be modified further.
+- Currently "zopectl" returns an error although Zope does start...
+
Added: trunk/rpms/zope/zope-2.8.spec
===================================================================
--- trunk/rpms/zope/zope-2.8.spec (rev 0)
+++ trunk/rpms/zope/zope-2.8.spec 2006-11-13 11:59:42 UTC (rev 4879)
@@ -0,0 +1,315 @@
+# $Id$
+# Authority: dag
+
+%define python_minver 2.3.4
+
+%define zope_home %{_libdir}/zope
+%define software_home %{zope_home}/lib/python
+%define instance_home %{_localstatedir}/lib/zope
+
+%define zopectl %{_bindir}/zopectl
+%define runzope %{_bindir}/runzope
+
+Summary: Web application server for flexible content management applications
+Name: zope
+Version: 2.8.7
+Release: 1
+License: ZPL
+Group: System Environment/Daemons
+URL: http://www.zope.org/
+
+Source0: http://zope.org/Products/Zope/%{version}/Zope-%{version}-final.tgz
+Source1: zope.init.in
+Source2: zope.sysconfig.in
+Source3: zope.zopectl.in
+Source4: zope-README.Fedora
+Source5: zope.logrotate.in
+Source6: zope.logrotate.cron.in
+Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Patch0: zope-2.7.3-config.patch
+Patch1: zope-2.8.3-pythonwarning.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: python-devel >= %{python_minver}
+BuildRequires: python >= %{python_minver}
+Requires: python >= %{python_minver}
+
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
+
+%description
+Zope is an application server framework that enables developers to quickly
+build web applications such as intranets, portals, and content management
+systems.
+
+After starting Zope, you can access it by pointing your browser to
+http://localhost:8080
+
+WARNING: this zope package has been built on python 2.4.X, which is not
+supported ! Do not file bugreports or ask for support on zope.org if you
+choose to use this package.
+
+
+%prep
+%setup -n Zope-%{version}-final
+%patch0 -p1 -b .config
+# remove the backup, or we'll install it too...
+rm -f skel/etc/zope.conf.in.config skel/lib/python/README.txt.in
+# Warning on the default index_html about python 2.4 & zope 2.8
+%patch1 -p1 -b .pythonwarning
+
+%{__chmod} -x skel/import/README.txt
+%{__install} -p -m0644 %{SOURCE4} README.Fedora
+%{__install} -p -m0644 %{SOURCE5} skel/etc/logrotate.conf.in
+
+
+%build
+./configure \
+ --with-python="%{__python}" \
+ --prefix="%{buildroot}%{zope_home}" \
+ --optimize
+
+# --no-compile
+
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__rm} -f docs
+
+# Create all required additional directories
+for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \
+ %{_sysconfdir}/sysconfig %{_bindir}; do
+ mkdir -p %{buildroot}$dir
+done
+
+
+%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/zope
+%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/zope
+%{__install} -Dp -m0755 %{SOURCE3} %{buildroot}%{_bindir}/zopectl
+%{__install} -Dp -m0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/cron.daily/zope-logrotate
+%{__perl} -pi -e 's|<<SYSCONFDIR>>|%{_sysconfdir}|g;
+ s|<<BINDIR>>|%{_bindir}|g;
+ s|<<LOCALSTATEDIR>>|%{_localstatedir}|g;
+ s|<<ZOPE_USER>>|zope|g' \
+ %{buildroot}%{_initrddir}/zope \
+ %{buildroot}%{_sysconfdir}/sysconfig/zope \
+ %{buildroot}%{_bindir}/zopectl \
+ %{buildroot}%{_sysconfdir}/cron.daily/zope-logrotate \
+ README.Fedora skel/etc/zope.conf.in
+
+# Install the skel, translating paths, into the build root
+%{__python} "utilities/copyzopeskel.py" \
+ --sourcedir="skel" \
+ --targetdir="%{buildroot}%{instance_home}" \
+ --replace="INSTANCE_HOME:%{instance_home}" \
+ --replace="SOFTWARE_HOME:%{software_home}" \
+ --replace="ZOPE_HOME:%{zope_home}" \
+ --replace="PYTHON:%{__python}" \
+
+# Actually copy all the other files over
+%{__make} install
+
+# Hotfix
+tar -xzf %{SOURCE10} -C %{buildroot}%{software_home}/Products
+
+%{__chmod} 700 %{buildroot}%{instance_home}
+%{__chmod} 755 %{buildroot}%{zope_home}
+
+# Symlink to include in the docs
+%{__ln_s} -f %{zope_home}/doc docs
+
+# write version.txt
+echo "Zope %{version}-%{release}" > \
+ "%{buildroot}%{software_home}/version.txt"
+
+# Compile .pyc
+%{__python} -c "import compileall; \
+ compileall.compile_dir(\"%{buildroot}%{zope_home}\", \
+ ddir=\"%{zope_home}\", force=1)"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%pre
+/usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} zope 2>/dev/null || :
+
+%post
+# add zope init to runlevels
+/sbin/chkconfig --add zope
+
+%preun
+if [ $1 -eq 0 ]; then
+ /sbin/service zope stop >/dev/null 2>&1
+ /sbin/chkconfig --del zope
+fi
+
+%files
+%defattr(-, root, root, 0775)
+%doc %{zope_home}/doc/
+%doc README.Fedora docs
+%config(noreplace) %{_sysconfdir}/sysconfig/zope
+%config %{_initrddir}/zope
+%config %{_sysconfdir}/cron.daily/zope-logrotate
+%dir %{zope_home}
+%{zope_home}/bin/
+%{zope_home}/import/
+%{zope_home}/lib/
+
+%dir %{zope_home}/skel/
+%config %{zope_home}/skel/etc/
+%{zope_home}/skel/bin/
+%{zope_home}/skel/Extensions/
+%{zope_home}/skel/import/
+%{zope_home}/skel/log/
+%{zope_home}/skel/Products/
+%{zope_home}/skel/README.txt
+%{zope_home}/skel/var/
+
+%defattr(0755, root, root)
+%{_bindir}/zopectl
+
+%defattr(-, zope, zope, 0755)
+%dir %{instance_home}
+%config %{instance_home}/etc/
+%{instance_home}/bin/
+%{instance_home}/Extensions/
+%{instance_home}/import/
+%{instance_home}/log/
+%{instance_home}/Products/
+%{instance_home}/README.txt
+%{instance_home}/var/
+
+%changelog
+* Thu Nov 09 2006 Dag Wieers <dag at wieers.com> - 2.8.7-1
+- Updated to release 2.8.7.
+
+* Wed Aug 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.8.3-5
+- Security: fix world-writable permissions on logrotate config files
+ and README.Fedora (#200794).
+
+* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.8.3-4
+- add Hotfix_20060705
+
+* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
+- rebuild
+
+* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
+- add warning about zope 2.8 & python 2.4 (bug 171681)
+
+* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
+- version 2.8.3
+
+* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
+- version 2.8.2
+
+* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
+- version 2.8.1
+
+* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
+- rebuild
+
+* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
+- version 2.8.0
+
+* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-2
+- don't remove the zope user un postun (to keep the Data.fs to the
+ correct owner after removal)
+
+* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1%{?dist}
+- version 2.7.6
+- use disttag
+
+* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
+- add hotfix
+
+* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
+- version 2.7.5
+- drop Epoch
+- change release tag for FC4
+- convert some tabs into spaces
+
+* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
+- version 2.7.4
+- flag the documentation as %%doc
+- make %%zope_home go+rx to allow users to create instances and to allow
+ access to docs
+- add a logrotate cron job
+- flag config files as %%config even in %%zope_home and %%instance_home
+
+* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
+- activate "security-policy-implementation python" in zope.conf
+
+* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
+- revert to zope's default directory tree to allow multiple instances
+- make the zopectl script multiple-instaces-aware.
+- add README.Fedora
+
+* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.4
+- compile scripts in %zope_home/bin too
+- keep skel dir in %zope_home to fix mkzopeinstance
+- BuildRequire python, since python-devel doesn't require it.
+
+* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.3
+- compile .pyc instead of just touch-ing them
+
+* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
+- deal with leftover .pyc files
+- minor spec cleanups
+
+* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.1
+- fix scriptlets requirements
+- use standard buildroot
+- replace %%buildroot by RPM_BUILD_ROOT
+- update to 2.7.3
+- drop Hotfix
+- drop patch 1, fixed upstream
+
+* Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
+- add hotfix from Zope.org:
+ http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
+
+* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
+- add patch to warn the user that the initial user cannot be added while
+ Zope is running (from Chris McDonough)
+
+* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.1
+- version 2.7.2
+- remove leftover byte-compilation in %%post
+- Zope 2.7.x really requires python >= 2.3.3
+
+* Wed Jul 14 2004 Rex Dieter <rexdieter at sf.net> 2.7.1-0.fdr.1
+- 2.7.1
+- move files created in %%post back into rpm. Unowned files are bad.
+- make (theoretically) buildable for all rh73-rh90,fc1/2,el3
+ NOTE: lowerred python_minver to 2.2.2 to test builds, though (most)
+ docs claim 2.3.3 is required. (??)
+- don't use Requires(preun,postun)
+- use %%_smp_mflags
+
+* Tue Apr 28 2004 Chris McDonough <chrism at plope.com> 2.7.0-0.fdr.1
+- Prep for submission to Fedora.us by revising work done by Matthias
+- Refer to source files by URL instead of by name
+- Write version.txt into software home in post
+- Don't ship byte-compiled files, instead compile them in post
+- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup)
+- Add patch for objectmanager bug that could effect sites that depend
+ on userid/username separation
+- Improved init script (OK and FAILED now are printed at the appropriate
+ times)
+- Remove runzope workaround by adding a <zoperunner> stanza to the
+ config file.
+- Start in runlevels 345.
+- Known issues:
+ - zopectl is started and runs as the root user at boot time,
+ (although Zope itself runs as the zope user)
+ - no distro-specific docs telling people which port the software
+ runs on or how to add a user via zopectl adduser.
+
+* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6.fr
+- Initial RPM release.
+- The startup/stop needs to be modified further.
+- Currently "zopectl" returns an error although Zope does start...
+
Modified: trunk/rpms/zope/zope.init.in
===================================================================
--- trunk/rpms/zope/zope.init.in 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/zope/zope.init.in 2006-11-13 11:59:42 UTC (rev 4879)
@@ -2,32 +2,50 @@
# Startup script for Zope
#
# chkconfig: - 80 20
-# description: Zope, an powerful and flexible web application server
+# description: Zope, a web application server
#
-# config: <<CONFIG_FILE>>
+# config: $instance/etc/zope.conf
# Source function library.
. /etc/init.d/functions
RETVAL=0
-zopectl="<<ZOPECTL>>"
+zopectl="<<BINDIR>>/zopectl"
+user="<<ZOPE_USER>>"
prog="zope"
start() {
-# action $"Starting $prog: " $zopectl start
- echo -n $"Starting $prog: "
- daemon $zopectl start >/dev/null 2>&1 || :
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
- return $RETVAL
+ output=`$zopectl -u $user start`
+ # the return status of zopectl is not reliable, we need to parse
+ # its output via substring match
+ if echo $output | grep -q "started"; then
+ # success
+ action $"Starting $prog: " /bin/true
+ touch /var/lock/subsys/$prog
+ RETVAL=0
+ else
+ # failed
+ action $"Starting $prog: " /bin/false
+ RETVAL=1
+ fi
+ return $RETVAL
}
stop() {
- action $"Stopping $prog: " $zopectl stop
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
- return $RETVAL
+ output=`$zopectl -u $user stop`
+ # the return status of zopectl is not reliable, we need to parse
+ # its output via substring match
+ if echo $output | grep -q "stopped"; then
+ # success
+ action $"Stopping $prog: " /bin/true
+ rm -f /var/lock/subsys/$prog
+ RETVAL=0
+ else
+ # failed
+ action $"Stopping $prog: " /bin/false
+ RETVAL=1
+ fi
+ return $RETVAL
}
restart() {
Modified: trunk/rpms/zope/zope.logrotate.in
===================================================================
--- trunk/rpms/zope/zope.logrotate.in 2006-11-12 22:36:43 UTC (rev 4878)
+++ trunk/rpms/zope/zope.logrotate.in 2006-11-13 11:59:42 UTC (rev 4879)
@@ -1,10 +1,10 @@
-<<LOG_DIR>>/*.log {
+<<INSTANCE_HOME>>/log/*.log {
missingok
sharedscripts
rotate 4
weekly
compress
postrotate
- <<ZOPECTL>> logreopen
+ <<INSTANCE_HOME>>/bin/zopectl logreopen >/dev/null 2>&1
endscript
}
More information about the svn-commits
mailing list