rpms/monotone/devel monotone-0.24-gcc41.patch, NONE, 1.1 monotone.spec, 1.7, 1.8

[Roland McGrath (roland)]

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25666

Modified Files:
	monotone.spec 
Added Files:
	monotone-0.24-gcc41.patch 
Log Message:
Patched to work with gcc 4.1.

monotone-0.24-gcc41.patch:

--- NEW FILE monotone-0.24-gcc41.patch ---
2005-12-17  Roland McGrath  <roland at redhat.com>

	* work.hh (struct file_itemizer): Remove extraneous qualifier on
	visit_file declaration.
	* app_state.hh (class app_state): Remove extraneous qualifier on
	set_restriction declaration.

--- monotone-0.24/app_state.hh
+++ monotone-0.24/app_state.hh
@@ -88,9 +88,9 @@ public:
   void require_working_copy(std::string const & explanation = "");
   void create_working_copy(system_path const & dir);
 
-  void app_state::set_restriction(path_set const & valid_paths, 
-                             std::vector<utf8> const & paths,
-                             bool respect_ignore = true);
+  void set_restriction(path_set const & valid_paths,
+		       std::vector<utf8> const & paths,
+		       bool respect_ignore = true);
   bool restriction_includes(file_path const & path);
 
   // Set the branch name.  If you only invoke set_branch, the branch
--- monotone-0.24/work.hh
+++ monotone-0.24/work.hh
@@ -56,7 +56,7 @@ struct file_itemizer : public tree_walke
   path_set & ignored;
   file_itemizer(app_state & a, path_set & k, path_set & u, path_set & i) 
     : app(a), known(k), unknown(u), ignored(i) {}
-  virtual void file_itemizer::visit_file(file_path const & path);
+  virtual void visit_file(file_path const & path);
 };
 
 void 


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- monotone.spec	13 Dec 2005 07:35:07 -0000	1.7
+++ monotone.spec	18 Dec 2005 06:15:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-0.24-gcc41.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Sat Dec 17 2005 Roland McGrath <roland at redhat.com> - 0.24-2
+- Patched to work with gcc 4.1.
+
 * Sun Dec 11 2005 Roland McGrath <roland at redhat.com> - 0.24-1
 - Updated for 0.24 release.