R32182 - in /branches/1.8/egroupware/doc/rpm-build: checkout-build-archives.php egroupware-1.8.spec

Old eGW-svn
1

Author: ralfbecker
New Revision: 32182

URL: http://www.egroupware.org/viewvc/egroupware?rev=32182&view=rev
Log:
changes to the build files:

  • allowing . in minor version (dash is not allowed from obs)
  • added jpgraph dependency to spec

Modified:
branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php
branches/1.8/egroupware/doc/rpm-build/egroupware-1.8.spec

Modified: branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php?rev=32182&r1=32181&r2=32182&view=diff

— branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php (original)
+++ branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php Fri Sep 17 21:58:35 2010
@@ -19,7 +19,7 @@
$config = array(
‘packagename’ => ‘eGroupware’,
‘version’ => ‘1.8’,

  • ‘packaging’ => ‘001-’.date(‘Ymd’),
  • ‘packaging’ => ‘001.’.date(‘Ymd’),
    ‘egwdir’ => ‘egroupware’,
    ‘svndir’ => ‘/tmp/build_root/egw_1.8_buildroot-svn’,
    ‘egw_buildroot’ => ‘/tmp/build_root/egw_1.8_buildroot’,
    @@ -35,14 +35,14 @@
    ‘freshclam’ => ‘/usr/bin/freshclam’,
    ‘gpg’ => ‘/usr/bin/gpg’,
    ‘packager’ => ‘build@stylite.de’,
  • ‘obs’ => false,
  • ‘obs’ => ‘./obs’,
    ‘changelog’ => false, // eg. ‘* 1. Zeile\n* 2. Zeile’ for debian.changes
    ’changelog_packager’ => ‘Ralf Becker rb@stylite.de’,
    ‘editsvnchangelog’ => '* ',
    ‘editor’ => ‘/usr/bin/vi’,
    ‘svntag’ => ‘tags/$version.$packaging’, // eg. ‘$version.$packaging’
    ‘skip’ => array(),
  • ‘run’ => array(‘svntag’,‘checkout’,‘copy’,‘virusscan’,‘create’,‘sign’)
  • ‘run’ => array(‘svntag’,‘checkout’,‘copy’,‘virusscan’,‘create’,‘sign’,‘obs’)
    );

// process config from command line
@@ -295,7 +295,7 @@
if (basename(dirname($path)) == ‘.osc’) continue;
if (!preg_match(’//’.preg_quote($config[‘packagename’]).’[a-z-]*-’.preg_quote($config[‘version’]).’/’,$path)) continue;

  •   if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9]+(\.tar\.(gz|bz2))$/',$path,$matches) &&

  •   if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/',$path,$matches) &&
  	file_exists($new_name=$config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
  {
  	if (basename($path) != basename($new_name))

@@ -315,18 +315,18 @@

		if (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec')
		{

  •   		$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9]+/m','Version: '.$config['version'].'.'.$config['packaging'],$content);

  •   		$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m','Version: '.$config['version'].'.'.$config['packaging'],$content);
  	}
  	if (substr($path,-4) == '.dsc')
  	{
  		$content = preg_replace('/^(Debtransform-Tar: '.preg_quote($config['packagename']).'[a-z-]*)-'.

  •   			preg_quote($config['version']).'\.[0-9]+(\.tar\.(gz|bz2))$/m',

  •   			preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/m',
  			'\\1-'.$config['version'].'.'.$config['packaging'].'\\2',$content);
  	}
  	if (basename($path) == 'debian.changes' && strpos($content,$config['version'].'.'.$config['packaging']) === false)
  	{
  		list($new_header) = explode("\n",$content);

  •   		$new_header = preg_replace('/\('.preg_quote($config['version']).'.[0-9]+(.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)',$new_header);

  •   		$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)',$new_header);
  		if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
  		$content = $new_header."\n\n".$config['changelog'].
  			"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;

Modified: branches/1.8/egroupware/doc/rpm-build/egroupware-1.8.spec
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/egroupware/doc/rpm-build/egroupware-1.8.spec?rev=32182&r1=32181&r2=32182&view=diff

— branches/1.8/egroupware/doc/rpm-build/egroupware-1.8.spec (original)
+++ branches/1.8/egroupware/doc/rpm-build/egroupware-1.8.spec Fri Sep 17 21:58:35 2010
@@ -1,6 +1,6 @@
Name: eGroupware
-Version: 1.8.001.20100916
-Release:
+Version: 1.8.001.20100917
+Release: 1
Summary: EGroupware is a web-based groupware suite written in php.
Group: Web/Database
License: GPLv2
@@ -318,7 +318,7 @@
Group: Web/Database
AutoReqProv: no
Requires: egw-core >= %{version},
-#Requires: jpgraph-epl
+Requires: jpgraph >= 1.13
%description projectmanager
The projectmanager is EGroupware’s new project management application.
It’s fully integrated into EGroupware and use the data of InfoLog and Calendar.

Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs