- added patch monotone-boost_path.patch

- added patch monotone-cmd_list.patch
- rel 2

Changed files:
    monotone-boost_path.patch -> 1.1
    monotone-cmd_list.patch -> 1.1
    monotone.spec -> 1.25

diff --git a/monotone-boost_path.patch b/monotone-boost_path.patch
new file mode 100644 (file)
index 0000000..2524f57
--- /dev/null
+++ b/monotone-boost_path.patch
@@ -0,0 +1,15 @@
+diff -urN monotone-0.30.orig/m4/boost.m4 monotone-0.30/m4/boost.m4
+--- monotone-0.30.orig/m4/boost.m4     2006-09-17 11:56:56.000000000 +0200
++++ monotone-0.30/m4/boost.m4  2006-09-29 12:15:51.000000000 +0200
+@@ -57,9 +57,9 @@
+ [AC_ARG_VAR([BOOST_SUFFIX],
+             [Space-separated list of suffixes to try appending to the names
+            of Boost libraries.  "none" means no suffix. The default is:
+-           "none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt-s"])
++           "none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt -gcc-mt-s"])
+ if test x"$BOOST_SUFFIX" = x; then
+-  BOOST_SUFFIX="none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt-s"
++  BOOST_SUFFIX="none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt -gcc-mt-s"
+ fi
+ ])
+ 

diff --git a/monotone-cmd_list.patch b/monotone-cmd_list.patch
new file mode 100644 (file)
index 0000000..a5bce78
--- /dev/null
+++ b/monotone-cmd_list.patch
@@ -0,0 +1,12 @@
+diff -urN monotone-0.30.orig/cmd.hh monotone-0.30/cmd.hh
+--- monotone-0.30.orig/cmd.hh  2006-09-17 11:56:51.000000000 +0200
++++ monotone-0.30/cmd.hh       2006-10-05 11:20:13.000000000 +0200
+@@ -207,7 +207,7 @@
+ }                                                                    \
+ std::string commands::cmd_ ## C::desc()                              \
+ {                                                                    \
+-  std:string result = _(desc_.c_str());                              \
++  std::string result = _(desc_.c_str());                              \
+   result += "\n";                                                    \
+   result += (F("Alias for %s") % #realcommand).str();                \
+   return result;                                                     \

diff --git a/monotone.spec b/monotone.spec
index f56817e71f878262bf7d2a87f572160b3900171a..ca31ca5f583786410e80e635a3a5998fe1be9c6f 100644 (file)
--- a/monotone.spec
+++ b/monotone.spec
@@ -6,11 +6,13 @@ Summary:      A free distributed version control system
 Summary(pl):   Wolnodostêpny rozproszony system kontroli wersji
 Name:          monotone
 Version:       0.30
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Development/Version Control
 Source0:       http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 # Source0-md5: 94a1f8369162f7a7df8596b365a1d846
+Patch0:                %{name}-boost_path.patch
+Patch1:                %{name}-cmd_list.patch
 URL:           http://www.venge.net/monotone/
 BuildRequires: boost-bind-devel
 BuildRequires: boost-date_time-devel
@@ -48,8 +50,13 @@ jest licencjonowany na GNU GPL.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 CPPFLAGS="-I%{_includedir}/lua50"; export CPPFLAGS
 %configure \
        --enable-ipv6