devel/jabberd jabberd.spec,1.6,1.7

Adrian Reber (adrian) fedora-extras-commits at redhat.com
Mon Mar 28 17:35:05 UTC 2005


Author: adrian

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

Modified Files:
	jabberd.spec 
Log Message:
* combined some of the sed magic
* added a jabberd file in sysconfig to control if all daemons should be started



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jabberd.spec	26 Mar 2005 08:47:53 -0000	1.6
+++ jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
@@ -6,6 +6,7 @@
 Group: System Environment/Daemons
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
 Source1: jabberd
+Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel
@@ -63,16 +64,20 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 %{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
             -e "s,__ETCDIR__,%{sysconfdir},g" \
             -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
-		$RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name} \
+		$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
@@ -83,23 +88,20 @@
 END
 
 #default driver for storage
-%{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+#the default pam backend needs auto creation of accounts
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<driver>mysql</driver>,<driver>db</driver>,g' \
+            -e 's,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
 
 #default authentication backend
-%{__sed} -i -e "s,<module>mysql</module>,<module>pam</module>,g" \
-	$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
-
-#the default pam backend needs auto creation of accounts
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
-
 #clients must do STARTTLS
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <require-startls/>\n    -->,<require-startls/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<module>mysql</module>,<module>pam</module>,g' \
+            -e 's,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' \
+            -e 's,<!--\n    <require-starttls/>\n    -->,<require-starttls/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #ghost file
 touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem
@@ -168,6 +170,7 @@
 %{_datadir}/%{name}/
 %config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
+%config(noreplace) %{_sysconfdir}/sysconfig/jabberd
 %attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
@@ -180,6 +183,9 @@
 - removed noreplace for start script
 - make backends optional during build
 - use -p with the install command
+- combined some of the sed magic
+- added a jabberd file in sysconfig to control if all daemons
+  should be started
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)




More information about the fedora-extras-commits mailing list