reorg repo

5 files changed, 269 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/changeset_r189.diff b/changeset_r189.diff
new file mode 100644
index 0000000..8654cde
--- /dev/null
+++ b/changeset_r189.diff
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..3ca297d
--- /dev/null
+++ b/changeset_r190.diff
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..256e8e5
--- /dev/null
+++ b/glpi-appliances-dev.spec
@@ -0,0 +1,122 @@
+%global pluginname   appliances
+#global svnrelease   184
+
+Name:           glpi-appliances
+Version:        1.8.0
+%if 0%{?svnrelease}
+Release:        0.1.svn%{svnrelease}%{?dist}
+%else
+Release:        1%{?dist}
+%endif
+Summary:        GLPI Plugin to manage appliances
+Summary(fr):    Extension GLPI de gestion des applicatifs
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            https://forge.indepnet.net/projects/appliances
+
+%if 0%{?svnrelease}
+# svn export -r 184 https://forge.indepnet.net/svn/appliances/trunk 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
+%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.84
+Requires:       php-xmlrpc php-soap
+
+%description
+This plugin add appliances management to GLPI
+* Appliances creation (composed by various inventory item)
+* Direct management from items
+* Integrated with Helpdesk
+
+
+%description -l fr
+Cette extension permet la gestion des applicatifs dans GLPI
+* Création d’applicatifs composé de plusieurs items
+* Gestion directe à partir de l’item
+* Intégration avec l'assistance
+
+
+%prep
+%setup -q -c 
+
+cat >httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/sql>
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+		Deny from all
+	</IfModule>
+</Directory>
+EOF
+
+cd %{pluginname}
+%patch0 -p1
+%patch1 -p1
+
+
+%build
+# empty build
+
+%install
+rm -rf %{buildroot} 
+
+mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
+cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
+
+# ===== apache =====
+rm -f %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/sql/.htaccess
+mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
+install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+
+
+%clean
+rm -rf %{buildroot} 
+
+%files
+%defattr(-,root,root,-)
+%doc %{pluginname}/LICENSE
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{_datadir}/glpi/plugins/%{pluginname}
+
+
+%changelog
+* 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
+- fix config for httpd 2.4
+- add 2 patches from SVN (php 5.4.0 + missing tab)
+
+* Sun Feb 26 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.8.0-0.1.svn184
+- version 1.8.0 for glpi 0.83RC (svn snapshot)
+
+* Thu Jun 30 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.7.0-1
+- version 1.7.0 released
+
+* Tue Jun 28 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.7.0-0.1.svn136
+- version 1.7.0 for glpi 0.80 (svn snapshot)
+
+* Tue Oct 12 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-1
+- version 1.6.0 and GLPI 0.78 released
+
+* Wed Aug 25 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-0.1.svn114
+- new svn snapshot
+
+* Sun Jun 20 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-0.1.svn110
+- version 1.6.0 for glpi 0.78 RC (svn snapshot)
+- initial RPM
+
diff --git a/glpi-appliances.spec b/glpi-appliances.spec
new file mode 100644
index 0000000..8f934b9
--- /dev/null
+++ b/glpi-appliances.spec
@@ -0,0 +1,99 @@
+%global pluginname   appliances
+#global svnrelease   136
+
+Name:           glpi-appliances
+Version:        1.7.0
+%if 0%{?svnrelease}
+Release:        0.1.svn%{svnrelease}%{?dist}
+%else
+Release:        1%{?dist}
+%endif
+Summary:        GLPI Plugin to manage appliances
+Summary(fr):    Extension GLPI de gestion des applicatifs
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            https://forge.indepnet.net/projects/appliances
+
+%if 0%{?svnrelease}
+# svn export -r 136 https://forge.indepnet.net/svn/appliances/trunk appliances
+# tar czf glpi-appliances-1.7.0-136.tar.gz appliances
+Source0:        glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz
+%else
+Source0:        https://forge.indepnet.net/attachments/download/924/glpi-appliances-1.7.0.tar.gz
+%endif
+
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Requires:       glpi >= 0.80
+Requires:       glpi <  0.81
+Requires:       php-xmlrpc php-soap
+
+%description
+This plugin add appliances management to GLPI
+* Appliances creation (composed by various inventory item)
+* Direct management from items
+* Integrated with Helpdesk
+
+
+%description -l fr
+Cette extension permet la gestion des applicatifs dans GLPI
+* Création d’applicatifs composé de plusieurs items
+* Gestion directe à partir de l’item
+* Intégration avec l'assistance
+
+
+%prep
+%setup -q -c 
+
+cat >httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/sql>
+    Order Allow,Deny
+    Deny from all
+</Directory>
+EOF
+
+
+%build
+# empty build
+
+%install
+rm -rf %{buildroot} 
+
+mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
+cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
+
+# ===== apache =====
+rm -f %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/sql/.htaccess
+mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
+install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+
+
+%clean
+rm -rf %{buildroot} 
+
+%files
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{_datadir}/glpi/plugins/%{pluginname}
+
+
+%changelog
+* Thu Jun 30 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.7.0-1
+- version 1.7.0 released
+
+* Tue Jun 28 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.7.0-0.1.svn136
+- version 1.7.0 for glpi 0.80 (svn snapshot)
+
+* Tue Oct 12 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-1
+- version 1.6.0 and GLPI 0.78 released
+
+* Wed Aug 25 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-0.1.svn114
+- new svn snapshot
+
+* Sun Jun 20 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-0.1.svn110
+- version 1.6.0 for glpi 0.78 RC (svn snapshot)
+- initial RPM
+