devel/jabberd jabberd.spec,1.2,1.3

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749

Modified Files:
	jabberd.spec 
Log Message:
* removed Epoch: 0
* more Requires(...)
* typo 
* changed db location to %%{_var}/lib/jabberd
* removed noreplace for start script



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.spec	9 Mar 2005 08:00:01 -0000	1.2
+++ jabberd.spec	10 Mar 2005 07:03:41 -0000	1.3
@@ -1,17 +1,19 @@
-Summary:        OpenSource server implementation of the Jabber protocols
-Name:           jabberd
-Version:        2.0
-Release:        0.s6.4
-Epoch:          0
-License:        GPL
-Group:          System Environment/Daemons
-Source0:        http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
-Source1:        jabberd
-URL:            http://jabberd.jabberstudio.org/2/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  openssl-devel db4-devel libidn-devel pam-devel
-BuildRequires:  openldap-devel postgresql-devel mysql-devel
-Requires(post): openssl
+Summary: OpenSource server implementation of the Jabber protocols
+Name: jabberd
+Version: 2.0
+Release: 0.s6.5
+License: GPL
+Group: System Environment/Daemons
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
+Source1: jabberd
+URL: http://jabberd.jabberstudio.org/2/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: openssl-devel db4-devel libidn-devel pam-devel
+BuildRequires: openldap-devel postgresql-devel mysql-devel
+Requires(post): openssl chkconfig
+Requires(pre): shadow-utils
+Requires(preun): chkconfig shadow-utils
+Requires(postun): chkconfig
 
 %description
 The jabberd project aims to provide an open-source server implementation of the
@@ -33,16 +35,21 @@
 %define sysconfdir /etc/jabberd
 %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
 		configure
-%configure --enable-db --enable-mysql --enable-pam --enable-ldap \
-		--enable-pgsql --with-extra-library-path=%{_libdir}/mysql \
-		--enable-debug
+%configure	--enable-db \
+		--enable-mysql \
+		--enable-pam \
+		--enable-ldap \
+		--enable-pgsql \
+		--with-extra-library-path=%{_libdir}/mysql \
+		--localstatedir=%{_var}/lib
+
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
 %define _sysconfdir /etc
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/jabberd/{log,pid,db}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -52,11 +59,9 @@
 %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__ETCDIR__,%{sysconfdir},g" \
+            -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
@@ -76,7 +81,7 @@
 	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #enable SSL certificate
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jAbberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #the default pam backend needs auto creation of accounts
 %{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
@@ -94,7 +99,7 @@
 
 %pre
 #creating jabber user
-useradd -r -d %{_localstatedir}/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
+useradd -r -d %{_var}/lib/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
 
 
 %post
@@ -127,8 +132,8 @@
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 	userdel jabber
-	#should %{_localstatedir}/jabberd be deleted???
-	#%{__rm} -rf %{_localstatedir}/jabberd
+	#should %{_var}/lib/jabberd be deleted???
+	#%{__rm} -rf %{_var}/lib/jabberd
 fi
 
 %postun
@@ -144,12 +149,19 @@
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
-%config(noreplace) %{_initrddir}/%{name}
+%config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
-%attr(-,jabber,jabber) %{_var}/jabberd
+%attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Wed Mar 09 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.5
+- removed Epoch: 0
+- more Requires(...)
+- typo 
+- changed db location to %%{_var}/lib/jabberd
+- removed noreplace for start script
+
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)
 - replace password in the config without making it visible in ps