From 66d3af701347b7e0f31ff138f299d8985cf6e7b1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 28 Nov 2005 17:03:32 +0000
Subject: [PATCH] 1.2RC3

---
 doc/rpm-build/build-egw-rpms.sh    |  6 ++++--
 doc/rpm-build/egroupware-apps.spec |  9 +++++++--
 doc/rpm-build/egroupware.spec      | 10 ++++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/doc/rpm-build/build-egw-rpms.sh b/doc/rpm-build/build-egw-rpms.sh
index 172b1f8a42..9aa8ae90e6 100755
--- a/doc/rpm-build/build-egw-rpms.sh
+++ b/doc/rpm-build/build-egw-rpms.sh
@@ -33,7 +33,7 @@ SPECFILE=egroupware-apps.spec
 SPECFILE2=egroupware.spec
 SPECFILEFEDORA=egroupware-fedora.spec
 
-CONTRIB="backup browser comic email filescenter forum ftp fudforum headlines messenger phpldapadmin phpsysinfo projects registration stocks switchuser tts skel soap xmlrpc"
+CONTRIB="backup browser comic email filescenter forum ftp fudforum headlines messenger phpldapadmin phpsysinfo projects stocks switchuser tts skel soap xmlrpc"
 
 for p in $CONTRIB
 do
@@ -126,7 +126,9 @@ tar czvf $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.gz $EXCLUDE_CONTRIB egroup
 tar czvf $SRCDIR/$PACKAGENAME-contrib-$VERSION-$PACKAGING.tar.gz $ONLY_CONTRIB 			>> $LOGFILE 2>&1
 tar cjvf $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.tar.bz2 $EXCLUDE_CONTRIB egroupware	>> $LOGFILE 2>&1
 tar cjvf $SRCDIR/$PACKAGENAME-contrib-$VERSION-$PACKAGING.tar.bz2 $ONLY_CONTRIB 		>> $LOGFILE 2>&1
-zip -r -9 $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip egroupware -x $ONLY_CONTRIB 	  	>> $LOGFILE 2>&1
+#zip -r -9 $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip egroupware -x $ONLY_CONTRIB 	>> $LOGFILE 2>&1
+find $ONLY_CONTRIB > /tmp/exclude.list
+zip -r -9 $SRCDIR/$PACKAGENAME-$VERSION-$PACKAGING.zip egroupware -x@/tmp/exclude.list	>> $LOGFILE 2>&1
 zip -r -9 $SRCDIR/$PACKAGENAME-contrib-$VERSION-$PACKAGING.zip $ONLY_CONTRIB 	  		>> $LOGFILE 2>&1
 echo "End Build Process of tar.gz, tar.bz, zip"						        >> $LOGFILE 2>&1	
 echo "---------------------------------------"              				>> $LOGFILE 2>&1
diff --git a/doc/rpm-build/egroupware-apps.spec b/doc/rpm-build/egroupware-apps.spec
index 2cf759e4c5..87b5a88c39 100644
--- a/doc/rpm-build/egroupware-apps.spec
+++ b/doc/rpm-build/egroupware-apps.spec
@@ -1,7 +1,7 @@
 %define packagename eGroupWare
 %define egwdirname egroupware
-%define version 1.2RC2
-%define packaging 3
+%define version 1.2RC3
+%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)
 
@@ -595,6 +595,11 @@ rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/.htaccess
 %{prefix}/%{egwdirname}/%{workflow}
 
 %changelog
+* Mon Nov 28 2005 Ralf Becker <RalfBecker@outdoor-training.de> 1.2RC3-1
+- fixed registration app, is not longer in contrib now
+- fixed egroupware zip, which wrongly included the contrib stuff
+- fixed several other bugs
+
 * Fri Nov 25 2005 Ralf Becker <RalfBecker@outdoor-training.de> 1.2RC2-3
 - fixed not working account creation
 - fixed not working category creation in sitemgr
diff --git a/doc/rpm-build/egroupware.spec b/doc/rpm-build/egroupware.spec
index c3752d8efb..454e4994cf 100755
--- a/doc/rpm-build/egroupware.spec
+++ b/doc/rpm-build/egroupware.spec
@@ -1,7 +1,7 @@
 %define packagename eGroupWare
 %define egwdirname egroupware
-%define version 1.2RC2
-%define packaging 3
+%define version 1.2RC3
+%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)
 
@@ -123,6 +123,7 @@ rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/.htaccess
 %{prefix}/%{egwdirname}/phpbrain
 %{prefix}/%{egwdirname}/polls
 %{prefix}/%{egwdirname}/projectmanager
+%{prefix}/%{egwdirname}/registration
 %{prefix}/%{egwdirname}/resources
 %{prefix}/%{egwdirname}/sambaadmin
 %{prefix}/%{egwdirname}/sitemgr
@@ -131,6 +132,11 @@ rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/.htaccess
 %{prefix}/%{egwdirname}/workflow
 
 %changelog
+* Mon Nov 28 2005 Ralf Becker <RalfBecker@outdoor-training.de> 1.2RC3-1
+- fixed registration app, is not longer in contrib now
+- fixed egroupware zip, which wrongly included the contrib stuff
+- fixed several other bugs
+
 * Fri Nov 25 2005 Ralf Becker <RalfBecker@outdoor-training.de> 1.2RC2-3
 - fixed not working account creation
 - fixed not working category creation in sitemgr