Attachment 151940 Details for Bug 225622 – spec file diff implementing merge review proposals

[patch] spec file diff implementing merge review proposals

boost-spec.diff (text/plain), 6.55 KB, created by Patrice Dumas on 2007-04-08 21:00:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-04-08 21:00:57 UTC

Size: 6.55 KB

patch

obsolete

>? boost-1.33.1-10.src.rpm
>? boost-1.33.1-13.fc7.src.rpm
>? boost-1.33.1-14.fc7.src.rpm
>? boost-cxxflags.patch
>? boost-pat.log
>? boost.out
>? boost_1_33_1
>? boost_1_33_1-orig
>? boost_1_33_1.tar.bz2-orig
>? i386
>Index: boost.spec
>===================================================================
>RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
>retrieving revision 1.34
>diff -u -3 -p -r1.34 boost.spec
>--- boost.spec	2 Apr 2007 14:42:09 -0000	1.34
>+++ boost.spec	8 Apr 2007 20:59:46 -0000
>@@ -1,33 +1,35 @@
>+%bcond_with tests
>+
> Name: boost
> Summary: The Boost C++ Libraries
> Version: 1.33.1
>-Release: 13%{?dist}
>+Release: 14%{?dist}
> License: Boost Software License (GPL-Compatible, Free Software License)
> URL: http://www.boost.org/
> Group: System Environment/Libraries
>-Source: %{name}_1_33_1.tar.bz2
>-#Source: http://downloads.sourceforge.net/boost/boost_1_33_1.tar.bz2
>-Provides: boost-python = %{version}-%{release}
>+#Source: %{name}_1_33_1.tar.bz2
>+Source: http://downloads.sourceforge.net/boost/%{name}_1_33_1.tar.bz2
> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> BuildRequires: libstdc++-devel
>-BuildRequires: bzip2-libs
> BuildRequires: bzip2-devel
>-BuildRequires: zlib
> BuildRequires: zlib-devel
>-BuildRequires: python
> BuildRequires: python-devel
>-BuildRequires: libicu
> BuildRequires: libicu-devel
> Patch0: boost-base.patch
>-Patch1: boost-gcc-tools.patch
>+#Patch1: boost-gcc-tools.patch
> Patch2: boost-thread.patch
> Patch3: boost-config-compiler-gcc.patch
> Patch4: boost-runtests.patch
> Patch5: boost-serialization-warnings.patch
> Patch6: boost-spirit-warnings.patch
> Patch7: boost-bind-gcc41.patch
>-Patch8: boost-cxxflags-debug.patch
>+#Patch8: boost-cxxflags-debug.patch
>+Patch8: boost-cxxflags.patch
> Patch9: boost-python-vs-x86-64.patch
>+Obsoletes: boost-doc <= 1.30.2
>+Obsoletes: boost-python <= 1.30.2
>+Provides: boost-python = %{version}-%{release}
>+Provides: boost-doc = %{version}-%{release}
> 
> %description
> Boost provides free peer-reviewed portable C++ source libraries.  The
>@@ -47,13 +49,12 @@ Provides: boost-python-devel = %{version
> %description devel
> Headers and shared object symlinks for the Boost C++ libraries.
> 
>-%package devel-static
>+%package static-devel
> Summary: The Boost C++ static development libraries
> Group: Development/Libraries
>-Requires: boost = %{version}-%{release}
>-Provides: boost-python-devel = %{version}-%{release}
>+Requires: boost-devel = %{version}-%{release}
> 
>-%description devel-static
>+%description static-devel
> Static libraries for the Boost C++ libraries.
> 
> %package doc
>@@ -65,18 +66,16 @@ Provides: boost-python-docs = %{version}
> HTML documentation files for Boost C++ libraries.
> 
> %prep
>-rm -rf %{buildroot}
>-
> %setup -q -n %{name}_1_33_1
> %patch0 -p0
>-%patch1 -p0
>+#%patch1 -p0
> %patch2 -p0
> %patch3 -p0
> %patch4 -p0
> %patch5 -p0
> %patch6 -p0
> %patch7 -p0
>-%patch8 -p0
>+%patch8 -p1 -b .cxxflags
> %patch9 -p0
> 
> %build
>@@ -87,13 +86,15 @@ rm -rf %{buildroot}
> BJAM=`find tools/build/jam_src/ -name bjam -a -type f`
> #BUILD_FLAGS="-sTOOLS=gcc -sBUILD=release <dllversion>1"
> #BUILD_FLAGS="-sTOOLS=gcc -sBUILD=release"
>-BUILD_FLAGS="-d2 -sTOOLS=gcc -sBUILD=release"
>+BUILD_FLAGS='-d2 -sTOOLS=gcc'
> PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
> PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
> REGEX_FLAGS="-sHAVE_ICU=1"
>-$BJAM $PYTHON_FLAGS $REGEX_FLAGS $BUILD_FLAGS stage 
>+export GXX="%__cxx $RPM_OPT_FLAGS"
>+$BJAM $PYTHON_FLAGS $REGEX_FLAGS $BUILD_FLAGS -sBUILD="release <sonameversion>2 <debug-symbols>on <optimization>no <inlining>no" stage 
> 
> %check
>+%if %{with tests}
> BOOST_ROOT=`pwd`;
> cd tools/regression;
> (cd ./build && $BOOST_ROOT/$BJAM)
>@@ -102,10 +103,10 @@ echo "" >>  regression_comment.html;
> echo "<p>" `g++ --version` "</p>" >> regression_comment.html;
> chmod +x ./run_tests.sh;
> #uncomment next line to run tests: warning, takes a long time
>-#./run_tests.sh;
>+./run_tests.sh;
> results1=$BOOST_ROOT/status/results.html
> results2=$BOOST_ROOT/status/results-links.html
>-if [ -f $results2 ] && [ -f $results2 ]; then
>+if [ -f $results1 ] && [ -f $results2 ]; then
>   testdate=`date +%Y%m%d`;
>   testarch=`uname -m`;
>   email=bkoz@redhat.com
>@@ -113,13 +114,16 @@ if [ -f $results2 ] && [ -f $results2 ];
>   mail -s "$testdate boost regression $testarch 2" $email < $results2;
> fi
> cd ../..;
>-
>+%endif
> 
> %install
>+rm -rf $RPM_BUILD_ROOT
> mkdir -p $RPM_BUILD_ROOT%{_libdir}
> mkdir -p $RPM_BUILD_ROOT%{_includedir}
> mkdir -p $RPM_BUILD_ROOT%{_docdir}/boost-%{version}
> 
>+# jam doesn't work well for staged builds, doesn't understand prefix
>+# and doesn't get the permissions correctly
> # install lib
> for i in `find stage -type f -name \*.a`; do
>   NAME=`basename $i`;
>@@ -155,14 +159,15 @@ for i in `find . -type f`; do
> done
> cd ../..;
> 
>+# remove scripts used to generate include files 
>+find $RPM_BUILD_ROOT%{_includedir}/ $ -name '*.pl' -o -name '*.sh' $ -exec rm {} \;
>+
> %clean
>-rm -rf %{buildroot}
>+rm -rf $RPM_BUILD_ROOT
> 
>-%post 
>-/sbin/ldconfig
>+%post -p /sbin/ldconfig
> 
>-%postun
>-/sbin/ldconfig
>+%postun -p /sbin/ldconfig
> 
> %files 
> %defattr(-, root, root, -)
>@@ -174,7 +179,7 @@ rm -rf %{buildroot}
> %{_includedir}/boost
> %{_libdir}/*.so
> 
>-%files devel-static
>+%files static-devel
> %defattr(-, root, root, -)
> %{_libdir}/*.a
> 
>@@ -183,6 +188,14 @@ rm -rf %{buildroot}
> %doc %{_docdir}/boost-%{version}
> 
> %changelog
>+* Sun Apr  8 2007 Patrice Dumas <pertusus@free.fr> 1.33.1-14
>+- readd Obsoletes
>+- use RPM_OPT_FLAGS
>+- don't BuildRequires non -devel packages
>+- conditionalize the tests
>+- use Source url
>+- fixes for rpmlint
>+
> * Mon Apr 02 2007 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-13
> - (#225622: Merge Review: boost)
>   Change static to devel-static.
>@@ -199,19 +212,19 @@ rm -rf %{buildroot}
>   Clarified BSL as GPL-Compatible, Free Software License.
>   Remove Obsoletes.
>   Add Provides boost-python.
>-  Remove mkdir -p $RPM_BUILD_ROOT%{_docdir}
>+  Remove mkdir -p $RPM_BUILD_ROOT%%{_docdir}
>   Added periods for decription text. 
>   Fix Group field.
>   Remove doc Requires boost.
>   Preserve timestamps on install.
>-  Use %defattr(-, root, root, -)
>+  Use %%defattr(-, root, root, -)
>   Added static package for .a libs.
>   Install static libs with 0644 permissions.
>-  Use %doc for doc files.
>+  Use %%doc for doc files.
> 
> * Thu Nov 23 2006 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-10
>-- (#182414: boost: put tests in %check section) via Rex Dieter
>-- Fix EVR with %{?dist} tag via Gianluca Sforna
>+- (#182414: boost: put tests in %%check section) via Rex Dieter
>+- Fix EVR with %%{?dist} tag via Gianluca Sforna
> 
> * Wed Nov 15 2006 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-9
> - (#154784: boost-debuginfo package is empty)

Actions: View | Diff

Attachments on bug 225622: 151940 | 151941 | 153190 | 255181 | 255781