diff --git a/.gitignore b/.gitignore
index eda20b9..1421b86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ zabbix-1.8.2.tar.gz
 /zabbix-1.8.12.tar.gz
 /zabbix-1.8.13.tar.gz
 /zabbix-1.8.14.tar.gz
+/zabbix-2.0.1-free.tar.gz
diff --git a/sources b/sources
index 486327c..9cf4f08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8735ea210217d1eebeeacd0ac13c83e  zabbix-1.8.14.tar.gz
+c6d9d439a35110addff08c0290cbab0f  zabbix-2.0.1-free.tar.gz
diff --git a/zabbix-1.8.4-config.patch b/zabbix-1.8.4-config.patch
deleted file mode 100644
index 9eee3f6..0000000
--- a/zabbix-1.8.4-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up zabbix-1.8.4/frontends/php/include/config.inc.php.orig zabbix-1.8.4/frontends/php/include/config.inc.php
---- zabbix-1.8.4/frontends/php/include/config.inc.php.orig	2011-01-04 14:57:51.000000000 +0100
-+++ zabbix-1.8.4/frontends/php/include/config.inc.php	2011-01-04 14:57:52.000000000 +0100
-@@ -116,8 +116,7 @@ function __autoload($class_name){
- 	$ZBX_LOCALNODEID = 0;
- 	$ZBX_LOCMASTERID = 0;
- 
--	$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
--	$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).'/'.basename($ZBX_CONFIGURATION_FILE);
-+	$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
- 
- // Include Tactical Overview modules
- 	require_once('include/locales.inc.php');
diff --git a/zabbix-1.8.4-fonts-config.patch b/zabbix-1.8.4-fonts-config.patch
deleted file mode 100644
index d835e83..0000000
--- a/zabbix-1.8.4-fonts-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up zabbix-1.8.4/frontends/php/include/defines.inc.php.f zabbix-1.8.4/frontends/php/include/defines.inc.php
---- zabbix-1.8.4/frontends/php/include/defines.inc.php.f	2011-01-04 20:48:57.000000000 +0100
-+++ zabbix-1.8.4/frontends/php/include/defines.inc.php	2011-01-04 20:49:14.000000000 +0100
-@@ -35,7 +35,7 @@
- 
- 	define('ZBX_WIDGET_ROWS',				20);
- 
--	define('ZBX_FONTPATH',					realpath('fonts'));	// where to search for font (GD > 2.0.18)
-+	define('ZBX_FONTPATH',					'/usr/share/fonts/dejavu');	// where to search for font (GD > 2.0.18)
- 	define('ZBX_GRAPH_FONT_NAME',			'DejaVuSans');		// font file name
- 	define('ZBX_GRAPH_LEGEND_HEIGHT',120); // when graph height is less then this value, some legend will not show up
- 
diff --git a/zabbix-1.8.8-no-flash.patch b/zabbix-1.8.8-no-flash.patch
deleted file mode 100644
index b6796f8..0000000
--- a/zabbix-1.8.8-no-flash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash zabbix-1.8.8/frontends/php/include/screens.inc.php
---- zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash	2011-10-05 11:26:07.000000000 +0200
-+++ zabbix-1.8.8/frontends/php/include/screens.inc.php	2011-10-05 11:26:30.000000000 +0200
-@@ -380,7 +380,6 @@ require_once('include/js.inc.php');
- 		$form->addVar('screenid',$_REQUEST['screenid']);
- // a-z order!!!
- 		$cmbRes = new CCombobox('resourcetype',$resourcetype,'submit()');
--		$cmbRes->addItem(SCREEN_RESOURCE_CLOCK,				S_CLOCK);
- 		$cmbRes->addItem(SCREEN_RESOURCE_DATA_OVERVIEW,		S_DATA_OVERVIEW);
- 		$cmbRes->addItem(SCREEN_RESOURCE_GRAPH,				S_GRAPH);
- 		$cmbRes->addItem(SCREEN_RESOURCE_ACTIONS,			S_HISTORY_OF_ACTIONS);
diff --git a/zabbix-2.0.1-config.patch b/zabbix-2.0.1-config.patch
new file mode 100644
index 0000000..bc96ca0
--- /dev/null
+++ b/zabbix-2.0.1-config.patch
@@ -0,0 +1,13 @@
+diff -up zabbix-2.0.1/frontends/php/include/config.inc.php.orig zabbix-2.0.1/frontends/php/include/config.inc.php
+--- zabbix-2.0.1/frontends/php/include/config.inc.php.orig	2012-06-27 23:03:03.000000000 +0200
++++ zabbix-2.0.1/frontends/php/include/config.inc.php	2012-07-12 16:17:32.000000000 +0200
+@@ -64,8 +64,7 @@ $USER_DETAILS = array();
+ $USER_RIGHTS = array();
+ $ZBX_LOCALNODEID = 0;
+ $ZBX_LOCMASTERID = 0;
+-$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
+-$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).DIRECTORY_SEPARATOR.basename($ZBX_CONFIGURATION_FILE);
++$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
+ 
+ // include tactical overview modules
+ require_once dirname(__FILE__).'/locales.inc.php';
diff --git a/zabbix-2.0.1-fonts-config.patch b/zabbix-2.0.1-fonts-config.patch
new file mode 100644
index 0000000..6f0e23d
--- /dev/null
+++ b/zabbix-2.0.1-fonts-config.patch
@@ -0,0 +1,12 @@
+diff -up zabbix-2.0.1/frontends/php/include/defines.inc.php.orig zabbix-2.0.1/frontends/php/include/defines.inc.php
+--- zabbix-2.0.1/frontends/php/include/defines.inc.php.orig	2012-06-27 23:03:03.000000000 +0200
++++ zabbix-2.0.1/frontends/php/include/defines.inc.php	2012-07-12 16:19:11.000000000 +0200
+@@ -31,7 +31,7 @@ define('ZBX_PERIOD_DEFAULT',			3600); //
+ 
+ define('ZBX_WIDGET_ROWS',				20);
+ 
+-define('ZBX_FONTPATH',					realpath('fonts')); // where to search for font (GD > 2.0.18)
++define('ZBX_FONTPATH',					'/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
+ define('ZBX_GRAPH_FONT_NAME',			'DejaVuSans'); // font file name
+ define('ZBX_GRAPH_LEGEND_HEIGHT',		120); // when graph height is less then this value, some legend will not show up
+ 
diff --git a/zabbix-2.0.1-no-flash.patch b/zabbix-2.0.1-no-flash.patch
new file mode 100644
index 0000000..36a7824
--- /dev/null
+++ b/zabbix-2.0.1-no-flash.patch
@@ -0,0 +1,11 @@
+diff -up zabbix-2.0.1/frontends/php/include/screens.inc.php.orig zabbix-2.0.1/frontends/php/include/screens.inc.php
+--- zabbix-2.0.1/frontends/php/include/screens.inc.php.orig	2012-06-27 23:03:03.000000000 +0200
++++ zabbix-2.0.1/frontends/php/include/screens.inc.php	2012-07-12 16:29:02.000000000 +0200
+@@ -25,7 +25,6 @@ require_once dirname(__FILE__).'/js.inc.
+ 
+ function screen_resources($resource = null) {
+ 	$resources = array(
+-		SCREEN_RESOURCE_CLOCK => _('Clock'),
+ 		SCREEN_RESOURCE_DATA_OVERVIEW => _('Data overview'),
+ 		SCREEN_RESOURCE_GRAPH => _('Graph'),
+ 		SCREEN_RESOURCE_ACTIONS => _('History of actions'),
diff --git a/zabbix.spec b/zabbix.spec
index f35ae1e..05d8d8e 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,20 +8,18 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        1.8.14
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.zabbix.com/
-Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+# upstream tarbal minus src/zabbix_java/lib/org-json-2010-12-28.jar
+Source0:        %{srcname}-%{version}-free.tar.gz
 Source1:        zabbix-web.conf
 Source5:        zabbix-logrotate.in
-# processing of SNMP traps
-Source6:        zabbix_snmptrap
-Source7:        zabbix_snmptrap.conf
-Source8:        zabbix_snmptrap.README
 # tmpfiles for F >= 15
 Source9:        zabbix-tmpfiles.conf
 # systemd units
@@ -34,16 +32,14 @@ Source15:       zabbix-server-pgsql.service
 Source16:       zabbix-server-sqlite3.service
 
 # local rules for config files
-Patch0:         zabbix-1.8.4-config.patch
+Patch0:         zabbix-2.0.1-config.patch
 # local rules for config files - fonts
-Patch1:         zabbix-1.8.4-fonts-config.patch
+Patch1:         zabbix-2.0.1-fonts-config.patch
 # remove flash content (#737337)
-Patch2:         zabbix-1.8.8-no-flash.patch
+Patch2:         zabbix-2.0.1-no-flash.patch
 # adapt for fping3 - https://support.zabbix.com/browse/ZBX-4894
 Patch3:         zabbix-1.8.12-fping3.patch
 
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
 BuildRequires:   net-snmp-devel
@@ -260,6 +256,7 @@ Conflicts:       %{name}-web-pgsql
 %description web-sqlite3
 Zabbix web frontend for SQLite
 
+
 %prep
 %setup0 -q -n %{srcname}-%{version}
 %patch0 -p1
@@ -288,10 +285,11 @@ touch -r frontends/php/css.css frontends/php/include/config.inc.php \
     frontends/php/include \
     frontends/php/include/classes
 
-cp -p %{SOURCE8} .
-
 # fix path to traceroute utility
-sed -i.orig -e 's|/usr/bin/traceroute|/bin/traceroute|' create/data/data.sql
+for f in database/*/data.sql
+do
+    sed -i.orig -e 's|/usr/bin/traceroute|/bin/traceroute|' $f
+done
 
 # FSF address is wrong
 # https://support.zabbix.com/browse/ZBX-4108
@@ -312,6 +310,7 @@ common_flags="
     --enable-agent
     --enable-proxy
     --enable-ipv6
+    --disable-java
     --with-net-snmp
     --with-ldap
     --with-libcurl
@@ -326,7 +325,7 @@ make %{?_smp_mflags}
 mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_mysql
 mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_mysql
 
-%configure $common_flags --with-pgsql
+%configure $common_flags --with-postgresql
 make %{?_smp_mflags}
 mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_pgsql
 mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_pgsql
@@ -341,8 +340,6 @@ touch src/zabbix_proxy/zabbix_proxy
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # set up some required directories
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/externalscripts
@@ -362,33 +359,32 @@ cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{srcname}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php
 
 # drop config files in place
-install -m 0644 -p misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}
 install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{srcname}.conf
 
 # fix config file options
-cat misc/conf/zabbix_agentd.conf | sed \
+sed -i \
     -e 's|# PidFile=.*|PidFile=%{_localstatedir}/run/%{srcname}/zabbix_agentd.pid|g' \
     -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/%{srcname}/zabbix_agentd.log|g' \
     -e 's|# LogFileSize=.*|LogFileSize=0|g' \
-    > $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_agentd.conf
+    conf/zabbix_agentd.conf
 
-cat misc/conf/zabbix_server.conf | sed \
+sed -i \
     -e 's|# PidFile=.*|PidFile=%{_localstatedir}/run/%{srcname}/zabbix.pid|g' \
     -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/%{srcname}/zabbix_server.log|g' \
     -e 's|# LogFileSize=.*|LogFileSize=0|g' \
     -e 's|# AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/%{srcname}/|g' \
     -e 's|^DBUser=root|DBUser=zabbix|g' \
     -e 's|# DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
-    > $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_server.conf
+    conf/zabbix_server.conf
 
-cat misc/conf/zabbix_proxy.conf | sed \
+sed -i \
     -e 's|# PidFile=.*|PidFile=%{_localstatedir}/run/%{srcname}/zabbix_proxy.pid|g' \
     -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/%{srcname}/zabbix_proxy.log|g' \
     -e 's|# LogFileSize=.*|LogFileSize=0|g' \
     -e 's|# AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/%{srcname}/|g' \
     -e 's|^DBUser=root|DBUser=zabbix|g' \
     -e 's|# DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
-    > $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_proxy.conf
+    conf/zabbix_proxy.conf
 
 # install log rotation
 cat %{SOURCE5} | sed -e 's|COMPONENT|server|g' > \
@@ -416,6 +412,12 @@ install -m 0755 -p src/zabbix_server/zabbix_server_* $RPM_BUILD_ROOT%{_sbindir}/
 rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy
 install -m 0755 -p src/zabbix_proxy/zabbix_proxy_* $RPM_BUILD_ROOT%{_sbindir}/
 
+# install compatibility links for config files
+ln -sf %{_sysconfdir}/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_agent.conf
+ln -sf %{_sysconfdir}/zabbix_agentd.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_agentd.conf
+ln -sf %{_sysconfdir}/zabbix_server.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_server.conf
+ln -sf %{_sysconfdir}/zabbix_proxy.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/zabbix_proxy.conf
+
 # nuke static libs and empty oracle upgrade sql
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a
 
@@ -423,40 +425,34 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a
 for pkg in proxy server ; do
     docdir=$RPM_BUILD_ROOT%{_docdir}/%{srcname}-$pkg-mysql-%{version}
     install -dm 755 $docdir
-    cp -p --parents create/schema/mysql.sql $docdir
-    cp -p --parents create/data/data.sql $docdir
-    cp -p --parents create/data/images_mysql.sql $docdir
+    cp -p --parents database/mysql/schema.sql $docdir
+    cp -p --parents database/mysql/data.sql $docdir
+    cp -p --parents database/mysql/images.sql $docdir
     cp -pR --parents upgrades/dbpatches/1.6/mysql $docdir
     cp -pR --parents upgrades/dbpatches/1.8/mysql $docdir
+    cp -pR --parents upgrades/dbpatches/2.0/mysql $docdir
     docdir=$RPM_BUILD_ROOT%{_docdir}/%{srcname}-$pkg-pgsql-%{version}
     install -dm 755 $docdir
-    cp -p --parents create/schema/postgresql.sql $docdir
-    cp -p --parents create/data/data.sql $docdir
-    cp -p --parents create/data/images_pgsql.sql $docdir
+    cp -p --parents database/postgresql/schema.sql $docdir
+    cp -p --parents database/postgresql/data.sql $docdir
+    cp -p --parents database/postgresql/images.sql $docdir
     cp -pR --parents upgrades/dbpatches/1.6/postgresql $docdir
     cp -pR --parents upgrades/dbpatches/1.8/postgresql $docdir
+    cp -pR --parents upgrades/dbpatches/2.0/postgresql $docdir
     docdir=$RPM_BUILD_ROOT%{_docdir}/%{srcname}-$pkg-sqlite3-%{version}
     install -dm 755 $docdir
-    cp -p --parents create/schema/sqlite.sql $docdir
-    cp -p --parents create/data/data.sql $docdir
-    cp -p --parents create/data/images_sqlite3.sql $docdir
+    cp -p --parents database/sqlite3/schema.sql $docdir
+    cp -p --parents database/sqlite3/data.sql $docdir
+    cp -p --parents database/sqlite3/images.sql $docdir
 done
 # remove extraneous ones
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/create
 
-# processing of SNMP traps
-install -m 755 -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}
-install -m 644 -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}
-
 # systemd must create /var/run/%{srcname}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/zabbix.conf
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %pre
 getent group zabbix > /dev/null || groupadd -r zabbix
 getent passwd zabbix > /dev/null || \
@@ -593,60 +589,56 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_sysconfdir}/%{srcname}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/zabbix.conf
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/lib/%{srcname}
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{srcname}
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{srcname}
+%{_bindir}/zabbix_get
+%{_bindir}/zabbix_sender
+%{_mandir}/man1/zabbix_get.1*
+%{_mandir}/man1/zabbix_sender.1*
 
 %files server
-%defattr(-,root,root,-)
-%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_server.conf
+%doc misc/snmptrap/zabbix_trap_receiver.pl
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix_server.conf
+%{_sysconfdir}/%{srcname}/zabbix_server.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/%{srcname}/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
 %ghost %{_unitdir}/zabbix-server.service
-%{_bindir}/zabbix_get
-%{_mandir}/man1/zabbix_get.1*
 %{_mandir}/man8/zabbix_server.8*
 
 %files server-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-mysql-%{version}/
 %{_sbindir}/zabbix_server_mysql
 %{_unitdir}/zabbix-server-mysql.service
 
 %files server-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-pgsql-%{version}/
 %{_sbindir}/zabbix_server_pgsql
 %{_unitdir}/zabbix-server-pgsql.service
 
 %files server-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-sqlite3-%{version}/
 %{_sbindir}/zabbix_server_sqlite3
 %{_unitdir}/zabbix-server-sqlite3.service
 
 %files agent
-%defattr(-,root,root,-)
-%doc zabbix_snmptrap.README
-%config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_agent.conf
-%config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_agentd.conf
-%config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_snmptrap.conf
+%config(noreplace) %{_sysconfdir}/zabbix_agent.conf
+%{_sysconfdir}/%{srcname}/zabbix_agent.conf
+%config(noreplace) %{_sysconfdir}/zabbix_agentd.conf
+%{_sysconfdir}/%{srcname}/zabbix_agentd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %{_unitdir}/zabbix-agent.service
 %{_sbindir}/zabbix_agent
 %{_sbindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_snmptrap
-%{_mandir}/man1/zabbix_sender.1*
 %{_mandir}/man8/zabbix_agentd.8*
 
 %files proxy
-%defattr(-,root,root,-)
-%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_proxy.conf
+%doc misc/snmptrap/zabbix_trap_receiver.pl
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix_proxy.conf
+%{_sysconfdir}/%{srcname}/zabbix_proxy.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/%{srcname}/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %ghost %{_unitdir}/zabbix-proxy.service
@@ -655,41 +647,41 @@ fi
 %{_mandir}/man8/zabbix_proxy.8*
 
 %files proxy-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-mysql-%{version}/
 %{_sbindir}/zabbix_proxy_mysql
 %{_unitdir}/zabbix-proxy-mysql.service
 
 %files proxy-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-pgsql-%{version}/
 %{_sbindir}/zabbix_proxy_pgsql
 %{_unitdir}/zabbix-proxy-pgsql.service
 
 %files proxy-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-sqlite3-%{version}/
 %{_sbindir}/zabbix_proxy_sqlite3
 %{_unitdir}/zabbix-proxy-sqlite3.service
 
 %files web
-%defattr(-,root,root,-)
 %dir %attr(0750,apache,apache) %{_sysconfdir}/%{srcname}/web
 %ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/%{srcname}
 
 %files web-mysql
-%defattr(-,root,root,-)
 
 %files web-pgsql
-%defattr(-,root,root,-)
 
 %files web-sqlite3
-%defattr(-,root,root,-)
 
 
 %changelog
+* Thu Jul 12 2012 Dan Horák <dan[at]danny.cz> - 2.0.1-1
+- update to 2.0.1
+- rebased patches
+- upstream location (/etc) for config files is used with symlinks to the old /etc/zabbix
+- dropped our own SNMP trap processor, upstream one running directly under net-snmp daemon is used instead
+- moved zabbix_get and zabbix_sender tools to the main package
+
 * Thu Jun 28 2012 Dan Horák <dan[at]danny.cz> - 1.8.14-1
 - update to 1.8.14
 
diff --git a/zabbix_snmptrap b/zabbix_snmptrap
deleted file mode 100644
index eab4545..0000000
--- a/zabbix_snmptrap
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# Zabbix
-# Copyright (C) 2000,2001,2002,2003 Alexei Vladishev
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-# read CONFIGURATION
-[ -f /etc/zabbix/zabbix_snmptrap.conf ] || exit 1
-. /etc/zabbix/zabbix_snmptrap.conf
-
-read hostname
-read ip
-read uptime
-read oid
-read address
-read community
-read enterprise
-
-oid=`echo $oid|cut -f2 -d' '`
-address=`echo $address|cut -f2 -d' '`
-community=`echo $community|cut -f2 -d' '`
-enterprise=`echo $enterprise|cut -f2 -d' '`
-
-oid=`echo $oid|cut -f11 -d'.'`
-community=`echo $community|cut -f2 -d'"'`
-
-str="$hostname $address $community $enterprise $oid"
-
-$ZABBIX_SENDER -z $ZABBIX_SERVER -p $ZABBIX_PORT -s $HOST -k $KEY -o "$str"
diff --git a/zabbix_snmptrap.README b/zabbix_snmptrap.README
deleted file mode 100644
index 0ef337d..0000000
--- a/zabbix_snmptrap.README
+++ /dev/null
@@ -1,15 +0,0 @@
-Processing SNMP traps in Zabbix
-===============================
-
-The Zabbix source archive contains a script called snmptrapd.sh that's used
-for processing of received SNMP traps in Zabbix (see Zabbix Manual for the
-details [1]). I have split the script into 2 parts - one containing
-configuration and second the script itself (renamed to zabbix-snmptrap).
-Zabbix 1.9+ will get a new implementation of the traps processing [2], but
-we should have a solution for 1.8.
-
-May 2011, Dan Horák
-
-
-[1] http://www.zabbix.com/documentation/1.8/manual/config/utilities
-[2] https://support.zabbix.com/browse/ZBXNEXT-747
diff --git a/zabbix_snmptrap.conf b/zabbix_snmptrap.conf
deleted file mode 100644
index 6c9d9f4..0000000
--- a/zabbix_snmptrap.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# sourced by /usr/bin/zabbix_snmptrap
-
-# CONFIGURATION
-
-ZABBIX_SERVER="localhost";
-ZABBIX_PORT="10051";
-
-ZABBIX_SENDER="zabbix_sender";
-
-KEY="snmptraps";
-HOST="snmptraps";
-
-# END OF CONFIGURATION