rpms/schroot/devel schroot-configure-boost-variables-map.patch, NONE, 1.1 schroot.spec, 1.10, 1.11

Zach Carter zachcarter at fedoraproject.org
Mon Jul 19 16:41:17 UTC 2010


Author: zachcarter

Update of /cvs/pkgs/rpms/schroot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30905

Modified Files:
	schroot.spec 
Added Files:
	schroot-configure-boost-variables-map.patch 
Log Message:


schroot-configure-boost-variables-map.patch:
 configure    |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE schroot-configure-boost-variables-map.patch ---
--- configure.orig	2010-07-19 09:35:21.000000000 -0700
+++ configure	2010-07-19 09:36:00.000000000 -0700
@@ -18238,7 +18238,7 @@
 int
 main ()
 {
-boost::program_options::variables_map::variables_map dummy()
+boost::program_options::variables_map dummy()
   ;
   return 0;
 }
@@ -18255,7 +18255,7 @@
 int
 main ()
 {
-boost::program_options::variables_map::variables_map dummy()
+boost::program_options::variables_map dummy()
   ;
   return 0;
 }
--- configure.ac.orig	2010-07-19 09:35:28.000000000 -0700
+++ configure.ac	2010-07-19 09:36:16.000000000 -0700
@@ -529,7 +529,7 @@
 saved_LIBS="${LIBS}"
 LIBS="${saved_LIBS} -lboost_program_options"
 define([testprog], [AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
-                                   [boost::program_options::variables_map::variables_map dummy()])])
+                                   [boost::program_options::variables_map dummy()])])
 AC_LINK_IFELSE(testprog,
                [AC_MSG_RESULT([yes])
 	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options"],


Index: schroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroot/devel/schroot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- schroot.spec	16 Jul 2010 16:40:12 -0000	1.10
+++ schroot.spec	19 Jul 2010 16:41:17 -0000	1.11
@@ -8,6 +8,7 @@ Url: http://packages.debian.org/schroot
 Source0: http://ftp.de.debian.org/debian/pool/main/s/schroot/%{name}_%{version}.orig.tar.gz
 Patch0: schroot-pam.patch
 Patch1: schroot-default-config-path.patch
+Patch2: schroot-configure-boost-variables-map.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
 BuildRequires: boost-devel
@@ -56,6 +57,7 @@ functionality is available in the next g
 
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 



More information about the scm-commits mailing list