summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-07-12 20:27:44 +0200
committerRemi Collet <fedora@famillecollet.com>2012-07-12 20:27:44 +0200
commit4f2fa96be0f59cf6131e3b3d10d299a8c794a6ec (patch)
tree7549cdadb77d8cc2b9942e3841dcbef2784c7f59
parent29f2d0f646e948d4bdb55e4f8ad472ff0fcaf9b8 (diff)
glpi-appliances 1.8.1
-rw-r--r--Makefile2
-rw-r--r--changeset_r189.diff13
-rw-r--r--changeset_r190.diff31
-rw-r--r--glpi-appliances-dev.spec19
4 files changed, 8 insertions, 57 deletions
diff --git a/Makefile b/Makefile
index 1e65467..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../common/Makefile
diff --git a/changeset_r189.diff b/changeset_r189.diff
deleted file mode 100644
index 8654cde..0000000
--- a/changeset_r189.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/inc/appliancepdf.class.php
-===================================================================
---- trunk/inc/appliancepdf.class.php (revision 188)
-+++ trunk/inc/appliancepdf.class.php (revision 189)
-@@ -34,7 +34,7 @@
- class PluginAppliancesAppliancePDF extends PluginPdfCommon {
-
-
-- function __construct(PluginAppliancesAppliance $obj=NULL) {
-+ function __construct(CommonGLPI $obj=NULL) {
-
- $this->obj = ($obj ? $obj : new PluginAppliancesAppliance());
- }
diff --git a/changeset_r190.diff b/changeset_r190.diff
deleted file mode 100644
index 3ca297d..0000000
--- a/changeset_r190.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: trunk/inc/appliancepdf.class.php
-===================================================================
---- trunk/inc/appliancepdf.class.php (revision 189)
-+++ trunk/inc/appliancepdf.class.php (revision 190)
-@@ -40,6 +40,14 @@
- }
-
-
-+ function defineAllTabs($options=array()) {
-+
-+ $onglets = parent::defineAllTabs($options);
-+ unset($onglets['Item_Problem$1']); // TODO add method to print linked Problems
-+ return $onglets;
-+ }
-+
-+
- static function displayTabContentForPDF(PluginPdfSimplePDF $pdf, CommonGLPI $item, $tab) {
-
- switch ($tab) {
-Index: trunk/inc/appliance.class.php
-===================================================================
---- trunk/inc/appliance.class.php (revision 189)
-+++ trunk/inc/appliance.class.php (revision 190)
-@@ -254,6 +254,7 @@
- $this->addStandardTab('PluginAppliancesAppliance_Item', $ong, $options);
- $this->addStandardTab('PluginAppliancesOptvalue', $ong, $options);
- $this->addStandardTab('Ticket', $ong, $options);
-+ $this->addStandardTab('Item_Problem', $ong, $options);
- $this->addStandardTab('Infocom', $ong, $options);
- $this->addStandardTab('Contract_Item', $ong, $options);
- $this->addStandardTab('Document', $ong, $options);
diff --git a/glpi-appliances-dev.spec b/glpi-appliances-dev.spec
index 256e8e5..46d41a1 100644
--- a/glpi-appliances-dev.spec
+++ b/glpi-appliances-dev.spec
@@ -2,7 +2,7 @@
#global svnrelease 184
Name: glpi-appliances
-Version: 1.8.0
+Version: 1.8.1
%if 0%{?svnrelease}
Release: 0.1.svn%{svnrelease}%{?dist}
%else
@@ -20,18 +20,13 @@ URL: https://forge.indepnet.net/projects/appliances
# tar czf glpi-appliances-1.8.0-184.tar.gz appliances
Source0: glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz
%else
-Source0: https://forge.indepnet.net/attachments/download/1114/glpi-appliances-1.8.0.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1214/glpi-appliances-1.8.1.tar.gz
%endif
-# PHP 5.4.0 patch
-Patch0: changeset_r189.diff
-# https://forge.indepnet.net/issues/3456
-Patch1: changeset_r190.diff
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.83
+Requires: glpi >= 0.83.3
Requires: glpi < 0.84
Requires: php-xmlrpc php-soap
@@ -64,10 +59,6 @@ cat >httpd <<EOF
</Directory>
EOF
-cd %{pluginname}
-%patch0 -p1
-%patch1 -p1
-
%build
# empty build
@@ -95,6 +86,10 @@ rm -rf %{buildroot}
%changelog
+* Thu Jul 12 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.8.1-1
+- version 1.8.1 for GLPI 0.83.3
+ https://forge.indepnet.net/projects/appliances/versions/747
+
* Fri Apr 06 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.8.0-1
- version 1.8.0
https://forge.indepnet.net/projects/appliances/versions/614