diff --git a/boost-visit_each.diff b/boost-visit_each.diff deleted file mode 100644 index 85c9d85..0000000 --- a/boost-visit_each.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- boost/visit_each.hpp -+++ boost/visit_each.hpp -@@ -22,7 +22,7 @@ - template - inline void visit_each(Visitor& visitor, const T& t) - { -- visit_each(visitor, t, 0); -+ visit_each(visitor, t, (long)0); - } - } - diff --git a/boost.changes b/boost.changes index 25d0ca0..494bb1f 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 6 20:35:26 UTC 2011 - aj@suse.de + +- Do not package NEWS and LICENSE twice. + +------------------------------------------------------------------- +Fri Nov 25 01:14:22 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- +Thu Nov 24 10:50:27 UTC 2011 - nadvornik@suse.com + +- dropped visit_each patch (bnc#714373) + ------------------------------------------------------------------- Mon Oct 3 12:17:41 CEST 2011 - dmueller@suse.de diff --git a/boost.spec b/boost.spec index 0d7c658..9ad37fa 100644 --- a/boost.spec +++ b/boost.spec @@ -15,9 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define ver 1.46.1 +Version: 1.46.1 +Release: 5 %define file_version 1_46_1 %define short_version 1_46 %define lib_appendix 1_46_1 @@ -77,8 +77,6 @@ License: BSD3c Group: Development/Libraries/C and C++ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: %{ver} -Release: 5 Source0: %{name}_%{file_version}.tar.xz Source1: boost-rpmlintrc Source2: %{name}_%{short_version}_man.tar.xz @@ -87,7 +85,6 @@ Source4: existing_extra_docs Source5: NEWS Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch -Patch4: boost-visit_each.diff Patch8: boost-no_segfault_in_Regex_filter.patch Patch9: boost-fix-spirit-attr-handling.patch Patch19: boost-sane_versioning.patch @@ -119,11 +116,9 @@ see the boost-doc package. %package devel -License: BSD3c Summary: Development package for Boost C++ Group: Development/Libraries/C and C++ Requires: %{all_libs} libstdc++-devel -AutoReqProv: on %description devel This package contains all that is needed to develop/compile @@ -133,11 +128,8 @@ the documentation packages (html, man or pdf). %package -n boost-license%{lib_appendix} - -License: BSD3c Summary: Boost License Group: Development/Libraries/C and C++ -AutoReqProv: on Provides: boost-license = %{version}-%{release} Obsoletes: boost-license < %{version} %if 0%{?suse_version} >= 1120 @@ -150,10 +142,9 @@ This package contains the license boost is provided under. %package doc-html -License: BSD3c Summary: HTML documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ -AutoReqProv: on +Requires: boost-license%{lib_appendix} %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -165,10 +156,8 @@ in HTML format. %package doc-man -License: BSD3c Summary: Man documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -181,10 +170,8 @@ as man pages. %if %build_pdf %package doc-pdf -License: BSD3c Summary: PDF documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -195,12 +182,9 @@ in PDF format. %endif %package -n libboost_date_time%{lib_appendix} - -License: BSD3c Summary: Boost::Date.Time Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_date_time%{lib_appendix} This package contains the Boost Date.Time runtime libraries. @@ -208,12 +192,9 @@ This package contains the Boost Date.Time runtime libraries. %package -n libboost_filesystem%{lib_appendix} - -License: BSD3c Summary: Boost::Filesystem Runtime Libraries Group: System/Localization Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_filesystem%{lib_appendix} This package contains the Boost::Filesystem libraries. @@ -221,12 +202,9 @@ This package contains the Boost::Filesystem libraries. %package -n libboost_graph%{lib_appendix} - -License: BSD3c Summary: Boost::Graph Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_graph%{lib_appendix} This package contains the Boost::Graph Runtime libraries. @@ -234,12 +212,9 @@ This package contains the Boost::Graph Runtime libraries. %package -n libboost_iostreams%{lib_appendix} - -License: BSD3c Summary: Boost::IOStreams Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_iostreams%{lib_appendix} This package contains the Boost::IOStreams Runtime libraries. @@ -247,12 +222,9 @@ This package contains the Boost::IOStreams Runtime libraries. %package -n libboost_math%{lib_appendix} - -License: BSD3c Summary: Boost::Math Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_math%{lib_appendix} This package contains the Boost::Math Runtime libraries. @@ -261,12 +233,9 @@ This package contains the Boost::Math Runtime libraries. %if %build_mpi %package -n libboost_mpi%{lib_appendix} - -License: BSD3c Summary: Boost::MPI Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_mpi%{lib_appendix} This package contains the Boost::MPI Runtime libraries. @@ -274,12 +243,9 @@ This package contains the Boost::MPI Runtime libraries. %endif %package -n libboost_test%{lib_appendix} - -License: BSD3c Summary: Boost::Test Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_test%{lib_appendix} This package contains the Boost::Test runtime libraries. @@ -287,12 +253,9 @@ This package contains the Boost::Test runtime libraries. %package -n libboost_program_options%{lib_appendix} - -License: BSD3c Summary: Boost::ProgramOptions Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_program_options%{lib_appendix} This package contains the Boost::ProgramOptions Runtime libraries. @@ -300,12 +263,9 @@ This package contains the Boost::ProgramOptions Runtime libraries. %package -n libboost_python%{lib_appendix} - -License: BSD3c Summary: Boost::Python Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_python%{lib_appendix} This package contains the Boost::Python Runtime libraries. @@ -313,12 +273,9 @@ This package contains the Boost::Python Runtime libraries. %package -n libboost_serialization%{lib_appendix} - -License: BSD3c Summary: Boost::Serialization Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_serialization%{lib_appendix} This package contains the Boost::Serialization Runtime libraries. @@ -326,12 +283,9 @@ This package contains the Boost::Serialization Runtime libraries. %package -n libboost_signals%{lib_appendix} - -License: BSD3c Summary: Boost::Signals Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_signals%{lib_appendix} This package contains the Boost::Signals Runtime libraries. @@ -339,12 +293,9 @@ This package contains the Boost::Signals Runtime libraries. %package -n libboost_system%{lib_appendix} - -License: BSD3c Summary: Boost::System Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_system%{lib_appendix} This package contains the Boost::System runtime libraries. @@ -352,12 +303,9 @@ This package contains the Boost::System runtime libraries. %package -n libboost_thread%{lib_appendix} - -License: BSD3c Summary: Boost::Thread Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_thread%{lib_appendix} This package contains the Boost::Thread runtime libraries. @@ -365,12 +313,9 @@ This package contains the Boost::Thread runtime libraries. %package -n libboost_wave%{lib_appendix} - -License: BSD3c Summary: Boost::Wave Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_wave%{lib_appendix} This package contains the Boost::Wave runtime libraries. @@ -378,23 +323,17 @@ This package contains the Boost::Wave runtime libraries. %package -n libboost_regex%{lib_appendix} - -License: BSD3c Summary: The Boost::Regex runtime library Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_regex%{lib_appendix} This package contains the Boost::Regex runtime library. %package -n libboost_random%{lib_appendix} - -License: BSD3c Summary: The Boost::Random runtime library Group: System/Libraries Requires: boost-license%{lib_appendix} -AutoReqProv: on %description -n libboost_random%{lib_appendix} This package contains the Boost:Random runtime library. @@ -411,7 +350,6 @@ This package contains the Boost:Random runtime library. find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + %patch1 %patch2 -%patch4 %patch8 %patch9 %patch19 @@ -493,7 +431,7 @@ cd doc %endif %install -# Now build it +# Now install it J_P=%{jobs} J_G=$(getconf _NPROCESSORS_ONLN) [ $J_G -gt 64 ] && J_G=64 @@ -529,7 +467,7 @@ source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh --exec-prefix=$%{buildroot}%{_prefix} \ --libdir=%{buildroot}%{_libdir} \ --includedir=%{buildroot}%{_includedir} \ - install || echo "Not all Boost libraries built properly." + install || echo "Not all Boost libraries installed properly." mkdir -p %{buildroot}%{_docdir} @@ -742,6 +680,9 @@ rm -f %{buildroot}%{_libdir}/*.a %defattr(-, root, root, -) %doc %{_docdir}/* %exclude %{_docdir}/pdf +# part of license package +%exclude %doc %{_docdir}/NEWS +%exclude %doc %{_docdir}/LICENSE_1_0.txt %files doc-man %defattr(644, root, root, -)