--- amanda.spec.orig	2004-08-23 21:55:10 +0400
+++ amanda.spec	2004-12-23 19:23:36 +0300
@@ -2,7 +2,7 @@
 
 Name: amanda
 Version: 2.4.4
-Release: alt7
+Release: alt8
 Packager: Grigory Batalov <bga@altlinux.ru>
 
 Summary: The server side of the AMANDA tape backup system
@@ -11,7 +11,7 @@
 Group: Archiving/Backup
 Url: http://www.amanda.org
 
-Source0: http://download.sourceforge.net/amanda/%name-%{version}p2.tar.bz2
+Source0: http://download.sourceforge.net/amanda/%name-%{version}p4.tar.bz2
 Source1: amanda.crontab.bz2
 Source2: __README_QUICKSETUP__.bz2
 Source3: amanda.conf.bz2
@@ -27,8 +27,7 @@
 Patch4: amanda-2.4.4p1-alt-shmctl.patch
 Patch5: amanda-2.4.4p2-alt-gnuplot.patch
 
-# Automatically added by buildreq on Mon Jan 26 2004
-BuildRequires: dump flex gnuplot hostinfo libattr libldap libncurses-devel libreadline-devel libssl mailx mt-st ncompress xfsdump
+BuildRequires: gcc-c++ dump flex gnuplot hostinfo libattr libldap libncurses-devel libreadline-devel libssl mailx mt-st ncompress xfsdump
 
 ExcludeArch: ia64
 
@@ -36,7 +35,7 @@
 # Requires: tar samba-client perl-base awk gnuplot readline/termcap
 # bison flex
 
-Requires: gnuplot mailx mt-st %name-common = %version
+Requires: gnuplot mailx mt-st %name-common = %version-%release
 
 #libtermcap
 #BuildRequires:	libtermcap-devel flex automake autoconf readline-devel
@@ -91,7 +90,7 @@
 Group: Archiving/Backup
 #PreReq: fileutils grep /sbin/service xinetd
 #PreReq:		rpm-helper
-Requires: %name-common = %version
+Requires: %name-common = %version-%release
 
 %description client
 The %name-client package should be installed on any machine that will
@@ -108,7 +107,7 @@
 Summary: Development libraries of AMANDA
 Summary(ru_RU.KOI8-R): Библиотеки AMANDA для разработчиков
 Group: Development/Other
-Requires: %name-common = %version %name-client = %version %name = %version
+Requires: %name-common = %version-%release %name-client = %version-%release %name = %version-%release
 
 %description devel
 The %name-devel package should be installed on any machine that will
@@ -121,7 +120,7 @@
 Summary: Static development libraries of AMANDA
 Summary(ru_RU.KOI8-R): Статические библиотеки AMANDA для разработчиков
 Group: Development/Other
-Requires: %name-devel = %version
+Requires: %name-devel = %version-%release
 
 %description devel-static
 The %name-devel-static package should be installed on any machine
@@ -132,7 +131,7 @@
 приложений на основе AMANDA.
 
 %prep
-%setup -q -n %name-%{version}p2
+%setup -q -n %name-%{version}p4
 %patch0 -p1 -b .bug18322
 #%patch2 -p1
 %patch3 -p0
@@ -146,6 +145,7 @@
 %build
 #automake; autoconf
 %configure \
+    %{subst_enable static} \
     --enable-shared \
     --with-index-server=localhost \
     --with-gnutar=%__tar \
@@ -223,17 +223,28 @@
 done
 %__chmod 0755 %buildroot%_sysconfdir/control.d/facilities/*
 
-# remove non-packaged files                                                     
-%__rm -f %buildroot%_libdir/*.la                                                
-%if_without static                                                              
-%__rm -f %buildroot%_libdir/*.a                                                 
-%endif                                                                          
+# remove non-packaged files
+%__rm -f %buildroot%_libdir/*.la
+%if_without static
+%__rm -f %buildroot%_libdir/*.a
+%endif
+
+%pre
+[ $1 -eq 1 ] || /usr/sbin/control-dump dumper planner amcheck
+
+%post
+%post_ldconfig
+[ $1 -eq 1 ] || /usr/sbin/control-restore dumper planner amcheck
+
+%postun -p %postun_ldconfig
 
 %pre common
 /usr/sbin/useradd -M -n -g disk -r -d %_localstatedir/amanda -s /dev/null \
 	-c "system user for %name" amanda >/dev/null 2>&1 || :
 
-%post common -p /sbin/ldconfig
+%post common -p %post_ldconfig
+
+%postun common -p %postun_ldconfig
 
 %pre client
 [ $1 -eq 1 ] || /usr/sbin/control-dump calcsize killpgrp rundump runtar
@@ -242,19 +253,8 @@
 %post_ldconfig
 [ $1 -eq 1 ] || /usr/sbin/control-restore calcsize killpgrp rundump runtar
 
-%pre
-[ $1 -eq 1 ] || /usr/sbin/control-dump dumper planner amcheck
-
-%post
-%post_ldconfig
-[ $1 -eq 1 ] || /usr/sbin/control-restore dumper planner amcheck
-
-%postun common -p %postun_ldconfig
-
 %postun client -p %postun_ldconfig
 
-%postun -p %postun_ldconfig
-
 %files common
 %_libdir/libamanda-*.so
 %_libdir/libamtape-*.so
@@ -285,6 +285,7 @@
 %_libdir/amanda/driver
 %_libdir/amanda/taper
 %_libdir/amanda/amcleanupdisk
+%_libdir/amanda/chg-iomega
 %_libdir/amanda/chg-scsi
 %_libdir/amanda/chg-manual
 %_libdir/amanda/chg-multi
@@ -387,6 +388,11 @@
 %endif
 
 %changelog
+* Thu Dec 23 2004 somebody 2.4.4-alt8
+- something
+- 2.4.4.p4
+- specfile clean up
+
 * Mon Aug 23 2004 Grigory Batalov <bga@altlinux.ru> 2.4.4-alt7
 - amqde moved to client package