summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glpi-webservices-dev.spec174
-rw-r--r--glpi-webservices.spec25
2 files changed, 18 insertions, 181 deletions
diff --git a/glpi-webservices-dev.spec b/glpi-webservices-dev.spec
deleted file mode 100644
index fb562a7..0000000
--- a/glpi-webservices-dev.spec
+++ /dev/null
@@ -1,174 +0,0 @@
-# remirepo spec file for glpi-webservices
-#
-# Copyright (c) 2010-2015 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%global pluginname webservices
-#global svnrelease 322
-
-Name: glpi-webservices
-Version: 1.5.0
-%if 0%{?svnrelease}
-Release: 0.1.svn%{svnrelease}%{?dist}
-%else
-Release: 1%{?dist}
-%endif
-Summary: GLPI Plugin which provides web services
-Summary(fr): Extension GLPI fournissant des services web
-
-Group: Applications/Internet
-License: GPLv2+
-URL: https://forge.indepnet.net/projects/webservices
-
-%if 0%{?svnrelease}
-# svn export -r 322 https://forge.indepnet.net/svn/webservices/trunk webservices
-# tar czf glpi-webservices-1.3.0-322.tar.gz webservices
-Source0: glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz
-%else
-Source0: https://forge.indepnet.net/attachments/download/2033/glpi-webservices-1.5.0.tar.gz
-%endif
-
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires: glpi >= 0.85
-Requires: glpi < 0.86
-Requires: php-xmlrpc
-Requires: php-soap
-
-
-%description
-This plugin provides a server for Web Services which allow
-an external application to check and control GLPI.
-
-%description -l fr
-Cette extension fournit un serveur de services web permettant
-à une application externe d'interroger et de piloter GLPI.
-
-
-%prep
-%setup -q -c
-
-rm -rf %{pluginname}/.htaccess \
- %{pluginname}/scripts/.htaccess
-mv %{pluginname}/AUTHORS.txt .
-
-# Create link to LICENSE for standard doc folder
-ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE
-
-cat >httpd <<EOF
-<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
- <IfModule mod_authz_core.c>
- Require all denied
- </IfModule>
- <IfModule !mod_authz_core.c>
- Order Allow,Deny
- Deny from all
- </IfModule>
-</Directory>
-
-<Directory /usr/share/glpi/plugins/%{pluginname}>
- <Files xmlrpc.php>
- # Uncomment next line to enable compression and reduce network load
- #php_value zlib.output_compression 4096
- </Files>
-</Directory>
-EOF
-
-
-%build
-# empty build
-
-%install
-rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
-cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
-
-# ===== apache =====
-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,-)
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc AUTHORS.txt
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{_datadir}/glpi/plugins/%{pluginname}
-
-
-%changelog
-* Tue Jun 2 2015 Remi Collet <Fedora@FamilleCollet.com> - 1.5.0-1
-- version 1.5.0 fir GLPI 0.85
- https://forge.indepnet.net/versions/1102
-
-* Mon Nov 17 2014 Remi Collet <Fedora@FamilleCollet.com> - 1.4.3-1
-- version 1.4.3
- https://forge.indepnet.net/versions/1040
-
-* Mon Apr 7 2014 Remi Collet <Fedora@FamilleCollet.com> - 1.4.2-1
-- version 1.4.2
- https://forge.indepnet.net/projects/webservices/versions/1031
-
-* Wed Feb 12 2014 Remi Collet <Fedora@FamilleCollet.com> - 1.4.1-1
-- version 1.4.1
- https://forge.indepnet.net/projects/webservices/versions/996
-
-* Wed Nov 13 2013 Remi Collet <Fedora@FamilleCollet.com> - 1.4.0-1
-- version 1.4.0 for GLPI 0.84
- https://forge.indepnet.net/projects/webservices/versions/921
-
-* Thu Jul 12 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.1-1
-- version 1.3.1 for GLPI 0.83.3
- https://forge.indepnet.net/projects/webservices/versions/703
-
-* Fri Apr 06 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.0-1
-- version 1.3.0
- https://forge.indepnet.net/projects/webservices/versions/635
-- fix config for httpd 2.4
-
-* Sun Feb 26 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.0-0.1.svn322
-- update to 1.3.0 for glpi 0.83 RC (svn snapshot)
-
-* Sun Oct 16 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-1
-- update to 1.2.0 finale version
-
-* Tue Sep 27 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.2.svn290
-- new snapshot
-
-* Tue Sep 20 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.2.svn282
-- new snapshot
-
-* Sun Jul 17 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.1.svn264
-- update to 1.2.0 for glpi 0.80 RC (svn snapshot)
-
-* Tue Oct 12 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-1
-- version 1.0.0 and GLPI 0.78 released
-
-* Wed Aug 25 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn176
-- new snapshot
-
-* Tue Aug 10 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn174
-- new snapshot
-
-* Wed Jul 07 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn173
-- new snapshot
-
-* Fri Jul 02 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn172
-- new snapshot
-
-* Sun Jun 20 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn170
-- new snapshot
-
-* Fri Jun 18 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-0.1.svn168
-- version 1.0.0 for glpi 0.78 RC (svn snapshot)
-- initial RPM \ No newline at end of file
diff --git a/glpi-webservices.spec b/glpi-webservices.spec
index 1965b24..f87fc19 100644
--- a/glpi-webservices.spec
+++ b/glpi-webservices.spec
@@ -1,4 +1,4 @@
-# spec file for glpi-webservices
+# remirepo spec file for glpi-webservices
#
# Copyright (c) 2010-2015 Remi Collet
# License: CC-BY-SA
@@ -10,7 +10,7 @@
#global svnrelease 322
Name: glpi-webservices
-Version: 1.4.3
+Version: 1.6.0
%if 0%{?svnrelease}
Release: 0.1.svn%{svnrelease}%{?dist}
%else
@@ -28,18 +28,19 @@ URL: https://forge.indepnet.net/projects/webservices
# tar czf glpi-webservices-1.3.0-322.tar.gz webservices
Source0: glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz
%else
-Source0: https://forge.indepnet.net/attachments/download/1907/glpi-webservices-1.4.3.tar.gz
+Source0: https://forge.glpi-project.org/attachments/download/2099/glpi-webservices-1.6.0.tar.gz
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.84
-Requires: glpi < 0.85
+Requires: glpi >= 0.85.3
+Requires: glpi < 0.91
Requires: php-xmlrpc
Requires: php-soap
+
%description
This plugin provides a server for Web Services which allow
an external application to check and control GLPI.
@@ -54,7 +55,8 @@ Cette extension fournit un serveur de services web permettant
rm -rf %{pluginname}/.htaccess \
%{pluginname}/scripts/.htaccess
-mv %{pluginname}/AUTHORS.txt .
+
+rm -rf %{pluginname}/tools
# Create link to LICENSE for standard doc folder
ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE
@@ -98,12 +100,21 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc LICENSE AUTHORS.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%{_datadir}/glpi/plugins/%{pluginname}
%changelog
+* Sat Oct 3 2015 Remi Collet <Fedora@FamilleCollet.com> - 1.6.0-1
+- version 1.6.0 for GLPI 0.85.3 and 0.90
+ https://forge.glpi-project.org/versions/1176
+
+* Tue Jun 2 2015 Remi Collet <Fedora@FamilleCollet.com> - 1.5.0-1
+- version 1.5.0 for GLPI 0.85
+ https://forge.indepnet.net/versions/1102
+
* Mon Nov 17 2014 Remi Collet <Fedora@FamilleCollet.com> - 1.4.3-1
- version 1.4.3
https://forge.indepnet.net/versions/1040