packages: boost/boost.spec, boost/boost-gcc.patch (REMOVED), boost/boost-ti...

[arekm]

Author: arekm                        Date: Sun Jul 26 11:54:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.40.0 (snapshot, builds with our gcc 4.4 while stable releases don't)

---- Files affected:
packages/boost:
   boost.spec (1.118 -> 1.119) , boost-gcc.patch (1.1 -> NONE)  (REMOVED), boost-ticket-2499.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/boost/boost.spec
diff -u packages/boost/boost.spec:1.118 packages/boost/boost.spec:1.119
--- packages/boost/boost.spec:1.118	Sun Jun 28 13:41:20 2009
+++ packages/boost/boost.spec	Sun Jul 26 13:54:24 2009
@@ -8,19 +8,20 @@
 %bcond_without	python	# without boost-python support
 #
 %define		_fver	%(echo %{version} | tr . _)
+%define		snap	r55135
 Summary:	The Boost C++ Libraries
 Summary(pl.UTF-8):	Biblioteki C++ "Boost"
 Name:		boost
-Version:	1.39.0
-Release:	1
+Version:	1.40.0
+Release:	0.%{snap}.1
 License:	Boost Software License and others
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/boost/%{name}_%{_fver}.tar.bz2
-# Source0-md5:	a17281fd88c48e0d866e1a12deecbcc0
+# Source0:	http://dl.sourceforge.net/boost/%{name}_%{_fver}.tar.bz2
+# svn export http://svn.boost.org/svn/boost/branches/release boost
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	159bfecfc3fb706da99d741e121e2abc
 Patch0:		%{name}-climits.patch
 Patch1:		%{name}-link.patch
-Patch2:		%{name}-ticket-2499.patch
-Patch3:		%{name}-gcc.patch
 URL:		http://www.boost.org/
 BuildRequires:	boost-jam >= 3.1.12
 BuildRequires:	bzip2-devel
@@ -316,11 +317,10 @@
 Dokumentacja dla biblioteki Boost C++.
 
 %prep
-%setup -q -n %{name}_%{_fver}
+%setup -q -n %{name}
+#%%setup -q -n %{name}_%{_fver}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
 
 # - don't know how to pass it through (b)jam -s (no way?)
 #   due to oversophisticated build flags system.
@@ -372,13 +372,18 @@
 	[ -f "$f" ] || continue
 	f=$(basename "$f")
 	soname=$(basename "$f" | sed -e 's#-gcc..-mt-.*#.so#g')
-	ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
+	[ ! -f "$RPM_BUILD_ROOT%{_libdir}/$soname" ] && ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
+	rawsoname=$(basename "$f" | sed -e 's#\.so.*#.so#g')
+	[ ! -f "$RPM_BUILD_ROOT%{_libdir}/$rawsoname" ] && ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$rawsoname"
+
 done
 for f in $RPM_BUILD_ROOT%{_libdir}/*.a; do
 	[ -f "$f" ] || continue
 	f=$(basename "$f")
 	soname=$(basename "$f" | sed -e 's#-gcc..-mt-.*#.a#g')
-	ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
+	[ ! -f "$RPM_BUILD_ROOT%{_libdir}/$soname" ] && ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$soname"
+	rawsoname=$(basename "$f" | sed -e 's#\.so.*#.so#g')
+	[ ! -f "$RPM_BUILD_ROOT%{_libdir}/$rawsoname" ] && ln -s "$f" "$RPM_BUILD_ROOT%{_libdir}/$rawsoname"
 done
 
 # documentation
@@ -579,6 +584,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2009/07/26 11:54:24  arekm
+- up to 1.40.0 (snapshot, builds with our gcc 4.4 while stable releases don't)
+
 Revision 1.118  2009/06/28 11:41:20  arekm
 - some fixes from svn (still not everything required)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/boost/boost.spec?r1=1.118&r2=1.119&f=u