From 7fbc78e892908a8701d02992021db0a4312f09ec Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 1 Nov 2010 12:34:39 +0000 Subject: [PATCH] 2010-11-01 Sancho Lerena * DEBIAN/control, DEBIAN/make_deb_package.sh pandora_server.spec lib/PandoraFMS/Config.pm pandora_server.redhat.spec: Version updates and small changes for packaging the 3.2 RC1 version in the next days/hours. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 9 +++++++++ pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 4 ++-- pandora_server/pandora_server.redhat.spec | 1 + pandora_server/pandora_server.spec | 10 ++-------- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 8328586775..43e02d714e 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,12 @@ +2010-11-01 Sancho Lerena + + * DEBIAN/control, + DEBIAN/make_deb_package.sh + pandora_server.spec + lib/PandoraFMS/Config.pm + pandora_server.redhat.spec: Version updates and small changes for packaging + the 3.2 RC1 version in the next days/hours. + 2010-10-28 Sergio Martin * util/pandora_sync_db.pl: Added the Pandora Database Synchronization diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index b2ef8f3e89..9b824dd799 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: PandoraFMS-Server -Version: 3.2 +Version: 3.2RC1 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index e6bc508bf8..1163f977e3 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="3.1" +pandora_version="3.2RC1" package_cpan=1 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 218b170e1e..857a682595 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -41,8 +41,8 @@ our @EXPORT = qw( ); # version: Defines actual version of Pandora Server for this module only -my $pandora_version = "3.2dev"; -my $pandora_build = "100810"; +my $pandora_version = "3.2RC1"; +my $pandora_build = "101027"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index eb8d690089..811b410309 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -79,6 +79,7 @@ install -m 0444 man/man1/pandora_server.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ install -m 0444 man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/PandoraFMS +rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS install -m 0644 util/pandora_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server install -m 0640 conf/pandora_server.conf $RPM_BUILD_ROOT%{_sysconfdir}/pandora/ diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 618ce16bce..954cf8b165 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -2,7 +2,7 @@ # Pandora FMS Server # %define name pandorafms_server -%define version 3.2dev +%define version 3.2RC1 %define release 1 Summary: Pandora FMS Server @@ -36,13 +36,6 @@ rm -rf $RPM_BUILD_ROOT %build %install -#Uncomment this if you build from other RPM system (fedora, opensuse != 11..) -#%define perl_version %(rpm -q --queryformat='%{VERSION}' perl) -#export perl_version=`rpm -q --queryformat='%{VERSION}' perl` - -# Temporal hack for For SLES 11 only, warning -#export perl_version=5.10.0 -#%define perl_version 5.10.0 rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/bin/ @@ -75,6 +68,7 @@ cp -aRf man/man1/pandora_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/PandoraFMS +rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS %clean rm -fr $RPM_BUILD_ROOT