From a27466da3f2290f0ef1d0159c644f0def57352ec Mon Sep 17 00:00:00 2001 From: reinerj Date: Sat, 31 Jul 2004 19:54:35 +0000 Subject: [PATCH] update the spec files and the build script --- doc/rpm-build/build-egw-rpms.sh | 10 +++++----- doc/rpm-build/egroupware-allapp.spec | 11 ++++++++++- doc/rpm-build/egroupware-fedora.spec | 14 +++++++++++--- doc/rpm-build/egroupware.spec | 25 +++++++++++++++++++++++-- 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/doc/rpm-build/build-egw-rpms.sh b/doc/rpm-build/build-egw-rpms.sh index 2b3bc71c7b..f8cd29d0cc 100755 --- a/doc/rpm-build/build-egw-rpms.sh +++ b/doc/rpm-build/build-egw-rpms.sh @@ -61,7 +61,7 @@ echo "Start Build Process of - $PACKAGENAME $VERSION" echo "---------------------------------------" >> $LOGFILE 2>&1 date >> $LOGFILE 2>&1 cd $ANONCVSDIR -cvs -z9 update -dP >> $LOGFILE 2>&1 +cvs -z9 update -r Version-1_0_0-branch -dP >> $LOGFILE 2>&1 echo ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/egroupware" > Root.anonymous find . -type d -name CVS -exec cp /build_root/egroupware/Root.anonymous {}/Root \; >> $LOGFILE 2>&1 rm Root.anonymous @@ -148,10 +148,10 @@ echo "Start Build Process of - $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDOR echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1 date >> $LOGFILEFEDORA 2>&1 cd $ANONCVSDIRFEDORA -cvs -z3 -d:ext:reinerj@cvs.sourceforge.net:/cvsroot/egroupware co egroupware >> $LOGFILEFEDORA 2>&1 -echo "must wait to finish this job" +cvs -z9 -d:ext:reinerj@cvs.sourceforge.net:/cvsroot/egroupware co -r Version-1_0_0-branch egroupware >> $LOGFILEFEDORA 2>&1 +echo "must wait to finish this job" >> $LOGFILEFEDORA 2>&1 cd $ANONCVSDIRFEDORABUILD >> $LOGFILEFEDORA 2>&1 -cvs co all >> $LOGFILEFEDORA 2>&1 +cvs co -r Version-1_0_0-branch all >> $LOGFILEFEDORA 2>&1 echo "first files are updated and now we must delete the old ones" >> $LOGFILEFEDORA 2>&1 cvs -z9 update -dP >> $LOGFILEFEDORA 2>&1 find . -type d -name CVS | xargs rm -rf @@ -192,7 +192,7 @@ date cd $ANONCVSDIRFEDORA -/opt/installbuilder-1.0.2/bin/builder build /opt/installbuilder-1.0.2/projects/egroupware.xml +/opt/installbuilder-1.1.0/bin/builder build /opt/installbuilder-1.1.0/projects/egroupware.xml rm -rf egroupware echo "Fedora Build Root deleted $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEBIT 2>&1 diff --git a/doc/rpm-build/egroupware-allapp.spec b/doc/rpm-build/egroupware-allapp.spec index 6121794a1a..8daaa20e59 100755 --- a/doc/rpm-build/egroupware-allapp.spec +++ b/doc/rpm-build/egroupware-allapp.spec @@ -1,6 +1,6 @@ %define packagename eGroupWare-all-apps %define egwdirname egroupware -%define version 0.9.99.026 +%define version 1.0.00.002 %define packaging 1 %define epoch 0 %define httpdroot %(if test -f /etc/SuSE-release; then echo /srv/www/htdocs; else echo /var/www/html; fi) @@ -117,6 +117,7 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %{prefix}/%{egwdirname}/headlines %{prefix}/%{egwdirname}/infolog %{prefix}/%{egwdirname}/jinn +%{prefix}/%{egwdirname}/manual %{prefix}/%{egwdirname}/messenger %{prefix}/%{egwdirname}/news_admin %{prefix}/%{egwdirname}/phpbrain @@ -132,6 +133,14 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %{prefix}/%{egwdirname}/wiki %changelog +* Sat Jul 31 2004 Reiner Jung 1.0.00.002-1 +- fixing critical bugs in all applications +- MS SQL server support is back +- language extensions + +* Sun Jul 11 2004 Reiner Jung 1.0.00.001-1 +- bug fixing in all applications + * Thu Jun 29 2004 Reiner Jung 0.9.99.026-1 - JiNN extended. - projects updated diff --git a/doc/rpm-build/egroupware-fedora.spec b/doc/rpm-build/egroupware-fedora.spec index 33b17e6191..1603c59d7a 100755 --- a/doc/rpm-build/egroupware-fedora.spec +++ b/doc/rpm-build/egroupware-fedora.spec @@ -1,13 +1,13 @@ Name: eGroupWare -Version: 0.9.99 -Release: 0.fdr.1.rc6 +Version: 1.0.00 +Release: 0.fdr.1.rc8 Epoch: 0 Summary: eGroupWare is a web-based groupware suite written in php. Group: Web/Database License: GPL/LGPL URL: http://www.egroupware.org/ -Source0: http://download.sourceforge.net/egroupware/eGroupWare-0.9.99.0.fdr.1.rc6.tar.gz +Source0: http://download.sourceforge.net/egroupware/eGroupWare-1.0.00.0.fdr.1.rc8.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php php-mysql php-imap php-xmlrpc @@ -67,6 +67,14 @@ cp -aRf * $RPM_BUILD_ROOT/var/www/html/egroupware /var/www/html/egroupware/* %changelog +* Sat Jul 31 2004 Reiner Jung 1.0.00.0.fdr.1.rc8 +- fixing critical bugs in all applications +- MS SQL server support is back +- language extensions + +* Sun Jul 11 2004 Reiner Jung 1.0.00.0.fdr.1.rc7 +- bug fixing in all applications + * Thu Jun 29 2004 Reiner Jung 0.9.99.00.fdr.1.rc6 - JiNN extended. - projects updated diff --git a/doc/rpm-build/egroupware.spec b/doc/rpm-build/egroupware.spec index bc52584dda..e567c0c055 100755 --- a/doc/rpm-build/egroupware.spec +++ b/doc/rpm-build/egroupware.spec @@ -1,6 +1,6 @@ %define packagename eGroupWare %define egwdirname egroupware -%define version 0.9.99.026 +%define version 1.0.00.002 %define packaging 1 %define epoch 0 %define httpdroot %(if test -f /etc/SuSE-release; then echo /srv/www/htdocs; else echo /var/www/html; fi) @@ -23,6 +23,7 @@ %define headlines headlines %define infolog infolog %define jinn jinn +%define manual manual %define messenger messenger %define news_admin news_admin %define phpldapadmin phpldapadmin @@ -213,8 +214,16 @@ Requires: eGroupWare = %{version}-%{packaging} %description %{jinn} The %{jinn} app is a multi-site, multi-database, multi-user/-group, database driven Content Management System written in and for the eGroupWare Framework. +%package %{manual} +Summary: The eGroupWare %{manual} application +Group: Web/Database +AutoReqProv: no +Requires: eGroupWare = %{version}-%{packaging} +%description %{manual} +This is the %{manual} app for eGroupWare. + %package %{messenger} -Summary: The eGroupWare %{version} application +Summary: The eGroupWare %{messenger} application Group: Web/Database AutoReqProv: no Requires: eGroupWare = %{version}-%{packaging} @@ -451,6 +460,10 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %defattr(0744,root,root) %{prefix}/%{egwdirname}/%{jinn} +%files %{manual} +%defattr(0744,root,root) +%{prefix}/%{egwdirname}/%{manual} + %files %{messenger} %defattr(0744,root,root) %{prefix}/%{egwdirname}/%{messenger} @@ -504,6 +517,14 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %{prefix}/%{egwdirname}/%{wiki} %changelog +* Sat Jul 31 2004 Reiner Jung 1.0.00.002-1 +- fixing critical bugs in all applications +- MS SQL server support is back +- language extensions + +* Sun Jul 11 2004 Reiner Jung 1.0.00.001-1 +- bug fixing in all applications + * Thu Jun 29 2004 Reiner Jung 0.9.99.026-1 - JiNN extended. - projects updated