Merge internal rpm spec. Release 2.0.1-1 rpm spec

unioslo · Feb 18, 2019 · 42148c3 · 42148c3
1 parent a5152ab
commit 42148c3
Showing 1 changed file with 61 additions and 2 deletions.
diff --git a/rpm/zabbix-cli.spec b/rpm/zabbix-cli.spec
@@ -6,7 +6,7 @@
 %{!?pybasever: %global pybasever %(%{__python2} -c "import sys;print(sys.version[0:3])")}
 
 Name: zabbix-cli
-Version: 1.7.0
+Version: 2.0.1
 Release: 1%{?dist}
 Summary: Command-line interface for Zabbix
 
@@ -17,7 +17,9 @@ Source0: https://github.com/usit-gd/zabbix-cli/archive/%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+%if 0%{?rhel} && 0%{?rhel} <= 6
 Requires: python-argparse
+%endif
 Requires: python-ipaddress
 Requires: python-requests
 
@@ -26,6 +28,9 @@ BuildRequires: python2-devel
 
 BuildArch: noarch
 
+Provides: uio-zabbix-zabbixcli = %{version}-%{release}
+Obsoletes: uio-zabbix-zabbixcli < 1.5.4-2
+
 %description
 Command-line interface for Zabbix monitoring system.
 
@@ -50,13 +55,22 @@ mkdir -p %{buildroot}%{_defaultdocdir}/zabbix-cli-%{version}
 %doc LICENSE docs/manual.rst
 
 %changelog
+* Thu Feb 14 2019 Paal Braathen <paal.braathen@usit.uio.no> - 2.0.1-1
+- New version 2.0.1
+
+* Thu Feb 14 2019 Paal Braathen <paal.braathen@usit.uio.no> - 2.0.0-1
+- New version 2.0.0
+
+* Fri Jun 02 2017 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.7.0-2
+- New version 1.7.0-2. Requires python-ipaddr
+
 * Fri May 19 2017 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.7.0-1
 - New version 1.7.0
 
 * Mon Dec 12 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.6.1-1
 - New version 1.6.1
 
-* Wed Nov 30 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.6.0-1
+* Tue Nov 22 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.6.0-1
 - New version 1.6.0
 
 * Sat Oct 29 2016 Volker Froehlich <volker27@gmx.at> - 1.5.4-5
@@ -72,5 +86,50 @@ mkdir -p %{buildroot}%{_defaultdocdir}/zabbix-cli-%{version}
 * Fri Oct 14 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.4-4
 - Merge internal UiO spec file with Fabians file
 
+* Thu Oct 13 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.4-4
+- Delete python-psycopg2 some required package
+
 * Thu Sep 22 2016 - Fabian Arrotin <arrfab@centos.org> - 1.5.4
 - initial spec
+
+* Tue Sep 06 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.4-3
+- Change package name to zabbix-cli. This package takes over uio-zabbix-zabbixcli
+
+* Tue Jun 28 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.4
+- New version 1.5.4
+
+* Wed May 11 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.3
+- New version 1.5.3
+
+* Mon Apr 25 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.2
+- New version 1.5.2
+
+* Thu Apr 14 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.1
+- New version 1.5.1
+
+* Fri Apr 01 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.5.0
+- New version 1.5.0
+
+* Wed Nov 11 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.4.0
+- Fix spec file for f23
+
+* Thu Oct 22 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.4.0
+- Ny version - 1.4.0
+
+* Thu Aug 27 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.3.1
+- Ny version - 1.3.1
+
+* Thu Jun 18 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.3.0
+- Ny version - 1.3.0
+
+* Tue Apr 07 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.2.1
+- Ny version - 1.2.1
+
+* Wed Mar 25 2015 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.2.0
+- Endret til version 1.2.0
+
+* Thu Mar 05 2015 Carl Morten Boger <c.m.boger@usit.uio.no> - 1.1.0
+- Endret til version 1.1.0
+
+* Fri Jan 30 2015 Carl Morten Boger <c.m.boger@usit.uio.no> - 1.0
+- Initial version of the package