From 49cebc69cf8c45cf71101ba3df4bc7fb159ac76d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 23 Jan 2013 09:17:20 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.0.5-1 --- emi.canl.canl-c/configure | 10 +--------- emi.canl.canl-c/project/ChangeLog | 4 ++++ emi.canl.canl-c/project/version.properties | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/emi.canl.canl-c/configure b/emi.canl.canl-c/configure index b6b28e5..66ee895 100755 --- a/emi.canl.canl-c/configure +++ b/emi.canl.canl-c/configure @@ -1369,19 +1369,11 @@ canl.c my ($old_locale, $specdate, $debdate); - # files for ETICS always in root source directory - mkdir $abs_srcdir."project" unless (-d $abs_srcdir."project"); - open PKGCHL,">".$abs_srcdir."project/changelog" - or die $abs_srcdir."project/changelog: $!\n"; $old_locale = setlocale(LC_TIME); setlocale(LC_TIME, "C"); $specdate = strftime("%a %b %d %Y", gmtime()); $debdate = strftime("%a, %d %b %Y %H:%M:%S %z", gmtime()); setlocale(LC_TIME, $old_locale); - print PKGCHL qq{* $specdate CESNET team -- automatically generated package -}; - close PKGCHL; unless ($top_srcdir eq '.') { unlink $build."Makefile"; @@ -1751,7 +1743,7 @@ sub mode_etics { for my $p ('deb5_x86_64_gcc432', 'deb5_ia32_gcc432', 'deb6_x86_64_gcc445', 'deb6_ia32_gcc445') { for my $c (keys %{$cmd{default}}) { $cmd{$p}{$c} = $cmd{default}{$c}; } - $cmd{$p}{clean} = 'rm -rf ${package.SRPMSLocation}'; + $cmd{$p}{clean} = 'rm -rf ${package.tgzLocation}'; $cmd{$p}{init} = "wget -P \${package.tgzLocation} $url_deb/${pkgName}_\${version}-\${age}.debian.tar.gz $url_deb/${pkgName}_\${version}-\${age}.dsc $url_deb/${pkgName}_\${version}.orig.tar.gz"; $cmd{$p}{packaging} = 'true'; } diff --git a/emi.canl.canl-c/project/ChangeLog b/emi.canl.canl-c/project/ChangeLog index 6155601..284e5aa 100644 --- a/emi.canl.canl-c/project/ChangeLog +++ b/emi.canl.canl-c/project/ChangeLog @@ -69,3 +69,7 @@ - fixed vulnerability reported in EGI RT ticket #4781 1) - SSL_CTX_set_cipher_list(ssl_ctx, "ALL") set to chosen ciphers +2.0.5-1 +- Spec macros fixed, building canl-c documentation on Fedora 18 +- Fixes to follow recent Debian updates + diff --git a/emi.canl.canl-c/project/version.properties b/emi.canl.canl-c/project/version.properties index 679b306..ebf1d6b 100644 --- a/emi.canl.canl-c/project/version.properties +++ b/emi.canl.canl-c/project/version.properties @@ -1,3 +1,3 @@ # $Header: -module.version=2.0.4 +module.version=2.0.5 module.age=1 -- 1.8.2.3