rpms/zabbix/EL-6 zabbix.spec,1.50,1.51

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10147

Modified Files:
	zabbix.spec 
Log Message:
* Tue May 11 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-3
- fixed noarch subpackages for EL-6



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-6/zabbix.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- zabbix.spec	11 May 2010 08:39:58 -0000	1.50
+++ zabbix.spec	11 May 2010 08:47:11 -0000	1.51
@@ -7,7 +7,7 @@
 
 Name:           zabbix
 Version:        1.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -68,7 +68,7 @@ multitude of servers.
 %package docs
 Summary:         Zabbix documentation
 Group:           Documentation
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
 
@@ -180,7 +180,7 @@ The Zabbix proxy compiled to use SQLite
 %package web
 Summary:         Zabbix Web Frontend
 Group:           Applications/Internet
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
 Requires:        php
@@ -201,7 +201,7 @@ The php frontend to display the zabbix w
 %package web-mysql
 Summary:         Zabbix web frontend for MySQL
 Group:           Applications/Internet
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
 Requires:        zabbix-web = %{version}-%{release}
@@ -217,7 +217,7 @@ Zabbix web frontend for MySQL
 %package web-pgsql
 Summary:         Zabbix web frontend for PostgreSQL
 Group:           Applications/Internet
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
 Requires:        zabbix-web = %{version}-%{release}
@@ -232,7 +232,7 @@ Zabbix web frontend for PostgreSQL
 %package web-sqlite3
 Summary:         Zabbix web frontend for SQLite
 Group:           Applications/Internet
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
 Requires:        zabbix-web = %{version}-%{release}
@@ -587,6 +587,9 @@ fi
 
 
 %changelog
+* Tue May 11 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-3
+- fixed noarch subpackages for EL-6
+
 * Thu Apr 29 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-2
 - DejaVu fonts doesn't exist on EL <= 5