rpms/subcommander/devel subcommander-2.0.0b3-var.patch, 1.1, 1.2 subcommander.spec, 1.13, 1.14

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	subcommander-2.0.0b3-var.patch subcommander.spec 
Log Message:
some more fixes for svn-1.5

subcommander-2.0.0b3-var.patch:

Index: subcommander-2.0.0b3-var.patch
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander-2.0.0b3-var.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subcommander-2.0.0b3-var.patch	29 Jun 2008 18:14:01 -0000	1.1
+++ subcommander-2.0.0b3-var.patch	13 Jul 2008 20:22:01 -0000	1.2
@@ -1,56 +1,52 @@
---- util/Stackframe.h	(revision 2124)
-+++ util/Stackframe.h	(working copy)
-@@ -19,6 +19,7 @@
- // sys
- #include <vector>
- 
-+#if 0
- enum VariableKind
- {
-   vkNone,
-@@ -53,8 +54,8 @@
- 
- typedef std::vector<Variable> Parameters;
- typedef std::vector<Variable> Locals;
-+#endif
- 
--
- class Stackframe
- {
- public:
-@@ -79,8 +80,8 @@
-   long         _lineNr;
-   long         _lineDisp;
- 
--  Parameters   _params;
--  Locals       _locals;
-+  //Parameters   _params;
-+  //Locals       _locals;
- };
- 
- typedef std::vector<Stackframe>  Stackframes;
-Index: util/Stackframe.cpp
-===================================================================
---- util/Stackframe.cpp	(revision 2124)
-+++ util/Stackframe.cpp	(working copy)
-@@ -12,7 +12,7 @@
- 
- 
- 
--
-+#if 0
- Variable::Variable(VariableType type, sc::Size size)
- : _type(type), _size(size)
- {
-@@ -48,10 +48,10 @@
- {
-   return *(int*)_value;
- }
-+#endif
- 
- 
- 
--
- Stackframe::Stackframe()
- {
-   _error      = false;
\ No newline at end of file
+diff -up subcommander-2.0.0b3/util/Stackframe.cpp.var subcommander-2.0.0b3/util/Stackframe.cpp
+--- subcommander-2.0.0b3/util/Stackframe.cpp.var	2008-07-13 20:10:13.000000000 +0200
++++ subcommander-2.0.0b3/util/Stackframe.cpp	2008-07-13 20:10:13.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ #include <cstring>
+ 
+-
++#if 0
+ Variable::Variable(VariableType type, sc::Size size)
+ : _type(type), _size(size)
+ {
+@@ -48,7 +48,7 @@ Variable::operator int() const
+ {
+   return *(int*)_value;
+ }
+-
++#endif
+ 
+ 
+ 
+diff -up subcommander-2.0.0b3/util/Stackframe.h.var subcommander-2.0.0b3/util/Stackframe.h
+--- subcommander-2.0.0b3/util/Stackframe.h.var	2008-05-11 17:30:02.000000000 +0200
++++ subcommander-2.0.0b3/util/Stackframe.h	2008-07-13 20:10:13.000000000 +0200
+@@ -19,6 +19,7 @@
+ // sys
+ #include <vector>
+ 
++#if 0
+ enum VariableKind
+ {
+   vkNone,
+@@ -53,7 +54,7 @@ public:
+ 
+ typedef std::vector<Variable> Parameters;
+ typedef std::vector<Variable> Locals;
+-
++#endif
+ 
+ class Stackframe
+ {
+@@ -79,8 +80,8 @@ public:
+   long         _lineNr;
+   long         _lineDisp;
+ 
+-  Parameters   _params;
+-  Locals       _locals;
++  //Parameters   _params;
++  //Locals       _locals;
+ };
+ 
+ typedef std::vector<Stackframe>  Stackframes;


Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- subcommander.spec	13 Jul 2008 17:56:31 -0000	1.13
+++ subcommander.spec	13 Jul 2008 20:22:01 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		subcommander
 Version:	1.9.93
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -13,12 +13,15 @@
 Source2:	submerge.desktop
 Patch1:		subcommander-2.0.0b3-gc43.patch
 Patch2:		subcommander-2.0.0b3-var.patch
+Patch3:		subcommander-2.0.0b3-svn15.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  automake
+BuildRequires:	autoconf
 BuildRequires:	subversion-devel >= 1.2.0
 BuildRequires:	qt-devel >= 4.3 
 buildRequires:	desktop-file-utils
-BuildRequires:	apr-devel
+BuildRequires:	apr-devel, apr-util-devel
 BuildRequires:	zlib-devel
 BuildRequires:	boost-devel
 BuildRequires:	neon-devel
@@ -35,9 +38,13 @@
 %prep
 %setup -q -n %{name}-%{subvers}
 %patch1 -p1 
-%patch2 -p0
+%patch2 -p1
+%patch3 -p1 -b .svn15
 
 %build
+aclocal
+automake --foreign
+autoconf
 %configure  -with-qt=%{_libdir}/qt4
 make %{?_smp_mflags}
 
@@ -73,6 +80,9 @@
 %doc README CHANGES COPYING
 
 %changelog
+* Sun Jul 13 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.9.93-4
+- Some more fixes for svn-1.5
+
 * Sun Jul 13 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.9.93-3
 - Rebuild agains new libsvn_ra_dav (#455002)