Merge remote-tracking branch 'origin/master'

Conflicts:
	boost.spec
This commit is contained in:
Petr Machata 2011-02-08 19:40:33 +01:00
commit 078021db91

View File

@ -23,7 +23,7 @@ Name: boost
Summary: The free peer-reviewed portable C++ source libraries Summary: The free peer-reviewed portable C++ source libraries
Version: 1.46.0 Version: 1.46.0
%define version_enc 1_46_0_beta1 %define version_enc 1_46_0_beta1
Release: 0.2.beta1%{?dist} Release: 0.3.beta1%{?dist}
License: Boost License: Boost
# The CMake build framework (set of CMakeLists.txt and module.cmake files) is # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@ -834,10 +834,13 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
%{_bindir}/bjam %{_bindir}/bjam
%changelog %changelog
* Tue Feb 8 2011 Petr Machata <pmachata@redhat.com> - 1.46.0-0.2.beta1 * Tue Feb 8 2011 Petr Machata <pmachata@redhat.com> - 1.46.0-0.3.beta1
- spirit.patch: Fix a problem in using boost::spirit with utf-8 - spirit.patch: Fix a problem in using boost::spirit with utf-8
strings. Thanks to Hicham HAOUARI for digging up the fix. strings. Thanks to Hicham HAOUARI for digging up the fix.
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46.0-0.2.beta1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Feb 3 2011 Petr Machata <pmachata@redhat.com> - 1.46.0-0.1.beta1 * Thu Feb 3 2011 Petr Machata <pmachata@redhat.com> - 1.46.0-0.1.beta1
- Package 1.46.0-beta1 - Package 1.46.0-beta1
- Reintroduce the soname patch - Reintroduce the soname patch