[glpi-pdf] version 0.83 for GLPI 0.83
Remi Collet
remi at fedoraproject.org
Thu Apr 19 13:19:24 UTC 2012
commit 890331630e92ebdeba33a7ccacca812f61629c88
Author: remi <fedora at famillecollet.com>
Date: Thu Apr 19 15:18:06 2012 +0200
version 0.83 for GLPI 0.83
.gitignore | 1 +
changeset_r322.diff | 33 ++++++++++++++++
changeset_r323.diff | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
glpi-pdf.spec | 25 +++++++++---
sources | 2 +-
5 files changed, 161 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69c99ca..f411135 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ glpi-pdf-0.6.1.tar.gz
/glpi-pdf-0.7.1.tar.gz
/glpi-pdf-0.7.2.tar.gz
/glpi-pdf-0.80.3.tar.gz
+/glpi-pdf-0.83.tar.gz
diff --git a/changeset_r322.diff b/changeset_r322.diff
new file mode 100644
index 0000000..f8ff15a
--- /dev/null
+++ b/changeset_r322.diff
@@ -0,0 +1,33 @@
+Index: trunk/inc/common.class.php
+===================================================================
+--- trunk/inc/common.class.php (revision 321)
++++ trunk/inc/common.class.php (revision 322)
+@@ -118,7 +118,7 @@
+ **/
+ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
+ global $LANG;
+-
++
+ if(!isset($withtemplate) || empty($withtemplate)) {
+ return $LANG['plugin_pdf']['title'][1];
+ }
+@@ -310,6 +310,7 @@
+
+ if (!is_integer($itemtype)
+ && $itemtype != 'empty'
++ && method_exists($itemtype, "displayTabContentForPdf")
+ && ($obj = getItemForItemtype($itemtype))) {
+ if ($obj->displayTabContentForPdf($this->pdf, $this->obj, $tabnum)) {
+ continue;
+Index: trunk/inc/computer.class.php
+===================================================================
+--- trunk/inc/computer.class.php (revision 321)
++++ trunk/inc/computer.class.php (revision 322)
+@@ -44,6 +44,7 @@
+
+ $onglets = parent::defineAllTabs($options);
+ unset($onglets['OcsLink$1']); // TODO add method to print OCS
++ unset($onglets['Item_Problem$1']); // TODO add method to print linked Problems
+ return $onglets;
+ }
+
diff --git a/changeset_r323.diff b/changeset_r323.diff
new file mode 100644
index 0000000..645b266
--- /dev/null
+++ b/changeset_r323.diff
@@ -0,0 +1,107 @@
+Index: trunk/inc/monitor.class.php
+===================================================================
+--- trunk/inc/monitor.class.php (revision 322)
++++ trunk/inc/monitor.class.php (revision 323)
+@@ -41,6 +41,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 pdfMain(PluginPdfSimplePDF $pdf, Monitor $item) {
+ global $LANG;
+
+Index: trunk/inc/software.class.php
+===================================================================
+--- trunk/inc/software.class.php (revision 322)
++++ trunk/inc/software.class.php (revision 323)
+@@ -104,6 +104,7 @@
+
+ $onglets = parent::defineAllTabs($options);
+ unset($onglets['Software$1']); // Merge tab can't be exported
++ unset($onglets['Item_Problem$1']); // TODO add method to print linked Problems
+ return $onglets;
+ }
+
+Index: trunk/inc/peripheral.class.php
+===================================================================
+--- trunk/inc/peripheral.class.php (revision 322)
++++ trunk/inc/peripheral.class.php (revision 323)
+@@ -40,7 +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 pdfMain(PluginPdfSimplePDF $pdf, Peripheral $item) {
+ global $LANG;
+
+Index: trunk/inc/networkequipment.class.php
+===================================================================
+--- trunk/inc/networkequipment.class.php (revision 322)
++++ trunk/inc/networkequipment.class.php (revision 323)
+@@ -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 pdfMain(PluginPdfSimplePDF $pdf, NetworkEquipment $item) {
+ global $LANG;
+
+Index: trunk/inc/phone.class.php
+===================================================================
+--- trunk/inc/phone.class.php (revision 322)
++++ trunk/inc/phone.class.php (revision 323)
+@@ -40,7 +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 pdfMain(PluginPdfSimplePDF $pdf, Phone $item) {
+ global $LANG;
+
+Index: trunk/inc/printer.class.php
+===================================================================
+--- trunk/inc/printer.class.php (revision 322)
++++ trunk/inc/printer.class.php (revision 323)
+@@ -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 pdfMain(PluginPdfSimplePDF $pdf, Printer $printer) {
+ global $LANG;
+
diff --git a/glpi-pdf.spec b/glpi-pdf.spec
index 70c741d..de9ed82 100644
--- a/glpi-pdf.spec
+++ b/glpi-pdf.spec
@@ -1,8 +1,8 @@
%global pluginname pdf
Name: glpi-pdf
-Version: 0.80.3
-Release: 2%{?dist}
+Version: 0.83
+Release: 1%{?dist}
Summary: GLPI Plugin to print PDF of equipment
Summary(fr): Extension GLPI pour créer des PDF des matériels
@@ -10,13 +10,17 @@ Group: Applications/Internet
License: GPLv2+
URL: https://forge.indepnet.net/projects/pdf
-Source0: https://forge.indepnet.net/attachments/download/966/glpi-pdf-0.80.3.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1095/glpi-pdf-0.83.tar.gz
+
+# https://forge.indepnet.net/issues/3455
+Patch0: changeset_r322.diff
+Patch1: changeset_r323.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.80.3
-Requires: glpi < 0.81
+Requires: glpi >= 0.83
+Requires: glpi < 0.84
%description
@@ -39,6 +43,8 @@ for doc in docs/* ; do
done
cd %{pluginname}
+%patch0 -p1
+%patch1 -p1
%build
@@ -63,7 +69,7 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc docs/*
+%doc docs/* %{pluginname}/LICENSE
%dir %{_datadir}/glpi/plugins/%{pluginname}
%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
%{_datadir}/glpi/plugins/%{pluginname}/*.php
@@ -71,9 +77,16 @@ rm -rf %{buildroot}
%{_datadir}/glpi/plugins/%{pluginname}/front
%{_datadir}/glpi/plugins/%{pluginname}/inc
%{_datadir}/glpi/plugins/%{pluginname}/pics
+# Keep here as required from interface
+%{_datadir}/glpi/plugins/%{pluginname}/LICENSE
%changelog
+* Thu Apr 19 2012 Remi Collet <Fedora at FamilleCollet.com> - 0.83-1
+- version 0.83 for GLPI 0.83
+ https://forge.indepnet.net/projects/pdf/versions/615
+- add upstream patch for https://forge.indepnet.net/issues/3455
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.80.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 5309934..8fe27db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b0bbfdef4a9158fd88d3d112429bddc glpi-pdf-0.80.3.tar.gz
+38416edee35119f32437edc5e65ff159 glpi-pdf-0.83.tar.gz
More information about the scm-commits
mailing list