Browse Source

bind: update to 9.6-ESV-R8, remove conflicts to bind-current-libs
bind-current: update to 9.9.2-P2, remove condlicts to bind-libs

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7598 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 years ago
parent
commit
5e3b874083
2 changed files with 31 additions and 17 deletions
  1. 22 11
      b/bind-current/bind-current-vl.spec
  2. 9 6
      b/bind/bind-vl.spec

+ 22 - 11
b/bind-current/bind-current-vl.spec

@@ -2,8 +2,8 @@
 
 %define sname bind
 %define pname bind-current
-%define pversion 9.8.4p1
-%define sversion 9.8.4-P1
+%define pversion 9.9.2p2
+%define sversion 9.9.2-P2
 %define bind_epoch 1
 # fixed <BTS:VineLinux:1139>
 %define old_bind_version 1:9.6.ESV.R1
@@ -65,10 +65,6 @@ the caching-nameserver package.
 %package libs
 Summary: Libraries used by various DNS packages
 Group: System Environment/Libraries
-Conflicts: bind9-libs <= 9.2.1-0vl5
-Conflicts: bind-libs < %{bind_epoch}:%{version}-%{release}
-Obsoletes: bind9-libs <= 9.2.1-0vl5
-Obsoletes: bind-libs < %{old_bind_version}
 
 %description libs
 Contains libraries used by both the bind server package as well as the utils packages.
@@ -125,7 +121,16 @@ perl -pi -e 's/^(SUBDIRS =.+)dlzexternal(.+)$/\1\2/' bin/tests/system/Makefile.i
 libtoolize --copy --force
 aclocal
 autoconf
-%configure --with-libtool --with-openssl=/usr --enable-threads --with-dlz-dlopen
+%configure \
+  --with-libtool \
+  --with-openssl=/usr \
+  --disable-openssl-version-ceck \
+  --enable-threads \
+  --enable-ipv6 \
+  --with-pic \
+  --with-dlz-dlopen \
+  --enable-filter-aaaa \
+  --enable-fixed-rrset
 make %{?_smp_mflags}
 
 %install
@@ -279,7 +284,6 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_libdir}/*.la
 %{_libdir}/*.a
 %{_includedir}/*
 %{_mandir}/man3/*
@@ -287,6 +291,13 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %{_bindir}/isc-config.sh
 
 %changelog
+* Thu Mar 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.9.2p2-1
+- update to 9.9.2-P2
+- remove .la
+- remove Conflicts/Obsoletes from libs subpackage.
+- add configure options
+  --enable-ipv6 --with-pic --enable-filter-aaaa --enable-fixed-rrset
+
 * Tue Dec 18 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.8.4p1-1
 - new upstream release.
 - added an option "--with-dlz-dlopen".
@@ -356,7 +367,7 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 - new upstream release
 - drop patch0 and patch14, merged in upstream
 
-* Sat Jan 11 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.5.1P1-1
+* Sun Jan 11 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.5.1P1-1
 - new upstream release with security fix
 
 * Wed Jul 09 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 9.5.0P1-1
@@ -538,10 +549,10 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 - fix typo in spec (it's %post, without a leading blank) introduced in -6
 - change SYSTYPE to linux
 
-* Sat Feb 11 2000 Bill Nottingham <notting@redhat.com>
+* Fri Feb 11 2000 Bill Nottingham <notting@redhat.com>
 - pick a standard < 100 uid/gid for named
 
-* Thu Feb 04 2000 Elliot Lee <sopwith@redhat.com>
+* Fri Feb 04 2000 Elliot Lee <sopwith@redhat.com>
 - Pass named a '-u named' parameter by default, and add/remove user.
 
 * Thu Feb  3 2000 Bernhard Rosenkraenzer <bero@redhat.com>

+ 9 - 6
b/bind/bind-vl.spec

@@ -1,7 +1,7 @@
 %define _localstatedir /var
 
-%define pversion 9.6.ESV.R7.P2
-%define sversion 9.6-ESV-R7-P2
+%define pversion 9.6.ESV.R8
+%define sversion 9.6-ESV-R8
 %define bind_epoch 1
 
 %define bind_uid  25
@@ -55,7 +55,6 @@ the caching-nameserver package.
 %package libs
 Summary: Libraries used by various DNS packages
 Group: System Environment/Libraries
-Conflicts: bind-current-libs
 
 %description libs
 Contains libraries used by both the bind server package as well as the utils packages.
@@ -256,6 +255,10 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %{_bindir}/isc-config.sh
 
 %changelog
+* Thu Mar 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.6.ESV.R8-1
+- update to 9.6-ESV-R8
+- remove Conflicts from libs
+
 * Wed Jul 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 9.6.ESV.R7.P2-1
 - new upstream release with secrity fix (CVE-2012-3817)
 - fix permission of shared libs
@@ -320,7 +323,7 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 - new upstream release
 - drop patch0 and patch14, merged in upstream
 
-* Sat Jan 11 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.5.1P1-1
+* Sun Jan 11 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.5.1P1-1
 - new upstream release with security fix
 
 * Wed Jul 09 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 9.5.0P1-1
@@ -502,10 +505,10 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 - fix typo in spec (it's %post, without a leading blank) introduced in -6
 - change SYSTYPE to linux
 
-* Sat Feb 11 2000 Bill Nottingham <notting@redhat.com>
+* Fri Feb 11 2000 Bill Nottingham <notting@redhat.com>
 - pick a standard < 100 uid/gid for named
 
-* Thu Feb 04 2000 Elliot Lee <sopwith@redhat.com>
+* Fri Feb 04 2000 Elliot Lee <sopwith@redhat.com>
 - Pass named a '-u named' parameter by default, and add/remove user.
 
 * Thu Feb  3 2000 Bernhard Rosenkraenzer <bero@redhat.com>