From eff8b7f4840c615a77b35341e0b4abe707b0eeb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 17 Oct 2012 11:07:13 +0000 Subject: [PATCH] Resync configure (to build CVS HEAD on Debian). --- org.glite.jobid.api-c/configure | 13 +++++++------ org.glite.jobid.api-cpp/configure | 13 +++++++------ org.glite.jobid.api-java/configure | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/org.glite.jobid.api-c/configure b/org.glite.jobid.api-c/configure index 255b6f2..9198b38 100755 --- a/org.glite.jobid.api-c/configure +++ b/org.glite.jobid.api-c/configure @@ -1504,7 +1504,7 @@ deb: ${package}-${version}.tar.gz s/--version\s+\S+\s?//; s/$/ --version $version/; } - if (/^Source:.*/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } + if (/^Source:.*/ and $file =~ /\.spec$/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } printf DST "%s", "$_"; } close SRC; @@ -1572,13 +1572,14 @@ sub mode_etics_packaging { $workspaceDir = '..'; $srcPackageName = 'gridsite'; $srcTarBall = "../$srcPackageName-\${version}.src.tar.gz"; - $srcAge = ''; + $srcAge = '.src'; $topDir = '../'; } else { $workspaceDir = '${workspaceDir}'; $srcPackageName = '${packageName}'; $srcTarBall = "$srcPackageName-\${version}.tar.gz"; - $srcAge = '-${age}'; + $srcAge = ''; + if ($project eq 'emi' and $project_version <= 2) { $srcAge = '-${age}.src'; } $topDir = ''; } @@ -1587,8 +1588,8 @@ sub mode_etics_packaging { $cmd->{default}{packaging} = $rpmprepare; $cmd->{default}{packaging} .= "dir=\${workspaceDir}/rpm_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SRPMSLocation} \$dir/{BUILD,RPMS,SOURCES,SRPMS} 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz - cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz + cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.tar.gz rpmbuild -bs --nodeps --define \"_topdir \$dir\" $srcPackageName.spec cp -v \$dir/SRPMS/*.src.rpm \${package.SRPMSLocation}/ rm -rf \$dir"; @@ -1600,7 +1601,7 @@ sub mode_etics_packaging { $cmd->{$p}{packaging} = $debprepare; $cmd->{$p}{packaging} .= "dir=\${workspaceDir}/dpkg_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SDEBSLocation} \$dir 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz cp -vf $srcTarBall \$dir/${srcPackageName}_\${version}.orig.tar.gz tar xzf \$dir/${srcPackageName}_\${version}.orig.tar.gz -C \$dir cp -rf ${topDir}debian/ \$dir/$srcPackageName-\${version}/ diff --git a/org.glite.jobid.api-cpp/configure b/org.glite.jobid.api-cpp/configure index 255b6f2..9198b38 100755 --- a/org.glite.jobid.api-cpp/configure +++ b/org.glite.jobid.api-cpp/configure @@ -1504,7 +1504,7 @@ deb: ${package}-${version}.tar.gz s/--version\s+\S+\s?//; s/$/ --version $version/; } - if (/^Source:.*/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } + if (/^Source:.*/ and $file =~ /\.spec$/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } printf DST "%s", "$_"; } close SRC; @@ -1572,13 +1572,14 @@ sub mode_etics_packaging { $workspaceDir = '..'; $srcPackageName = 'gridsite'; $srcTarBall = "../$srcPackageName-\${version}.src.tar.gz"; - $srcAge = ''; + $srcAge = '.src'; $topDir = '../'; } else { $workspaceDir = '${workspaceDir}'; $srcPackageName = '${packageName}'; $srcTarBall = "$srcPackageName-\${version}.tar.gz"; - $srcAge = '-${age}'; + $srcAge = ''; + if ($project eq 'emi' and $project_version <= 2) { $srcAge = '-${age}.src'; } $topDir = ''; } @@ -1587,8 +1588,8 @@ sub mode_etics_packaging { $cmd->{default}{packaging} = $rpmprepare; $cmd->{default}{packaging} .= "dir=\${workspaceDir}/rpm_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SRPMSLocation} \$dir/{BUILD,RPMS,SOURCES,SRPMS} 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz - cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz + cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.tar.gz rpmbuild -bs --nodeps --define \"_topdir \$dir\" $srcPackageName.spec cp -v \$dir/SRPMS/*.src.rpm \${package.SRPMSLocation}/ rm -rf \$dir"; @@ -1600,7 +1601,7 @@ sub mode_etics_packaging { $cmd->{$p}{packaging} = $debprepare; $cmd->{$p}{packaging} .= "dir=\${workspaceDir}/dpkg_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SDEBSLocation} \$dir 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz cp -vf $srcTarBall \$dir/${srcPackageName}_\${version}.orig.tar.gz tar xzf \$dir/${srcPackageName}_\${version}.orig.tar.gz -C \$dir cp -rf ${topDir}debian/ \$dir/$srcPackageName-\${version}/ diff --git a/org.glite.jobid.api-java/configure b/org.glite.jobid.api-java/configure index 255b6f2..9198b38 100755 --- a/org.glite.jobid.api-java/configure +++ b/org.glite.jobid.api-java/configure @@ -1504,7 +1504,7 @@ deb: ${package}-${version}.tar.gz s/--version\s+\S+\s?//; s/$/ --version $version/; } - if (/^Source:.*/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } + if (/^Source:.*/ and $file =~ /\.spec$/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } printf DST "%s", "$_"; } close SRC; @@ -1572,13 +1572,14 @@ sub mode_etics_packaging { $workspaceDir = '..'; $srcPackageName = 'gridsite'; $srcTarBall = "../$srcPackageName-\${version}.src.tar.gz"; - $srcAge = ''; + $srcAge = '.src'; $topDir = '../'; } else { $workspaceDir = '${workspaceDir}'; $srcPackageName = '${packageName}'; $srcTarBall = "$srcPackageName-\${version}.tar.gz"; - $srcAge = '-${age}'; + $srcAge = ''; + if ($project eq 'emi' and $project_version <= 2) { $srcAge = '-${age}.src'; } $topDir = ''; } @@ -1587,8 +1588,8 @@ sub mode_etics_packaging { $cmd->{default}{packaging} = $rpmprepare; $cmd->{default}{packaging} .= "dir=\${workspaceDir}/rpm_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SRPMSLocation} \$dir/{BUILD,RPMS,SOURCES,SRPMS} 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz - cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz + cp -vf $srcTarBall \$dir/SOURCES/$srcPackageName-\${version}${srcAge}.tar.gz rpmbuild -bs --nodeps --define \"_topdir \$dir\" $srcPackageName.spec cp -v \$dir/SRPMS/*.src.rpm \${package.SRPMSLocation}/ rm -rf \$dir"; @@ -1600,7 +1601,7 @@ sub mode_etics_packaging { $cmd->{$p}{packaging} = $debprepare; $cmd->{$p}{packaging} .= "dir=\${workspaceDir}/dpkg_build_src_\$\$ mkdir -p \${package.tgzLocation} \${package.SDEBSLocation} \$dir 2>/dev/null || true - cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.src.tar.gz + cp -vf $srcTarBall \${package.tgzLocation}/$srcPackageName-\${version}${srcAge}.tar.gz cp -vf $srcTarBall \$dir/${srcPackageName}_\${version}.orig.tar.gz tar xzf \$dir/${srcPackageName}_\${version}.orig.tar.gz -C \$dir cp -rf ${topDir}debian/ \$dir/$srcPackageName-\${version}/ -- 1.8.2.3