From 00d793c06b323771c968140983f7f236a69bfa44 Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 5 Nov 2010 10:48:54 +0000 Subject: [PATCH] 2010-11-05 Sancho Lerena * Makefile.PL: Now default install for libs are the same than used in RPM, this will help to avoid problems of duped libs. * pandora_server.spec, pandora_server.redhat.spec: Update version and release. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3535 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 ++++++++ pandora_server/Makefile.PL | 1 + pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 54ffd5b571..1559b5857d 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2010-11-05 Sancho Lerena + + * Makefile.PL: Now default install for libs are the same than used in + RPM, this will help to avoid problems of duped libs. + + * pandora_server.spec, + pandora_server.redhat.spec: Update version and release. + 2010-11-04 Sergio Martin * lib/PandoraFMS/DB.pm diff --git a/pandora_server/Makefile.PL b/pandora_server/Makefile.PL index 86ff15dae4..c2f22a87b4 100644 --- a/pandora_server/Makefile.PL +++ b/pandora_server/Makefile.PL @@ -2,6 +2,7 @@ use 5.000; use ExtUtils::MakeMaker; WriteMakefile( + INSTALLSITELIB => '/usr/lib/perl5', NAME => 'PandoraFMS', VERSION_FROM => 'lib/PandoraFMS/Config.pm', AUTHOR => 'Artica ST ', diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 811b410309..3bc2a4c184 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -2,7 +2,7 @@ # Pandora FMS Server # %define name pandorafms_server -%define version 3.1 +%define version 3.2RC1 %define release 2 Summary: Pandora FMS Server diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 954cf8b165..391adf92f4 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 3.2RC1 -%define release 1 +%define release 2 Summary: Pandora FMS Server Name: %{name}