- better messages in pre, added Requires(), release 8

[packages/bind.git] / bind.spec

diff --git a/bind.spec b/bind.spec
index 27dfd680548bad27ab7c72e76fd9e074d45cb378..713b8e3f8da253a0922e94910d2d311e1a9bbba9 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -7,9 +7,10 @@ Summary(pt_BR):        BIND - Servidor de nomes DNS
 Summary(ru):   BIND - cÅÒ×ÅÒ ÓÉÓÔÅÍÙ ÄÏÍÅÎÎÙÈ ÉÍÅÎ (DNS)
 Summary(tr):   DNS alan adý sunucusu
 Summary(uk):   BIND - cÅÒ×ÅÒ ÓÉÓÔÅÍÉ ÄÏÍÅÎÎÉÈ ¦ÍÅÎ (DNS)
+Summary(zh_CN):        Internet ÓòÃû·þÎñÆ÷ 
 Name:          bind
 Version:       9.2.1
-Release:       1
+Release:       8
 Epoch:         5
 License:       BSD-like
 Group:         Networking/Daemons
@@ -22,19 +23,25 @@ Source5:    nslookup.8
 Source6:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Patch1:                %{name}-time.patch
 Patch2:                %{name}-autoconf.patch
+Patch3:                %{name}-sec-from-833.patch
+URL:           http://www.isc.org/products/BIND/bind9.html
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: openssl-devel
-BuildRequires: sed
-Prereq:                rc-scripts >= 0.2.0
-Prereq:                /sbin/chkconfig
-Prereq:                %{name}-libs
-Requires:      %{name}-libs = %{version}
+PreReq:                %{name}-libs = %{version}
+PreReq:                rc-scripts >= 0.2.0
+Requires(pre): fileutils
+Requires(pre): /usr/bin/getgif
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Requires:      psmisc >= 20.1
-URL:           http://www.isc.org/products/BIND/bind9.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     caching-nameserver
 Conflicts:     %{name}-chroot
@@ -127,6 +134,7 @@ Summary(pt_BR):     Utilit
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÐÏÓÙÌËÉ ÚÁÐÒÏÓÏ× Ë ÓÅÒ×ÅÒÁÍ DNS
 Summary(tr):   DNS araçlarý - host, dig, dnsquery, nslookup
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÎÁÄÓÉÌÁÎÎÑ ÚÁÐÉÔ¦× ÄÏ ÓÅÒ×ÅÒ¦× DNS
+Summary(zh_CN):        Internet ÓòÃû·þÎñÆ÷ʵÓù¤¾ß
 Group:         Networking/Utilities
 Requires:      %{name}-libs = %{version}
 
@@ -190,6 +198,7 @@ Summary:    DNS libraries
 Summary(pl):   Biblioteki DNS
 Summary(ru):   âÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ bind
 Summary(uk):   â¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ bind
+Summary(zh_CN):        Internet ÓòÃû·þÎñÆ÷¿ª·¢¿â
 Group:         Libraries
 
 %description libs
@@ -276,6 +285,8 @@ BIND.
 %setup -q -a1
 %patch1 -p1
 %patch2 -p1
+cd lib/bind
+%patch3 -p3
 
 %build
 %{__libtoolize}
@@ -326,7 +337,6 @@ touch $RPM_BUILD_ROOT%{_var}/lib/named/{named.{log,stats},dev/{random,null}}
 
 # we don't want Makefiles in documentation...
 rm -f doc/misc/Makefile*
-gzip -9nf README EXAMPLE-CONFIG-* FAQ doc/misc/* doc/rfc/index
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -335,24 +345,24 @@ rm -rf $RPM_BUILD_ROOT
 if [ -f %{_sysconfdir}/named.boot ]; then
        cp -f %{_sysconfdir}/named.boot /etc/named.boot.2conf
        mv -f %{_sysconfdir}/named.boot /etc/named.rpmsave
-       echo "Warning:%{_sysconfdir}/named.boot saved as /etc/named.rpmsave" 1>&2
+       echo "Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave." 1>&2
 fi
 if [ -n "`getgid named`" ]; then
        if [ "`getgid named`" != "58" ]; then
-               echo "Warning: group namedhaven't gid=58. Correct this before installing bind" 1>&2
+               echo "Error: group named doesn't have gid=58. Correct this before installing bind." 1>&2
                exit 1
        fi
 else
-       echo "Adding group named GID=58"
+       echo "Adding group named GID=58."
        /usr/sbin/groupadd -g 58 named
 fi
 if [ -n "`id -u named 2>/dev/null`" ]; then
        if [ "`id -u named`" != "58" ]; then
-               echo "Warning: user named haven't uid=58. Correct this before installing bind" 1>&2
+               echo "Error: user named doesn't have uid=58. Correct this before installing bind." 1>&2
                exit 1
        fi
 else
-       echo "Adding user named UID=58"
+       echo "Adding user named UID=58."
        /usr/sbin/useradd -u 58 -g 58 -d /dev/null -s /bin/false -c "BIND user" named
 fi
 
@@ -361,7 +371,7 @@ fi
 if [ -f /var/lock/subsys/named ]; then
        /etc/rc.d/init.d/named restart 1>&2
 else
-       echo "Type \"/etc/rc.d/init.d/named start\" to start named" 1>&2
+       echo "Type \"/etc/rc.d/init.d/named start\" to start named." 1>&2
 fi
 
 %preun
@@ -374,9 +384,9 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       echo "Removing user named UID=58"
+       echo "Removing user named."
        %{_sbindir}/userdel named
-       echo "Removing group named GID=58"
+       echo "Removing group named."
        %{_sbindir}/groupdel named
 fi
 
@@ -385,7 +395,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz doc/misc/*.gz doc/arm/*.html doc/rfc
+%doc README EXAMPLE-CONFIG-* FAQ doc/misc/* doc/arm/*.html doc/rfc/index
 
 %attr(754,root,root)  /etc/rc.d/init.d/named
 %attr(640,root,root)  %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/named
@@ -434,6 +444,7 @@ fi
 %lang(ja) %{_mandir}/ja/man1/dig.1*
 %lang(ja) %{_mandir}/ja/man1/host.1*
 %lang(ja) %{_mandir}/ja/man8/nslookup.8*
+%lang(ja) %{_mandir}/ja/man8/nsupdate.8*
 
 %lang(pl) %{_mandir}/pl/man1/host.1*
 
@@ -444,8 +455,9 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*.sh
+%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*.la
 %{_includedir}/*
-%{_libdir}/*.so
 %{_mandir}/man3/*
 
 %files static