rpms/monotone/F-10 .cvsignore, 1.22, 1.23 import.log, 1.2, 1.3 monotone.spec, 1.41, 1.42 sources, 1.22, 1.23 monotone-0.42-gcc44.patch, 1.1, NONE monotone-0.42-netsync.patch, 1.1, NONE monotone-0.42-netsync2.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/monotone/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17507/F-10

Modified Files:
	.cvsignore import.log monotone.spec sources 
Removed Files:
	monotone-0.42-gcc44.patch monotone-0.42-netsync.patch 
	monotone-0.42-netsync2.patch 
Log Message:
Update to 0.43.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	3 Jan 2009 00:53:23 -0000	1.22
+++ .cvsignore	30 Mar 2009 15:05:23 -0000	1.23
@@ -1 +1 @@
-monotone-0.42.tar.gz
+monotone-0.43.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Mar 2009 21:48:20 -0000	1.2
+++ import.log	30 Mar 2009 15:05:23 -0000	1.3
@@ -1,2 +1,3 @@
 monotone-0_42-2_fc10:F-10:monotone-0.42-2.fc10.src.rpm:1230943967
 monotone-0_42-5_fc11:F-10:monotone-0.42-5.fc11.src.rpm:1236376035
+monotone-0_43-1_fc11:F-10:monotone-0.43-1.fc11.src.rpm:1238425471


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/monotone.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- monotone.spec	6 Mar 2009 21:48:20 -0000	1.41
+++ monotone.spec	30 Mar 2009 15:05:23 -0000	1.42
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.42
-Release: 5%{?dist}
+Version: 0.43
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,29 +12,15 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
-# rediffed changeset f18abebd.. from upstream
-Patch0: monotone-0.42-netsync.patch
-# rediffed changesets 33022690.. and 76e258cb.. from upstream
-Patch1: monotone-0.42-gcc44.patch
-# rediffed changeset 16184688.. from upstream
-Patch2: monotone-0.42-netsync2.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
 BuildRequires: boost-devel >= 1.33.1
-%if 1
-%define bundled_sqlite yes
-%else
-# In fact, monotone has a locally-hacked 3.2.7, so we can't replace it.
-BuildRequires: sqlite-devel >= 3.2.7
-%define bundled_sqlite no
-%endif
-# monotone has local hacks in lua 5.0.2 as well, sigh.
-%define bundled_lua 1
-%if %{bundled_lua} == 0
-BuildRequires: lua
-%endif
+BuildRequires: botan-devel >= 1.6.3
+BuildRequires: pcre-devel >= 7.4
+BuildRequires: sqlite-devel >= 3.3.8
+BuildRequires: lua-devel >= 5.1
+BuildRequires: libidn-devel
 
 # The test suite needs cvs.
 BuildRequires: cvs
@@ -78,9 +64,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
-%patch1 -p1 -b .netsync
-%patch2 -p1 -b .netsync2
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -208,6 +191,11 @@
 
 
 %changelog
+* Fri Mar 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.43-1
+- Update to 0.43.
+- Add BRs for libraries monotone doesn't bundle anylonger.
+- Drop patches applied upstream.
+
 * Fri Feb 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-5
 - Add one more netsync related patch from trunk.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	3 Jan 2009 00:53:23 -0000	1.22
+++ sources	30 Mar 2009 15:05:23 -0000	1.23
@@ -1 +1 @@
-c8e916d674b6608369d9f447700a8830  monotone-0.42.tar.gz
+a9e82b899ff7f676f620c450d6aff4cf  monotone-0.43.tar.gz


--- monotone-0.42-gcc44.patch DELETED ---


--- monotone-0.42-netsync.patch DELETED ---


--- monotone-0.42-netsync2.patch DELETED ---