From 31fe84bd6f5874ee33568f1e249daf4177e7524f Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 15 Apr 2005 18:09:13 +0000 Subject: [PATCH] build-script, specs and .rpmmacros used for the 1.0.0.007 --- doc/rpm-build/.rpmmacros | 73 +++++++++++++++ doc/rpm-build/build-egw-rpms.sh | 129 ++++++++++++++------------- doc/rpm-build/egroupware-allapp.spec | 21 +++-- doc/rpm-build/egroupware-fedora.spec | 11 ++- doc/rpm-build/egroupware.spec | 34 +++---- 5 files changed, 175 insertions(+), 93 deletions(-) create mode 100644 doc/rpm-build/.rpmmacros diff --git a/doc/rpm-build/.rpmmacros b/doc/rpm-build/.rpmmacros new file mode 100644 index 0000000000..c48d3f50e0 --- /dev/null +++ b/doc/rpm-build/.rpmmacros @@ -0,0 +1,73 @@ +%packager eGroupWare packager +#%vendor Tao Linux +# +#%distribution bonis.de RPMS +#%vendor bonis.de +#%_signature gpg +%_gpg_name eGroupWare packager +#%_gpg_path %(echo $HOME)/.gnupg + +# %_topdir defines the top directory to be used for RPM building purposes +# By defaultROOT of the buildsystem +%_topdir %(echo $HOME)/rpm + +%_rpmtopdir %{_topdir}/%{name} + +# %_sourcedir is where the source code tarballs, patches, etc. will be +# placed after you do an "rpm -ivh somepackage.1.0-1.src.rpm" +#%_sourcedir %{_topdir}/%{name}-%{version} + +# %_specdir is where the specfile gets placed when installing a src.rpm. I +# prefer the specfile to be in the same directory as the source tarballs, etc. +%_specdir %{_sourcedir} + +# %_tmppath is where temporary scripts are placed during the RPM build +# process as well as the %_buildroot where %install normally dumps files +# prior to packaging up the final binary RPM's. +%_tmppath %{_topdir}/tmp + +# %_builddir is where source code tarballs are decompressed, and patches then +# applied when building an RPM package +#%_builddir %{_topdir}/tmp/BUILD + +# %_buildroot is where files get placed during the %install section of spec +# file processing prior to final packaging into rpms. This is oddly named +# and probably should have been called "%_installroot" back when it was +# initially added to RPM. Alas, it was not. ;o) +#%_buildroot %{_topdir}/%{_tmppath}/%{name}-%{version}-root + +# %_rpmdir is where binary RPM packages are put after being built. +%_rpmdir %{_topdir}/RPMS + +# %_srcrpmdir is where src.rpm packages are put after being built. +%_srcrpmdir %{_topdir}/SRPMS + +# %_rpmfilename defines the naming convention of the produced RPM packages, +# and should not be modified. It is listed here because I am overriding +# RPM's default behaviour of dropping binary RPM's each in their own +# separate subdirectories. I hate that. Grrr. +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm + +# Customized tags for local builds +# %packager is the info that will appear in the "Packager:" field in the +# RPM header on built packages. By default I have it read your username +# and hostname. This should be customized appropriately. +# %packager Joe Blow +# %packager %(echo ${USER}@)%(hostname) +# %distribution Personal Build + +# GNU GPG config below +#%_signature gpg +#%_gpg_name Joe Blow +#%_gpg_path %(echo $HOME)/.gnupg + + +# %_unpackaged_files_terminate_build 0 +# %_missing_doc_files_terminate_build 0 + +# in the .spec file: +# %define _unpackaged_files_terminate_build 0 +# %define _missing_doc_files_terminate_build 0 +# +# %define __find_requires %{nil} +# AutoReq: 0 diff --git a/doc/rpm-build/build-egw-rpms.sh b/doc/rpm-build/build-egw-rpms.sh index 673a516c05..6188cd00bb 100755 --- a/doc/rpm-build/build-egw-rpms.sh +++ b/doc/rpm-build/build-egw-rpms.sh @@ -23,6 +23,9 @@ # Document # # Script changed 2004 May 21 Reiner Jung +# Script changed 2005 Apr 15 by Ralf Becker and Wim Bonis + +BRANCH=Version-1_0_0-branch SPECFILE=egroupware.spec SPECFILE2=egroupware-allapp.spec @@ -42,10 +45,12 @@ PACKAGING=`grep "%define packaging" $SPECFILE | cut -f3 -d' '` PACKAGINGFEDORA=`grep "Release:" $SPECFILEFEDORA | cut -f2 -d' '` HOMEBUILDDIR=`whoami` -ANONCVSDIR=/build_root/egroupware -ANONCVSDIRFEDORA=/build_root/fedora -ANONCVSDIRFEDORABUILD=/build_root/fedora/egroupware -RHBASE=/home/$HOMEBUILDDIR/redhat +CVSACCOUNT=ext:ralfbecker +#CVSACCOUNT=pserver:anonymous +ANONCVSDIR=/tmp/build_root/egroupware +ANONCVSDIRFEDORA=/tmp/build_root/fedora +ANONCVSDIRFEDORABUILD=/tmp/build_root/fedora/egroupware +RHBASE=$HOME/rpm SRCDIR=$RHBASE/SOURCES SPECDIR=$RHBASE/SPECS LOGFILE=$SPECDIR/build-$PACKAGENAME-$VERSION-$PACKAGING.log @@ -57,13 +62,31 @@ MD5SUM=$SRCDIR/md5sum-$PACKAGENAME-$VERSION-$PACKAGING.txt MD5SUMFEDORA=$SRCDIR/md5sum-$PACKAGENAMEFEDORA-$VERSIONFEDORA.$PACKAGINGFEDORA.txt + +mkdir -p $RHBASE/SOURCES $RHBASE/SPECS $RHBASE/BUILD $RHBASE/SRPMS $RHBASE/RPMS $ANONCVSDIR $ANONCVSDIRFEDORA $ANONCVSDIRFEDORABUILD + +cp $SPECFILE $SPECFILE2 $SPECFILEFEDORA $RHBASE/SPECS/ + echo "Start Build Process of - $PACKAGENAME $VERSION" > $LOGFILE echo "---------------------------------------" >> $LOGFILE 2>&1 date >> $LOGFILE 2>&1 cd $ANONCVSDIR -cvs -z9 update -r Version-1_0_0-branch -dP >> $LOGFILE 2>&1 + +if [ ! -d egroupware ] ; then + + [ $CVSACCOUT = 'pserver:anonymous'] && cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware login + + cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -r $BRANCH egroupware + cd egroupware + cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -r $BRANCH all + +fi +cd $ANONCVSDIR + +cvs -z9 update -r $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 +find . -type d -name CVS -exec cp Root.anonymous {}/Root \; >> $LOGFILE 2>&1 rm Root.anonymous echo "End from CVS update" >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 @@ -72,13 +95,13 @@ find . -type f -exec chmod 644 {} \; echo "Change the direcory rights back" >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 -clamscan -r $ANONCVSDIR --log=$VIRUSSCAN +# clamscan -r $ANONCVSDIR --log=$VIRUSSCAN +# +# echo "End from Anti Virus Scan" >> $LOGFILE 2>&1 +# echo "---------------------------------------" >> $LOGFILE 2>&1 -echo "End from Anti Virus Scan" >> $LOGFILE 2>&1 -echo "---------------------------------------" >> $LOGFILE 2>&1 - -cd $ANONCVSDIR/.. -tar czvf $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz egroupware >> $LOGFILE 2>&1 +cd $ANONCVSDIR +tar czvf $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz egroupware 2>&1 | tee -a $LOGFILE tar cjvf $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.bz2 egroupware >> $LOGFILE 2>&1 zip -r -9 $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip egroupware >> $LOGFILE 2>&1 echo "End Build Process of tar.gz, tar.bz, zip" >> $LOGFILE 2>&1 @@ -99,7 +122,8 @@ md5sum $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip | cut -f1 -d' ' >> $MD echo "End Build md5sum of tar.gz, tar.bz, zip" >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 echo "sign the md5sum file" >> $LOGFILE 2>&1 -gpg --clearsign $MD5SUM >> $LOGFILE 2>&1 +rm -f $MD5SUM.asc >> $LOGFILE 2>&1 +gpg --local-user packager@egroupware.org --clearsign $MD5SUM >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 echo "delete the original md5sum file" >> $LOGFILE 2>&1 @@ -108,33 +132,36 @@ echo "---------------------------------------" >> $LOGFILE 2>&1 echo "Build signed source files" >> $LOGFILE 2>&1 -gpg -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz >> $LOGFILE 2>&1 -gpg -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.bz2 >> $LOGFILE 2>&1 -gpg -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip >> $LOGFILE 2>&1 +rm -f $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz.gpg >> $LOGFILE 2>&1 +gpg --local-user packager@egroupware.org -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz >> $LOGFILE 2>&1 +rm -f $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.bz2.gpg >> $LOGFILE 2>&1 +gpg --local-user packager@egroupware.org -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.bz2 >> $LOGFILE 2>&1 +rm -f $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip.gpg >> $LOGFILE 2>&1 +gpg --local-user packager@egroupware.org -s $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip >> $LOGFILE 2>&1 echo "End build of signed of tar.gz, tar.bz, zip" >> $LOGFILE 2>&1 -echo "---------------------------------------" >> $LOGFILE 2>&1 +echo "------------------------------------------" >> $LOGFILE 2>&1 cd $SPECDIR -rpmbuild -ba --sign $SPECFILE >> $LOGFILE 2>&1 +rpmbuild -ba --sign $SPECFILE 2>&1 | tee -a $LOGFILE echo "End Build Process of - $PACKAGENAME $VERSION single packages" >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 -rpmbuild -ba --sign $SPECFILE2 >> $LOGFILE 2>&1 +rpmbuild -ba --sign $SPECFILE2 2>&1 | tee -a $LOGFILE echo "End Build Process of - $PACKAGENAME $VERSION all applications" >> $LOGFILE 2>&1 echo "---------------------------------------" >> $LOGFILE 2>&1 -echo "Change the CVS dir back from anonymous to CVS user" >> $LOGFILE 2>&1 -echo "---------------------------------------" >> $LOGFILE 2>&1 -cd $ANONCVSDIR -echo ":ext:reinerj@cvs.sourceforge.net:/cvsroot/egroupware" > Root.reinerj -find . -type d -name CVS -exec cp /build_root/egroupware/Root.reinerj {}/Root \; >> $LOGFILE 2>&1 -rm Root.reinerj -echo "Change the direcory rights back" >> $LOGFILE 2>&1 -echo "---------------------------------------" >> $LOGFILE 2>&1 -find . -type d -exec chmod 775 {} \; -find . -type f -exec chmod 644 {} \; +#echo "Change the CVS dir back from anonymous to CVS user" >> $LOGFILE 2>&1 +#echo "---------------------------------------" >> $LOGFILE 2>&1 +#cd $ANONCVSDIR +#echo ":ext:ralfbecker@cvs.sourceforge.net:/cvsroot/egroupware" > Root.reinerj +#find . -type d -name CVS -exec cp /build_root/egroupware/Root.reinerj {}/Root \; >> $LOGFILE 2>&1 +#rm Root.reinerj +#echo "Change the direcory rights back" >> $LOGFILE 2>&1 +#echo "---------------------------------------" >> $LOGFILE 2>&1 +#find . -type d -exec chmod 775 {} \; +#find . -type f -exec chmod 644 {} \; ############################################################################################################## @@ -144,28 +171,6 @@ find . -type f -exec chmod 644 {} \; ############################################################################################################## -echo "Start Build Process of - $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" > $LOGFILEFEDORA -echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1 -date >> $LOGFILEFEDORA 2>&1 -cd $ANONCVSDIRFEDORA -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 -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 -find . -type d -exec chmod 775 {} \; -find . -type f -exec chmod 644 {} \; - -echo "End from Fedora CVS update" >> $LOGFILEFEDORA 2>&1 -echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1 - -clamscan -r $ANONCVSDIRFEDORABUILD --log=$VIRUSSCANDEFORA - -echo "End from Fedora Anti Virus Scan" >> $LOGFILEFEDORA 2>&1 -echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1 - cd $ANONCVSDIRFEDORA tar czvf $SRCDIR/$PACKAGENAMEFEDORA-$VERSIONFEDORA.$PACKAGINGFEDORA.tar.gz egroupware >> $LOGFILEFEDORA 2>&1 @@ -186,18 +191,18 @@ echo "---------------------------------------" ############################################################################################################## -echo "Start build Bitrock packages" > $LOGFILEFEBIT -echo "---------------------------------------" >> $LOGFILEFEBIT 2>&1 -date >> $LOGFILEFEBIT 2>&1 +#echo "Start build Bitrock packages" > $LOGFILEFEBIT +#echo "---------------------------------------" >> $LOGFILEFEBIT 2>&1 +#date >> $LOGFILEFEBIT 2>&1 +# +#cd $ANONCVSDIRFEDORA +# +#echo "build bitrock Linux package" >> $LOGFILEFEBIT 2>&1 +#/opt/installbuilder-2.0/bin/builder build /opt/installbuilder-2.0/projects/egroupware.xml linux +#echo "build bitrock Windows package" >> $LOGFILEFEBIT 2>&1 +#/opt/installbuilder-2.0/bin/builder build /opt/installbuilder-2.0/projects/egroupware.xml windows -cd $ANONCVSDIRFEDORA - -echo "build bitrock Linux package" >> $LOGFILEFEBIT 2>&1 -/opt/installbuilder-2.0/bin/builder build /opt/installbuilder-2.0/projects/egroupware.xml linux -echo "build bitrock Windows package" >> $LOGFILEFEBIT 2>&1 -/opt/installbuilder-2.0/bin/builder build /opt/installbuilder-2.0/projects/egroupware.xml windows - -rm -rf egroupware +#rm -rf egroupware echo "Fedora Build Root deleted $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEBIT 2>&1 echo "---------------------------------------" >> $LOGFILEFEBIT 2>&1 diff --git a/doc/rpm-build/egroupware-allapp.spec b/doc/rpm-build/egroupware-allapp.spec index 26425a73e2..056d100980 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 1.0.00.006 +%define version 1.0.0.007 %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) @@ -16,23 +16,23 @@ License: GPL/LGPL URL: http://www.egroupware.org/ Source0: http://download.sourceforge.net/egroupware/eGroupWare-%{version}-%{packaging}.tar.bz2 BuildRoot: /tmp/%{packagename}-buildroot -Requires: php >= 4.0.6 +Requires: php >= 4.1.2 Prefix: %{httpdroot} Buildarch: noarch AutoReqProv: no Vendor: eGroupWare -Packager: eGroupWare +Packager: eGroupWare %description eGroupWare is a web-based groupware suite written in PHP. This package provides: -egroupware core app, addressbook, backup, bookmarks, calendar, comic, developer tools, +egroupware core, addressbook, backup, bookmarks, calendar, comic, developer tools, docs, email, emailadmin, etemplate, felamimail, filemanager, forum, ftp, fudforum, headlines, infolog, jinn, messenger news admin, phpldapadmin, phpbrain (knowledgebase), phpsysinfo, polls, projects (advanced project management), registration, sitemgr, -skel, stocks, tts (trouble ticket system), wiki +stocks, tts (trouble ticket system), wiki It also provides an API for developing additional applications. See the egroupware apps project for add-on apps. @@ -44,8 +44,9 @@ apps project for add-on apps. %install [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -mkdir -p $RPM_BUILD_ROOT%{prefix}/%{egwdirname} -cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} +mkdir -p $RPM_BUILD_ROOT%{prefix}/egroupware +cp -aRf * $RPM_BUILD_ROOT%{prefix}/egroupware +rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/.htaccess #cp .htaccess $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %clean @@ -127,12 +128,16 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %{prefix}/%{egwdirname}/projects %{prefix}/%{egwdirname}/registration %{prefix}/%{egwdirname}/sitemgr -%{prefix}/%{egwdirname}/skel %{prefix}/%{egwdirname}/stocks %{prefix}/%{egwdirname}/tts %{prefix}/%{egwdirname}/wiki %changelog +* Sat Apr 15 2005 Ralf Becker 1.0.0.007-1 +- Fixed security problems reported by James from GulfTech Security Research +- new croation translations, significant enhancements in other languages +- many Bugfixes, see http://egroupware.org/changelog-1.0/ + * Sat Nov 06 2004 Reiner Jung 1.0.00.006-1 - Fix a security problem in JiNN application - Bugfixes diff --git a/doc/rpm-build/egroupware-fedora.spec b/doc/rpm-build/egroupware-fedora.spec index f6a0eb7093..5b0298ea55 100755 --- a/doc/rpm-build/egroupware-fedora.spec +++ b/doc/rpm-build/egroupware-fedora.spec @@ -1,13 +1,13 @@ Name: eGroupWare -Version: 1.0.00 -Release: 6.fdr.2 +Version: 1.0.0 +Release: 7.fdr.2 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-1.0.00.6.fdr.2.tar.gz +Source0: http://download.sourceforge.net/egroupware/eGroupWare-1.0.0.007-1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php php-mysql php-imap php-xmlrpc @@ -30,6 +30,8 @@ apps project for add-on apps. [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} mkdir -p $RPM_BUILD_ROOT/var/www/html/egroupware cp -aRf * $RPM_BUILD_ROOT/var/www/html/egroupware +rm -f $RPM_BUILD_ROOT/var/www/html/egroupware/.htaccess + %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} @@ -67,6 +69,9 @@ cp -aRf * $RPM_BUILD_ROOT/var/www/html/egroupware /var/www/html/egroupware/* %changelog +* Sat Nov 06 2004 Reiner Jung 1.0.0.6.fdr.2 +- Test + * Sat Nov 06 2004 Reiner Jung 1.0.00.6.fdr.2 - Fix a security problem in JiNN application - Bugfixes diff --git a/doc/rpm-build/egroupware.spec b/doc/rpm-build/egroupware.spec index 30778c9303..c599b73d2d 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 1.0.00.006 +%define version 1.0.0.007 %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) @@ -33,7 +33,6 @@ %define projects projects %define registration registration %define sitemgr sitemgr -%define skel skel %define stocks stocks %define tts tts %define wiki wiki @@ -49,14 +48,14 @@ License: GPL/LGPL URL: http://www.egroupware.org/ Source0: http://download.sourceforge.net/egroupware/%{packagename}-%{version}-%{packaging}.tar.bz2 BuildRoot: /tmp/%{packagename}-buildroot -Requires: php >= 4.0.6 +Requires: php >= 4.1.2 Prefix: %{httpdroot} Buildarch: noarch AutoReqProv: no Vendor: eGroupWare -Packager: eGroupWare +Packager: eGroupWare %description eGroupWare is a web-based groupware suite written in PHP. @@ -148,7 +147,7 @@ Group: Web/Database AutoReqProv: no Requires: eGroupWare = %{version}-%{packaging}, eGroupWare-addressbook = %{version}-%{packaging} %description %{etemplate} -eTemplates are a new widget-based template system for eGroupWare with an interactive editor and a database table-editor (creates tables_current.inc.php and updates automaticaly tables_update.inc.php) +eTemplates is a new widget-based template system for eGroupWare with an interactive editor and a database schema-editor (creates tables_current.inc.php and updates automaticaly tables_update.inc.php) %package %{felamimail} Summary: The eGroupWare %{felamimail} application @@ -156,7 +155,7 @@ Group: Web/Database AutoReqProv: no Requires: eGroupWare = %{version}-%{packaging}, eGroupWare-emailadmin = %{version}-%{packaging} %description %{felamimail} -The %{felamimail} Email Reader is a other Email application for phpgw eGroupWare. +The %{felamimail} Email Reader is a other Email application for eGroupWare. %package %{filemanager} Summary: The eGroupWare %{filemanager} application @@ -204,7 +203,7 @@ Group: Web/Database AutoReqProv: no Requires: eGroupWare = %{version}-%{packaging}, eGroupWare-etemplate = %{version}-%{packaging} %description %{infolog} -This is the %{infolog} app for eGroupWare. +This is the %{infolog} app for eGroupWare (Notes, ToDo, Phonelogs, CRM). %package %{jinn} Summary: The eGroupWare %{jinn} application @@ -220,7 +219,7 @@ Group: Web/Database AutoReqProv: no Requires: eGroupWare = %{version}-%{packaging} %description %{manual} -This is the %{manual} app for eGroupWare. +This is the %{manual} app for eGroupWare: online help system. %package %{messenger} Summary: The eGroupWare %{messenger} application @@ -286,14 +285,6 @@ Requires: eGroupWare = %{version}-%{packaging} %description %{registration} This is the %{registration} app for eGroupWare. -%package %{skel} -Summary: The eGroupWare Skeleton application -Group: Web/Database -AutoReqProv: no -Requires: eGroupWare = %{version}-%{packaging} -%description %{skel} -This is the Skeleton app for eGroupWare. - %package %{sitemgr} Summary: The eGroupWare Sitemanager CMS application Group: Web/Database @@ -336,6 +327,8 @@ This is the %{wiki} app for eGroupWare. [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} mkdir -p $RPM_BUILD_ROOT%{prefix}/%{egwdirname} cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} +#cp -aRf * $RPM_BUILD_ROOT%{prefix} +rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/.htaccess #cp .htaccess $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %clean @@ -500,10 +493,6 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %defattr(0744,root,root) %{prefix}/%{egwdirname}/%{sitemgr} -%files %{skel} -%defattr(0744,root,root) -%{prefix}/%{egwdirname}/%{skel} - %files %{stocks} %defattr(0744,root,root) %{prefix}/%{egwdirname}/%{stocks} @@ -517,6 +506,11 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname} %{prefix}/%{egwdirname}/%{wiki} %changelog +* Sat Apr 15 2005 Ralf Becker 1.0.0.007-1 +- Fixed security problems reported by James from GulfTech Security Research +- new croation translations, significant enhancements in other languages +- many Bugfixes, see http://egroupware.org/changelog-1.0/ + * Sat Nov 06 2004 Reiner Jung 1.0.00.006-1 - Fix a security problem in JiNN application - Bugfixes