From f346916daa1f123d5320d59fd2d106230d79b51b Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 15 Sep 2011 16:11:42 +0000 Subject: [PATCH] 2011-09-15 Sancho Lerena * extras/build_src.sh: Missing PO files was breaking lang. system * aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec: Updated. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4958 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 6 ++++++ .../aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec | 6 +++--- extras/build_src.sh | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index ff9891275e..27b5395c5f 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,9 @@ +2011-09-15 Sancho Lerena + + * extras/build_src.sh: Missing PO files was breaking lang. system + + * aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec: Updated. + 2011-09-01 SAncho Lerena * scripts/webserver/pandora_webserver.pl: Updated header. diff --git a/extras/aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec b/extras/aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec index 652df68f56..d7d41731aa 100644 --- a/extras/aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec +++ b/extras/aditional_rpmspec/wmic-4.0.0tp4-SVN-build-UNKNOWN.spec @@ -1,16 +1,16 @@ #WMIC # %define name wmic -%define version 4.0.0SVN +%define version 4.0.0tp4 Summary: Linux WMI client to do WMI querys using DCOM http://samba.org Name: %{name} Version: %{version} Release: 0 License: GPL2 Group: System/Management -Source0: %{name}-%{version}.tar.bz2 +Source0: wmic_SUSE11_32bit_4.0.0tp4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildArch: i386 AutoReq: 1 Provides: %{name}-%{version} diff --git a/extras/build_src.sh b/extras/build_src.sh index a14803006b..c5d4d57929 100755 --- a/extras/build_src.sh +++ b/extras/build_src.sh @@ -1,6 +1,6 @@ #!/bin/bash CODEHOME=~/code/pandora/trunk -CODEHOME_ENT=~/code/artica/code +CODEHOME_ENT=~/code/artica RPMHOME=/usr/src/packages VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') KEYGEN_VERSION=$(grep "%define version" $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec | awk '{print $3}') @@ -12,7 +12,7 @@ fi echo "Creating source tarballs in $RPMHOME/SOURCES" # Console -cd $CODEHOME && tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise --exclude \*\.po pandora_console || exit 1 +cd $CODEHOME && tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise pandora_console || exit 1 # Server cd $CODEHOME && tar zcvf $RPMHOME/SOURCES/pandorafms_server-$VERSION.tar.gz --exclude \.svn pandora_server || exit 1