rpms/zope/devel zope.logrotate.cron.in, NONE, 1.1 zope.logrotate.in, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zope.spec, 1.1, 1.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jan 29 22:57:19 UTC 2005
Author: scop
Update of /cvs/extras/rpms/zope/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16501/devel
Modified Files:
.cvsignore sources zope.spec
Added Files:
zope.logrotate.cron.in zope.logrotate.in
Log Message:
auto-import zope-2.7.4-1 on branch devel from zope-2.7.4-1.src.rpm
--- NEW FILE zope.logrotate.cron.in ---
#!/bin/bash
. <<SYSCONFDIR>>/sysconfig/zope
for instance in $ZOPE_INSTANCES; do
logrotate $instance/etc/logrotate.conf
done
--- NEW FILE zope.logrotate.in ---
<<INSTANCE_HOME>>/log/*.log {
missingok
sharedscripts
rotate 4
weekly
compress
postrotate
<<INSTANCE_HOME>>/bin/zopectl logreopen >/dev/null 2>&1
endscript
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Jan 2005 12:09:24 -0000 1.2
+++ .cvsignore 29 Jan 2005 22:57:17 -0000 1.3
@@ -1 +1 @@
-Zope-2.7.3-0.tgz
+Zope-2.7.4-0.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Jan 2005 12:09:24 -0000 1.2
+++ sources 29 Jan 2005 22:57:17 -0000 1.3
@@ -1 +1 @@
-15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz
+97c310f1de4609956c176588b08b25c5 Zope-2.7.4-0.tgz
Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.spec 9 Jan 2005 12:09:24 -0000 1.1
+++ zope.spec 29 Jan 2005 22:57:17 -0000 1.2
@@ -12,19 +12,20 @@
Name: zope
Summary: Web application server for flexible content management applications
-Version: 2.7.3
-Release: 6
+Version: 2.7.4
+Release: 1
License: ZPL
Group: System Environment/Daemons
URL: http://www.zope.org/
-Source: http://zope.org/Products/Zope/2.7.3/Zope-2.7.3-0.tgz
+Source: http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: zope.init.in
-#Source2: http://plope.com/software/zope-rpm/zope.logrotate.in
Source2: zope.sysconfig.in
Source3: zope.zopectl.in
Source4: zope-README.Fedora
+Source5: zope.logrotate.in
+Source6: zope.logrotate.cron.in
Patch0: zope-2.7.3-config.patch
BuildRequires: python-devel >= %{python_minver}
@@ -47,7 +48,9 @@
# Do not use -b option, or we'll install the backup too
%patch0 -p1 -b .config
rm -f skel/etc/zope.conf.in.config
+chmod -x skel/import/README.txt
cp -p %{SOURCE4} README.Fedora
+cp -p %{SOURCE5} skel/etc/logrotate.conf.in
%build
@@ -75,6 +78,7 @@
install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope
install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope
install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl
+install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate
perl -pi -e 's,<<SYSCONFDIR>>,%{_sysconfdir},g;
s,<<BINDIR>>,%{_bindir},g;
s,<<LOCALSTATEDIR>>,%{_localstatedir},g;
@@ -82,12 +86,13 @@
$RPM_BUILD_ROOT%{_initrddir}/zope \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \
$RPM_BUILD_ROOT%{_bindir}/zopectl \
+ $RPM_BUILD_ROOT%{_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="$RPM_BUILD_ROOT%{_localstatedir}/lib/zope" \
+ --targetdir="$RPM_BUILD_ROOT%{instance_home}" \
--replace="INSTANCE_HOME:%{instance_home}" \
--replace="SOFTWARE_HOME:%{software_home}" \
--replace="ZOPE_HOME:%{zope_home}" \
@@ -96,7 +101,8 @@
# Actually copy all the other files over
make install
-chmod 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/zope
+chmod 700 $RPM_BUILD_ROOT%{instance_home}
+chmod 755 $RPM_BUILD_ROOT%{zope_home}
# Symlink to include in the docs
ln -sf %{zope_home}/doc docs
@@ -110,6 +116,8 @@
compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \
ddir=\"%{zope_home}\", force=1)"
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -137,18 +145,50 @@
fi
+
%files
%defattr(-, root, root, -)
+%doc %{zope_home}/doc
%doc docs README.Fedora
%config(noreplace) %{_sysconfdir}/sysconfig/zope
%config %{_initrddir}/zope
+%config %{_sysconfdir}/cron.daily/zope-logrotate
%attr(0755, root, root) %{_bindir}/zopectl
-%{zope_home}
-%attr(-, %{zope_user}, %{zope_group}) %verify(not md5 size mtime) %{instance_home}
+%dir %{zope_home}
+%{zope_home}/bin
+%{zope_home}/import
+%{zope_home}/lib
+%dir %{zope_home}/skel
+%{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
+%config %{zope_home}/skel/etc
+%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
+%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+
%changelog
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-6
+* 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
More information about the fedora-extras-commits
mailing list