1.4.002

doc/rpm-build/build-egw-rpms.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash -x
 # This script work for generating rpms without Root rights
 # When you create rmp's with Root rights and you have as example 
 # the follow command rm -rf / in your script you are in trouble :-)
@@ -73,8 +73,6 @@ echo ""											>> $LOGFILE 2>&1
 date                                                        				>> $LOGFILE 2>&1
 cd $ANONCVSDIR
 	
-#[ "$CVSACCOUNT" = 'pserver:anonymous' ] && CVS_RSH="ssh" cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware login
-
 if [ ! -d egroupware/phpgwapi ]	# new checkout
 then
 	if [ -z "$SVNREVISION" ]; then
@@ -95,7 +93,8 @@ then
 	done
 else											# updating an existing checkout in the build-root
 	echo -n "Updating existing checkout ... "					>> $LOGFILE 2>&1
-	svn update -r HEAD
+	cd egroupware
+	svn update -r HEAD . *
 fi
 
 cd $ANONCVSDIR
@@ -103,42 +102,43 @@ cd $ANONCVSDIR
 echo "done"										>> $LOGFILE 2>&1
 
 echo -n "Change directory rights back ... "						>> $LOGFILE 2>&1
-find . -type d -exec chmod 775 {} \;
+find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 echo "done"										>> $LOGFILE 2>&1
 
 echo -n "Starting anti virus scan ... "							>> $LOGFILE 2>&1
-#test -x /usr/bin/clamscan && /usr/bin/clamscan --quiet -r $ANONCVSDIR --log=$VIRUSSCAN
+test -x /usr/bin/clamscan && /usr/bin/clamscan --quiet -r $ANONCVSDIR --log=$VIRUSSCAN
 echo "done"										>> $LOGFILE 2>&1
 
 rm -rf $NOSVNDIR/egroupware
 cp -ra $ANONCVSDIR/egroupware $NOSVNDIR
 find $NOSVNDIR -name .svn | xargs rm -rf
 
-cd $ANONCVSDIR
+# building no longer packages with svn dirs
-echo -n "building tar.gz ... "								>> $LOGFILE 2>&1
+#cd $ANONCVSDIR
-tar czf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.tar.gz $EXCLUDE_CONTRIB egroupware  	2>&1 | tee -a $LOGFILE
+#echo -n "building tar.gz ... "								>> $LOGFILE 2>&1
-for CONTRIBMODULE in $EXTRAPACKAGES; do
+#tar czf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.tar.gz $EXCLUDE_CONTRIB egroupware  	2>&1 | tee -a $LOGFILE
-	tar czf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.tar.gz egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
+#for CONTRIBMODULE in $EXTRAPACKAGES; do
-done
+#	tar czf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.tar.gz egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
-echo "done"										>> $LOGFILE 2>&1
+#done
+#echo "done"										>> $LOGFILE 2>&1
 
-echo -n "building tar.bz2 ... "						     		>> $LOGFILE 2>&1
+#echo -n "building tar.bz2 ... "						     		>> $LOGFILE 2>&1
-tar cjf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.tar.bz2 $EXCLUDE_CONTRIB egroupware	>> $LOGFILE 2>&1
+#tar cjf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.tar.bz2 $EXCLUDE_CONTRIB egroupware	>> $LOGFILE 2>&1
-for CONTRIBMODULE in $EXTRAPACKAGES; do
+#for CONTRIBMODULE in $EXTRAPACKAGES; do
-	tar cjf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.tar.bz2 egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
+#	tar cjf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.tar.bz2 egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
-done
+#done
-echo "done"										>> $LOGFILE 2>&1
+#echo "done"										>> $LOGFILE 2>&1
 
-echo -n "building zip ... "								>> $LOGFILE 2>&1
+#echo -n "building zip ... "								>> $LOGFILE 2>&1
-find $ONLY_CONTRIB > /tmp/exclude.list
+#find $ONLY_CONTRIB > /tmp/exclude.list
-zip -q -r -9 $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.zip egroupware -x@/tmp/exclude.list	>> $LOGFILE 2>&1
+#zip -q -r -9 $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING-svn.zip egroupware -x@/tmp/exclude.list	>> $LOGFILE 2>&1
-for CONTRIBMODULE in $EXTRAPACKAGES; do
+#for CONTRIBMODULE in $EXTRAPACKAGES; do
-	zip -q -r -9 $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.zip egroupware/$CONTRIBMODULE 	>> $LOGFILE 2>&1
+#	zip -q -r -9 $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING-svn.zip egroupware/$CONTRIBMODULE 	>> $LOGFILE 2>&1
-done
+#done
-echo "done"										>> $LOGFILE 2>&1
+#echo "done"										>> $LOGFILE 2>&1
 
