Author: qboosh Date: Sat Feb 17 19:37:34 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged 1.6.1 from HEAD (fixes CVE-2006-4790); new SONAME
---- Files affected: SPECS: gnutls.spec (1.58.2.2 -> 1.58.2.3) ---- Diffs: ================================================================ Index: SPECS/gnutls.spec diff -u SPECS/gnutls.spec:1.58.2.2 SPECS/gnutls.spec:1.58.2.3 --- SPECS/gnutls.spec:1.58.2.2 Tue Dec 12 18:05:56 2006 +++ SPECS/gnutls.spec Sat Feb 17 20:37:29 2007 @@ -2,28 +2,30 @@ Summary: The GNU Transport Layer Security Library Summary(pl): Biblioteka GNU TLS (Transport Layer Security) Name: gnutls -Version: 1.2.10 -Release: 2 +Version: 1.6.1 +Release: 1 License: LGPL Group: Libraries Source0: ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2 -# Source0-md5: 523273961e3cca45c92e50b2676b3c83 +# Source0-md5: fc3cc2509aa93e150cafd39619de7428 Patch0: %{name}-info.patch URL: http://www.gnu.org/software/gnutls/ -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.9 +BuildRequires: gettext-devel >= 0.14.5 BuildRequires: libcfg+-devel BuildRequires: libgcrypt-devel >= 1.2.2 -BuildRequires: libtasn1-devel >= 0.2.18 +BuildRequires: libstdc++-devel +BuildRequires: libtasn1-devel >= 0.3.4 BuildRequires: libtool >= 2:1.5 BuildRequires: lzo-devel BuildRequires: opencdk-devel >= 0.5.5 BuildRequires: readline-devel -BuildRequires: texinfo +BuildRequires: texinfo >= 4.8 BuildRequires: zlib-devel Requires(post,postun): /sbin/ldconfig Requires: libgcrypt >= 1.2.2 -Requires: libtasn1 >= 0.2.18 +Requires: libtasn1 >= 0.3.4 Requires: opencdk >= 0.5.5 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,7 +47,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libgcrypt-devel >= 1.2.2 -Requires: libtasn1-devel >= 0.2.18 +Requires: libtasn1-devel >= 0.3.4 Requires: opencdk-devel Requires: zlib-devel @@ -67,14 +69,52 @@ %description static -l pl Biblioteka statyczna gnutls. +%package c++ +Summary: libgnutlsxx - C++ interface to gnutls library +Summary(pl): libgnutlsxx - interfejs C++ do biblioteki gnutls +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description c++ +libgnutlsxx - C++ interface to gnutls library. + +%description c++ -l pl +libgnutlsxx - interfejs C++ do biblioteki gnutls. + +%package c++-devel +Summary: Header files for libgnutlsxx, a C++ interface to gnutls library +Summary(pl): Pliki nagłówkowe libgnutlsxx - interfejsu C++ do biblioteki gnutls +Group: Development/Libraries +Requires: %{name}-c++ = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: libstdc++-devel + +%description c++-devel +Header files for libgnutlsxx, a C++ interface to gnutls library. + +%description c++-devel -l pl +Pliki nagłówkowe libgnutlsxx - interfejsu C++ do biblioteki gnutls. + +%package c++-static +Summary: Static version of libgnutlsxx, a C++ interface to gnutls library +Summary(pl): Statyczna wersja libgnutlsxx - interfejsu C++ do biblioteki gnutls +Group: Development/Libraries +Requires: %{name}-c++-devel = %{version}-%{release} + +%description c++-static +Static version of libgnutlsxx, a C++ interface to gnutls library. + +%description c++-static -l pl +Statyczna wersja libgnutlsxx - interfejsu C++ do biblioteki gnutls. + %prep %setup -q %patch0 -p1 %build -# supplied libtool is broken (relink) +%{__gettextize} %{__libtoolize} -%{__aclocal} -I m4 -I gl/m4 +%{__aclocal} -I m4 -I gl/m4 -I lgl/m4 %{__autoconf} %{__autoheader} %{__automake} @@ -90,6 +130,8 @@ DESTDIR=$RPM_BUILD_ROOT \ m4datadir=%{_aclocaldir} +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -101,31 +143,62 @@ /sbin/ldconfig [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1 -%files +%post c++ -p /sbin/ldconfig +%postun c++ -p /sbin/ldconfig + +%files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS %attr(755,root,root) %{_bindir}/certtool -%attr(755,root,root) %{_bindir}/gnutls* +%attr(755,root,root) %{_bindir}/gnutls-* +%attr(755,root,root) %{_bindir}/psktool %attr(755,root,root) %{_bindir}/srptool -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/libgnutls.so.*.*.* +%attr(755,root,root) %{_libdir}/libgnutls-extra.so.*.*.* +%attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.* %{_mandir}/man1/certtool.1* -%{_mandir}/man1/gnutls-* +%{_mandir}/man1/gnutls-*.1* +%{_mandir}/man1/psktool.1* %{_mandir}/man1/srptool.1* -%{_infodir}/*.info* +%{_infodir}/gnutls.info* %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/libgnutls*-config -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la +%attr(755,root,root) %{_bindir}/libgnutls-config +%attr(755,root,root) %{_bindir}/libgnutls-extra-config +%attr(755,root,root) %{_libdir}/libgnutls.so +%attr(755,root,root) %{_libdir}/libgnutls-extra.so +%attr(755,root,root) %{_libdir}/libgnutls-openssl.so +%{_libdir}/libgnutls.la +%{_libdir}/libgnutls-extra.la +%{_libdir}/libgnutls-openssl.la %{_includedir}/gnutls -%{_aclocaldir}/*.m4 -%{_pkgconfigdir}/*.pc +%exclude %{_includedir}/gnutls/gnutlsxx.h +%{_aclocaldir}/libgnutls.m4 +%{_aclocaldir}/libgnutls-extra.m4 +%{_pkgconfigdir}/gnutls.pc +%{_pkgconfigdir}/gnutls-extra.pc %{_mandir}/man3/*gnutls*.3* %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libgnutls.a +%{_libdir}/libgnutls-extra.a +%{_libdir}/libgnutls-openssl.a + +%files c++ +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgnutlsxx.so.*.*.* + +%files c++-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgnutlsxx.so +%{_libdir}/libgnutlsxx.la +%{_includedir}/gnutls/gnutlsxx.h + +%files c++-static +%defattr(644,root,root,755) +%{_libdir}/libgnutlsxx.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -133,6 +206,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58.2.3 2007/02/17 19:37:29 qboosh +- merged 1.6.1 from HEAD (fixes CVE-2006-4790); new SONAME + Revision 1.58.2.2 2006/12/12 17:05:56 glen - rel 2 (rebuild with lzo2) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnutls.spec?r1=1.58.2.2&r2=1.58.2.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit