- started update to 2.5.0p2

[packages/amanda.git] / amanda.spec

diff --git a/amanda.spec b/amanda.spec
index 9bbaaa3df8d484b115a4289301b2f3b4ed44a646..6f24100b5348c8affa5ce35325bd35512eab070a 100644 (file)
--- a/amanda.spec
+++ b/amanda.spec
@@ -1,3 +1,5 @@
+# TODO:
+# - add missing files to proper subpackages
 #
 # Conditional build:
 %bcond_with    xfs     # with support for xfsdump
@@ -5,12 +7,12 @@
 Summary:       A network-capable tape backup solution
 Summary(pl):   Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:          amanda
-Version:       2.4.5
-Release:       3
+Version:       2.5.0p2
+Release:       0.1
 License:       BSD
 Group:         Networking/Utilities
-Source0:       http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz
-# Source0-md5: 1960b7875424e412d042bc92a1548d7f
+Source0:       http://umn.dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz
+# Source0-md5: 073828b8b5a5c377a08f8f19b5eccf85
 Source1:       %{name}-srv.crontab
 Source2:       %{name}.inetd
 Source3:       %{name}idx.inetd
@@ -23,13 +25,11 @@ Patch3:             %{name}-tar.patch
 URL:           http://www.amanda.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
-BuildRequires: cpio
 BuildRequires: dump
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: readline-devel >= 4.2
-BuildRequires: rpmbuild(macros) >= 1.202
-BuildRequires: tar
+BuildRequires: rpmbuild(macros) >= 1.268
 %{?with_xfs:BuildRequires:     xfsdump}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,13 +63,13 @@ amanda-client i amanda-server!
 Summary:       Amanda shared libraries
 Summary(pl):   Biblioteki wspó³dzielone pakietu amanda
 Group:         Networking/Utilities
+Requires(postun):      /sbin/ldconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /sbin/ldconfig
 Provides:      group(amanda)
 Provides:      user(amanda)
 
@@ -83,9 +83,9 @@ Biblioteki wsp
 Summary:       The client side of Amanda
 Summary(pl):   Klient Amandy
 Group:         Networking/Utilities
-PreReq:                %{name}-libs = %{version}-%{release}
-PreReq:                rc-inetd
 Requires(post,postun): /sbin/ldconfig
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      rc-inetd
 Conflicts:     tar < 1.13
 
 %description client
@@ -103,14 +103,14 @@ najmniej jednego z pakiet
 Summary:       The server side of Amanda
 Summary(pl):   Serwer Amandy
 Group:         Networking/Utilities
-PreReq:                %{name}-libs = %{version}-%{release}
-PreReq:                rc-inetd
 Requires(post,postun): /sbin/ldconfig
-Requires:      gnuplot
-Requires:      crondaemon
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /etc/cron.d
+Requires:      crondaemon
+Requires:      gnuplot
 Requires:      mt-st
 Requires:      mtx
+Requires:      rc-inetd
 Obsoletes:     amanda
 
 %description server
@@ -133,7 +133,7 @@ typu streamer).
 %patch3 -p1
 
 # kill libtool.m4 copy
-head -n 1039 acinclude.m4 > acinc.tmp
+head -n 1147 acinclude.m4 > acinc.tmp
 mv -f acinc.tmp acinclude.m4
 
 %build
@@ -143,6 +143,12 @@ mv -f acinc.tmp acinclude.m4
 %{__automake}
 %configure \
        GNUPLOT=/usr/bin/gnuplot \
+       MAILER=/bin/mail \
+       PRINT=/usr/bin/lpr \
+       DUMP=/sbin/dump \
+       RESTORE=/sbin/restore \
+       XFSDUMP=/sbin/xfsdump \
+       XFSRESTORE=/sbin/xfsrestore \
        --disable-static \
        --enable-shared \
        --with-index-server=localhost \
@@ -207,33 +213,25 @@ fi
 
 %post client
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server." 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun client
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %post server
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server." 1>&2
-fi
+%service -q rc-inetd reload
 if [ "$1" = "1" ]; then
        echo "Don't forget to edit /etc/cron.d/amanda-srv." 1>&2
 fi
 
 %postun server
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %files libs
@@ -331,7 +329,7 @@ fi
 %attr(755,root,root) %{_libdir}/libamclient*.so
 %attr(755,root,root) %{_libexecdir}/versionsuffix
 %attr(755,root,root) %{_libexecdir}/amandad
-%attr(4754,root,amanda) %{_libexecdir}/amqde
+#%attr(4754,root,amanda) %{_libexecdir}/amqde
 %attr(4754,root,amanda) %{_libexecdir}/calcsize
 %attr(4754,root,amanda) %{_libexecdir}/killpgrp
 %attr(755,root,root) %{_libexecdir}/patch-system