rpms/bind/FC-6 bind.spec,1.143,1.144 sources,1.29,1.30

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/bind/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv4022

Modified Files:
	bind.spec sources 
Log Message:
sync. with devel


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- bind.spec	6 Dec 2006 14:55:51 -0000	1.143
+++ bind.spec	10 Dec 2006 23:57:37 -0000	1.144
@@ -12,19 +12,18 @@
 %{?!selinux:	%define selinux     1}
 %define		bind_dir      /var/named
 %define    	chroot_prefix %{bind_dir}/chroot
-%define		prever		   rc3
 #
 Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server.
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.3
-Release: 	0.1.%{prever}%{?dist}
+Release: 	1%{?prever}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
 Group: 		System Environment/Daemons
 #
-Source: 	ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{prever}.tar.gz
+Source: 	ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{?prever}.tar.gz
 Source1: 	named.sysconfig
 Source2: 	named.init
 Source3: 	named.logrotate
@@ -48,7 +47,6 @@
 Source22: 	named.broadcast
 Source23: 	named.zero
 Source24:	Copyright.caching-nameserver
-Source25: 	rfc1912.txt
 Source26: 	bind-chroot-admin.in
 Source27:       named.rfc1912.zones
 Source28:	libbind.pc
@@ -229,7 +227,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{prever}
+%setup -q -n %{name}-%{version}%{?prever}
 %patch -p1 -b .varrun
 %patch1 -p1 -b .key
 %patch2 -p1 -b .openssl_suffix
@@ -435,7 +433,7 @@
 for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do
     touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
 done
-install -m 644 %{SOURCE25} ./rfc1912.txt
+install -m 644 %{SOURCE5}  ./rfc1912.txt
 install -m 644 %{SOURCE24} ./Copyright
 # bind-chroot-admin script:
 sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin;
@@ -779,6 +777,10 @@
 :;
 
 %changelog
+* Sun Dec 10 2006 Martin Stransky <stransky at redhat.com> - 31:9.3.3-1
+- update to 9.3.3 final
+- fix for #219069: file included twice in src.rpm
+
 * Wed Dec 6 2006 Martin Stransky <stransky at redhat.com> - 31:9.3.3-0.1.rc3
 - added back an interval to restart
 - renamed package, it should meet the N-V-R criteria


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	3 Nov 2006 15:28:30 -0000	1.29
+++ sources	10 Dec 2006 23:57:37 -0000	1.30
@@ -1,3 +1,3 @@
 3567c35a24cb83a8a69443a399bbb6c8  bind-chroot.tar.gz
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
-9125239da86839483242ff4d8aac5156  bind-9.3.3rc3.tar.gz
+b5cad77aa7912bf7b4cb770cfc42fdad  bind-9.3.3.tar.gz