devel/jabberd jabberd.spec,1.4,1.5

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	jabberd.spec 
Log Message:
* make backends optional during build
* use -p with the install command



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd.spec	22 Mar 2005 12:16:56 -0000	1.4
+++ jabberd.spec	25 Mar 2005 19:39:45 -0000	1.5
@@ -8,8 +8,12 @@
 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
+BuildRequires: openssl-devel libidn-devel
+%{!?_without_pam:BuildRequires: pam-devel}
+%{!?_without_db4:BuildRequires: db4-devel}
+%{!?_without_ldap:BuildRequires: openldap-devel}
+%{!?_without_mysql:BuildRequires: mysql-devel}
+%{!?_without_postgresql:BuildRequires: postgresql-devel}
 Requires(post): openssl chkconfig
 Requires(pre): shadow-utils
 Requires(preun): chkconfig shadow-utils
@@ -33,15 +37,21 @@
 %build
 %define _sysconfdir /etc/jabberd
 %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 \
-		--localstatedir=%{_var}/lib
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure
+
+%configure \
+	%{!?_without_pam:--enable-pam} \
+	%{?_without_pam:--disable-pam} \
+	%{!?_without_db4:--enable-db} \
+	%{?_without_db4:--disable-db} \
+	%{!?_without_mysql:--enable-mysql} \
+	%{!?_without_mysql:--with-extra-library-path=%{_libdir}/mysql} \
+	%{?_without_mysql:--disable-mysql} \
+	%{!?_without_ldap:--enable-ldap} \
+	%{?_without_ldap:--disable-ldap} \
+	%{!?_without_postgresql:--enable-pgsql} \
+	%{?_without_postgresql:--disable-pgsql} \
+	--localstatedir=%{_var}/lib
 
 %{__make} %{?_smp_mflags}
 
@@ -51,19 +61,19 @@
 %define _sysconfdir /etc
 %{__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}
-%{__install} -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
-%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__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}
 
 %{__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}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
 auth       required     pam_nologin.so
@@ -168,6 +178,8 @@
 - typo 
 - changed db location to %%{_var}/lib/jabberd
 - removed noreplace for start script
+- make backends optional during build
+- use -p with the install command
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)