-echo "Building tar.gz, tar.bz and zip archives with svn finnished"				>> $LOGFILE 2>&1
+#echo "Building tar.gz, tar.bz and zip archives with svn finnished"				>> $LOGFILE 2>&1
 
 cd $NOSVNDIR
 echo -n "building tar.gz ... "								>> $LOGFILE 2>&1
@@ -202,7 +202,7 @@ echo "------------------------------------------"              				>> $LOGFILE 2
 
 # cleaner md5sum file, the old one gave me a headache ;-)
 cd $SRCDIR
-for f in eGroupWare-$VERSION.$PACKAGING.*
+for f in eGroupWare*-$VERSION.$PACKAGING.*
 do
 	md5sum $f >> $MD5SUM 2>&1
 done

doc/rpm-build/egroupware-1.4.spec

@@ -1,13 +1,15 @@
 %define packagename eGroupWare
 %define egwdirname egroupware
 %define egwversion 1.4
-%define packaging 001
+%define packaging 002
 #%define epoch 1
 %if 0%{?suse_version}
 	%define httpdroot /srv/www/htdocs
 	%define httpdconfd /etc/apache2/conf.d
 	%define source5 egroupware_suse.tar.bz2
 	%define distribution SUSE Linux %{?suse_version}
+	%define php php5
+	%define extra_requires apache2-mod_php5 
 %endif
 %if 0%{?fedora_version}
 	%define httpdroot /var/www/html
@@ -15,13 +17,17 @@
 	%define osversion %{?fedora_version}
 	%define source5 egroupware_fedora.tar.bz2
 	%define distribution Fedora Core %{?fedora_version}
+	%define php php
+	%define extra_requires httpd 
 %endif
 %if 0%{?mandriva_version}
 	%define httpdroot /var/www/html
 	%define httpdconfd /etc/httpd/conf.d
 	%define osversion %{?mandriva_version}
 	%define source5 egroupware_fedora.tar.bz2
-	%define distribution Madriva %{?mandriva_version}
+	%define distribution Mandriva %{?mandriva_version}
+	%define php php
+	%define extra_requires httpd 
 %endif
 
 %define addressbook addressbook
@@ -71,7 +77,7 @@ Source5: %{?source5}
 #Patch0: manageheader.php.patch
 #Patch1: class.uiasyncservice.inc.php.patch
 BuildRoot: /tmp/%{packagename}-buildroot
-Requires: php5 php5-mbstring php5-imap php5-gd apache2-mod_php5 php5-pear cron %{packagename}-egw-pear = %{egwversion}.%{packaging}
+Requires: %{php} %{php}-mbstring %{php}-imap %{php}-gd %{php}-pear %{extra_requires} cron %{packagename}-egw-pear = %{egwversion}.%{packaging}
 Provides: egw-core egw-%{addressbook} egw-%{etemplate}
 Conflicts: %{packagename}-core %{packagename}-%{addressbook} %{packagename}-%{bookmarks} %{packagename}-%{calendar} %{packagename}-%{developer_tools} %{packagename}-%{emailadmin} %{packagename}-%{felamimail} %{packagename}-%{filemanager} %{packagename}-%{infolog} %{packagename}-%{manual} %{packagename}-%{mydms} %{packagename}-%{news_admin} %{packagename}-%{phpbrain} %{packagename}-%{polls} %{packagename}-%{projectmanager} %{packagename}-%{registration} %{packagename}-%{resources} %{packagename}-%{sambaadmin} %{packagename}-%{sitemgr} %{packagename}-%{syncml} %{packagename}-%{timesheet} %{packagename}-%{wiki}
                                                                                                                              
@@ -100,7 +106,7 @@ Further contributed applications are avalible in single packages.
 %package core
 Summary: The eGroupWare contrib package
 Group: Web/Database
-Requires: php5 php5-mbstring php5-imap php5-gd php5-pear apache2-mod_php5 cron
+#Requires: %{php} %{php}-mbstring %{php}-imap %{php}-gd %{php}-pear %{extra_requires} cron %{packagename}-egw-pear = %{egwversion}.%{packaging}
 Provides: egw-core
 Conflicts: %{packagename}
 %description core
@@ -155,6 +161,7 @@ They can search the sources for new / added phrases and show you the ones missin
 Version: %{egwversion}.%{packaging}
 Summary: The eGroupWare egw-pear application
 Group: Web/Database
+Requires: %{php}-pear
 #Conflicts: %{packagename}
 AutoReqProv: no
 Requires: egw-core = %{egwversion}.%{packaging}
@@ -695,6 +702,9 @@ ln -s sitemgr/sitemgr-link
 
 
 %changelog
+* Mon Sep 24 2007 Ralf Becker <RalfBecker@outdoor-training.de> 1.4.002
+- eGroupWare 1.4.002 bugfix & maintainace release
+
 * Mon Jun 4 2007 Ralf Becker <RalfBecker@outdoor-training.de> 1.4.001
 - final eGroupWare 1.4 release