SPECS: amanda.spec - added without client/server bconds - enabled ...

[baggins]

Author: baggins                      Date: Wed Dec  6 17:54:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added without client/server bconds
- enabled ssh security
- perm fix for .amandahosts
- still fighting with triggers

---- Files affected:
SPECS:
   amanda.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/amanda.spec
diff -u SPECS/amanda.spec:1.141 SPECS/amanda.spec:1.142
--- SPECS/amanda.spec:1.141	Tue Dec  5 19:35:43 2006
+++ SPECS/amanda.spec	Wed Dec  6 18:53:56 2006
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
-# TODO:
-# - add missing files to proper subpackages
 #
 # Conditional build:
 %bcond_with	xfs	# with support for xfsdump
+%bcond_without	client	# without client package
+%bcond_without	server	# without server package
 #
 Summary:	A network-capable tape backup solution
 Summary(pl):	Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:		amanda
 Version:	2.5.1p2
-Release:	0.1
+Release:	0.3
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@
 BuildRequires:	automake
 BuildRequires:	dump
 BuildRequires:	flex
+BuildRequires:	libxslt-progs
 BuildRequires:	libtool
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -148,10 +149,12 @@
 	PRINT=/usr/bin/lpr \
 	DUMP=/sbin/dump \
 	RESTORE=/sbin/restore \
-	XFSDUMP=/sbin/xfsdump \
-	XFSRESTORE=/sbin/xfsrestore \
+	%{?with_xfs:XFSDUMP=/sbin/xfsdump} \
+	%{?with_xfs:XFSRESTORE=/sbin/xfsrestore} \
 	--disable-static \
 	--enable-shared \
+	%{!?with_server:--without-server} \
+	%{!?with_client:--without-client} \
 	--with-index-server=localhost \
 	--with-user=amanda \
 	--with-group=amanda \
@@ -161,6 +164,7 @@
 	--with-fqdn \
 	--with-smbclient=%{_bindir}/smbclient \
 	--with-bsd-security \
+	--with-ssh-security \
 	--with-buffered-dump \
 	--with-amandahosts \
 	--with-debugging=%{_localstatedir}/amanda/debug \
@@ -193,15 +197,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun -- amanda-libs < 2.4.2p2-3
+%triggerpostun -- %{name}-libs < 2.5.1p2-1
+/usr/sbin/usermod -G disk,backup amanda
 /usr/sbin/chsh -s /bin/sh amanda
 
-%triggerpostun -- amanda-libs < 2.4.2p2-12
-/usr/sbin/usermod -G disk amanda
-
 %pre libs
 %groupadd -P %{name}-libs -g 80 amanda
-%useradd -P %{name}-libs -u 80 -G disk -d /var/lib/amanda -s /bin/sh -c "Amanda Backup user" -g amanda amanda
+%useradd -P %{name}-libs -u 80 -G disk,backup -d /var/lib/amanda -s /bin/sh -c "Amanda Backup user" -g amanda amanda
 
 %post	libs -p /sbin/ldconfig
 
@@ -240,8 +242,9 @@
 %attr(755,root,root) %{_libdir}/libamanda*.so
 %dir %{_libexecdir}
 %attr(770,root,amanda) %dir %{_localstatedir}/amanda
-%attr(640,root,amanda) %config(noreplace) %verify(not md5 mtime size) %{_localstatedir}/amanda/.amandahosts
+%attr(600,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_localstatedir}/amanda/.amandahosts
 
+%if %{with server}
 %files server
 %defattr(644,root,root,755)
 %doc docs/*
@@ -339,7 +342,9 @@
 %{_mandir}/man8/amtoc.8*
 %{_mandir}/man8/amverify.8*
 %{_mandir}/man8/amverifyrun.8*
+%endif
 
+%if %{with client}
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/amanda
@@ -361,6 +366,7 @@
 %attr(770,root,amanda) %dir %{_localstatedir}/amanda/gnutar-lists
 %{_mandir}/man5/amanda-client.conf.5*
 %{_mandir}/man8/amrecover.8*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -368,6 +374,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2006/12/06 17:53:56  baggins
+- added without client/server bconds
+- enabled ssh security
+- perm fix for .amandahosts
+- still fighting with triggers
+
 Revision 1.141  2006/12/05 18:35:43  baggins
 - updated files with new entries
 - moved server programs and libs from client and libs to server package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amanda.spec?r1=1.141&r2=1.142&f=u