--- csync2.spec.orig	2008-09-23 15:28:01.000000000 +0000
+++ csync2.spec	2008-09-23 16:27:18.000000000 +0000
@@ -24,10 +24,10 @@
 # neededforbuild  openssl openssl-devel
 
-BuildRequires: sqlite-devel sqlite librsync openssl-devel librsync-devel
+BuildRequires: libsqlite0-devel libsqlite0 librsync1 openssl-devel librsync1-devel flex bison libtasn1-devel
 
 Name:         csync2
 License:      GPL
 Group:        System/Monitoring
-Requires:     sqlite openssl librsync
+Requires:     libsqlite0 openssl librsync1 libtasn1_3
 Autoreqprov:  on
 Version:      1.34
@@ -57,5 +57,5 @@
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/kerberos/include"
 if ! [ -f configure ]; then ./autogen.sh; fi
-%configure
+%configure --localstatedir=/var --sysconfdir=/etc/csync2
 
 make all 
@@ -65,9 +65,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_var}/lib/csync2
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d $RPM_BUILD_ROOT%{_sysconfdir}/csync2
 
 %makeinstall
 
 install -m 644 csync2.xinetd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/csync2
+mv $RPM_BUILD_ROOT%{_sysconfdir}/csync2.cfg $RPM_BUILD_ROOT%{_sysconfdir}/csync2/csync2.cfg
 
 %clean
@@ -80,12 +81,25 @@
 fi
 
+if [ ! -s /etc/csync2/csync2.key_qq ]; then
+	echo "Generating peer authentication key: this may take some depending on available entropy..."
+	rm -f /etc/csync2/csync2.key_qq
+	csync2 -k /etc/csync2/csync2.key_qq
+fi
+
+if [ ! -e /etc/csync2/csync2_ssl_cert.pem ]; then
+	openssl genrsa -out /etc/csync2/csync2_ssl_key.pem 1024
+	openssl req -new -key /etc/csync2/csync2_ssl_key.pem -out /etc/csync2/csync2_ssl_cert.csr -subj '/'
+	openssl x509 -req -days 6000 -in /etc/csync2/csync2_ssl_cert.csr -signkey /etc/csync2/csync2_ssl_key.pem -out /etc/csync2/csync2_ssl_cert.pem
+fi
+
 %files
 %defattr(-,root,root)
 %doc ChangeLog README NEWS INSTALL TODO AUTHORS
 %{_sbindir}/csync2
+%{_sbindir}/csync2-compare
 %{_var}/lib/csync2
-%{_mandir}/man1/csync2.1.gz
+%{_mandir}/man1/csync2.1.lzma
 %config(noreplace) %{_sysconfdir}/xinetd.d/csync2
-%config(noreplace) %{_sysconfdir}/csync2.cfg
+%config(noreplace) %{_sysconfdir}/csync2/csync2.cfg
 
 %changelog