fix a bug in the spec file and update the build shell script

This commit is contained in:
reinerj 2004-07-03 11:09:40 +00:00
parent 5298bee355
commit 22870f672e
4 changed files with 38 additions and 29 deletions

View File

@ -56,6 +56,7 @@ VIRUSSCANFEDORA=$SPECDIR/clamav_scan-$PACKAGENAMEFEDORA-$VERSIONFEDORA.$PACKAGIN
MD5SUM=$SRCDIR/md5sum-$PACKAGENAME-$VERSION-$PACKAGING.txt
MD5SUMFEDORA=$SRCDIR/md5sum-$PACKAGENAMEFEDORA-$VERSIONFEDORA.$PACKAGINGFEDORA.txt
echo "Start Build Process of - $PACKAGENAME $VERSION" > $LOGFILE
echo "---------------------------------------" >> $LOGFILE 2>&1
date >> $LOGFILE 2>&1
@ -148,9 +149,11 @@ echo "---------------------------------------"
date >> $LOGFILEFEDORA 2>&1
cd $ANONCVSDIRFEDORA
cvs -z3 -d:ext:reinerj@cvs.sourceforge.net:/cvsroot/egroupware co egroupware >> $LOGFILEFEDORA 2>&1
cd $ANONCVSDIRFEDORABUILD >> $LOGFILEFEDORA 2>&1
cvs co all >> $LOGFILEFEDORA 2>&1
cvs update -Pd
echo "must wait to finish this job"
cd $ANONCVSDIRFEDORABUILD >> $LOGFILEFEDORA 2>&1
cvs co 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 {} \;
@ -174,10 +177,6 @@ rpmbuild -ba --sign $SPECFILEFEDORA
echo "End Build Process of - $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEDORA 2>&1
echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1
#cd $ANONCVSDIRFEDORA
#rm -rf egroupware
#echo "Fedora Build Root deleted $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEDORA 2>&1
#echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1
##############################################################################################################
@ -187,20 +186,16 @@ echo "---------------------------------------"
##############################################################################################################
echo "Start CVS checkout Bitrock files" > $LOGFILEBIT
echo "---------------------------------------" >> $LOGFILEBIT 2>&1
date >> $LOGFILEBIT 2>&1
echo "Start build Bitrock packages" > $LOGFILEFEBIT
echo "---------------------------------------" >> $LOGFILEFEBIT 2>&1
date >> $LOGFILEFEBIT 2>&1
cd $ANONCVSDIRFEDORA
echo "Start build Bitrock package" > $LOGFILEBIT
echo "---------------------------------------" >> $LOGFILEBIT 2>&1
/opt/installbuilder-1.0.2/bin/builder build /opt/installbuilder-1.0.2/projects/egroupware.xml
rm -rf egroupware
echo "Fedora Build Root deleted $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEDORA 2>&1
echo "---------------------------------------" >> $LOGFILEFEDORA 2>&1
echo "Fedora Build Root deleted $PACKAGENAMEFEDORA $VERSIONFEDORA $PACKAGINGFEDORA" >> $LOGFILEFEBIT 2>&1
echo "---------------------------------------" >> $LOGFILEFEBIT 2>&1

View File

@ -1,6 +1,6 @@
%define packagename eGroupWare-all-apps
%define egwdirname egroupware
%define version 0.9.99.025
%define version 0.9.99.026
%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)
@ -69,7 +69,7 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname}
echo "* the follow lines to you httpd.conf *"
echo "* *"
echo "* <Directory /var/www/html/egroupware> *"
echo "* <Files ~ "\.inc\.php$ \| \.tpl$"> *"
echo "* <Files ~ "\.\(inc.php\|tpl\)$"> *"
echo "* Order allow,deny *"
echo "* Deny from all *"
echo "* </Files> *"
@ -132,12 +132,14 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname}
%{prefix}/%{egwdirname}/wiki
%changelog
* Thu May 21 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.025-1
- JiNN extended
* Thu Jun 29 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.026-1
- JiNN extended.
- projects updated
- new knowledge base available
- new language available Catalan
- languages updated
- many languages updated
- bug fixes in all applications
- extend the usage of indexes for DB tables
* Thu Apr 27 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.015-1
- rewrite of projects added.

View File

@ -1,13 +1,13 @@
Name: eGroupWare
Version: 0.9.99
Release: 0.fdr.1.rc5
Release: 0.fdr.1.rc6
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.rc5.tar.gz
Source0: http://download.sourceforge.net/egroupware/eGroupWare-0.9.99.0.fdr.1.rc6.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: php php-mysql php-imap php-xmlrpc
@ -52,7 +52,7 @@ cp -aRf * $RPM_BUILD_ROOT/var/www/html/egroupware
echo "* the follow lines to you httpd.conf *"
echo "* *"
echo "* <Directory /var/www/html/egroupware> *"
echo "* <Files ~ "\.inc\.php$|.tpl$"> *"
echo "* <Files ~ "\.\(inc.php\|tpl\)$"> *"
echo "* Order allow,deny *"
echo "* Deny from all *"
echo "* </Files> *"
@ -67,6 +67,16 @@ cp -aRf * $RPM_BUILD_ROOT/var/www/html/egroupware
/var/www/html/egroupware/*
%changelog
* Thu Jun 29 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.00.fdr.1.rc6
- JiNN extended.
- projects updated
- new knowledge base available
- new language available Catalan
- many languages updated
- bug fixes in all applications
- extend the usage of indexes for DB tables
* Thu Apr 27 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.00.fdr.1.rc5
- rewrite of projects added.
- Wiki with WYSIWYG editor added

View File

@ -1,6 +1,6 @@
%define packagename eGroupWare
%define egwdirname egroupware
%define version 0.9.99.025
%define version 0.9.99.026
%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)
@ -351,7 +351,7 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname}
echo "* the follow lines to you httpd.conf *"
echo "* *"
echo "* <Directory /var/www/html/egroupware> *"
echo "* <Files ~ "\.inc\.php$ \| \.tpl$"> *"
echo "* <Files ~ "\.\(inc.php\|tpl\)$"> *"
echo "* Order allow,deny *"
echo "* Deny from all *"
echo "* </Files> *"
@ -504,12 +504,14 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{egwdirname}
%{prefix}/%{egwdirname}/%{wiki}
%changelog
* Thu May 21 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.025-1
* Thu Jun 29 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.026-1
- JiNN extended.
- projects updated
- new knowledge base available
- new language available Catalan
- languages updated
- many languages updated
- bug fixes in all applications
- extend the usage of indexes for DB tables
* Thu Apr 27 2004 Reiner Jung <r.jung@creativix.net> 0.9.99.015-1
- rewrite of projects added.