rpms/subcommander/devel subcommander-2.0.0b3-gc43.patch, NONE, 1.1 subcommander-2.0.0b3-var.patch, NONE, 1.1 subcommander.spec, 1.10, 1.11
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Sun Jun 29 18:14:45 UTC 2008
Author: s4504kr
Update of /cvs/extras/rpms/subcommander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14796
Modified Files:
subcommander.spec
Added Files:
subcommander-2.0.0b3-gc43.patch subcommander-2.0.0b3-var.patch
Log Message:
New prerelease 2.0.0b3 of subcommander
subcommander-2.0.0b3-gc43.patch:
--- NEW FILE subcommander-2.0.0b3-gc43.patch ---
diff -up subcommander-2.0.0b3/util/Compare.cpp.org subcommander-2.0.0b3/util/Compare.cpp
--- subcommander-2.0.0b3/util/Compare.cpp.org 2008-06-25 19:29:18.000000000 +0200
+++ subcommander-2.0.0b3/util/Compare.cpp 2008-06-25 19:34:10.000000000 +0200
@@ -12,6 +12,7 @@
#include "String.h"
#include "svn/Path.h" // \todo circular dependency between util <-> svn
+#include <cstring>
int calcDepth( const sc::String& s )
{
diff -up subcommander-2.0.0b3/util/Stackframe.cpp.org subcommander-2.0.0b3/util/Stackframe.cpp
--- subcommander-2.0.0b3/util/Stackframe.cpp.org 2008-06-25 19:34:33.000000000 +0200
+++ subcommander-2.0.0b3/util/Stackframe.cpp 2008-06-25 19:35:06.000000000 +0200
@@ -10,7 +10,7 @@
// sc
#include "Stackframe.h"
-
+#include <cstring>
Variable::Variable(VariableType type, sc::Size size)
subcommander-2.0.0b3-var.patch:
--- NEW FILE subcommander-2.0.0b3-var.patch ---
--- 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;
Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- subcommander.spec 22 Apr 2008 15:35:32 -0000 1.10
+++ subcommander.spec 29 Jun 2008 18:14:01 -0000 1.11
@@ -1,18 +1,22 @@
+%define subvers 2.0.0b3
+
Name: subcommander
-Version: 1.2.3
+Version: 1.9.93
Release: 1%{?dist}
Summary: Graphical UI for subversion
Group: Development/Tools
License: GPLv2+
URL: http://subcommander.tigris.org
-Source0: http://subcommander.tigris.org/files/documents/1759/42385/Subcommander-%{version}.tar.gz
+Source0: http://subcommander.tigris.org/files/documents/1759/43043/Subcommander-%{subvers}.tar.gz
Source1: subcommander.desktop
Source2: submerge.desktop
+Patch1: subcommander-2.0.0b3-gc43.patch
+Patch2: subcommander-2.0.0b3-var.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: subversion-devel >= 1.2.0
-BuildRequires: qt3-devel >= 3.3
+BuildRequires: qt-devel >= 4.3
buildRequires: desktop-file-utils
BuildRequires: apr-devel
BuildRequires: zlib-devel
@@ -29,11 +33,12 @@
is called submerge.
%prep
-%setup -q
+%setup -q -n %{name}-%{subvers}
+%patch1 -p1
+%patch2 -p0
%build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure
+%configure -with-qt=%{_libdir}/qt4
make %{?_smp_mflags}
%install
@@ -68,6 +73,9 @@
%doc README CHANGES COPYING
%changelog
+* Sun Jun 29 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.9.93-1
+- New prerelease 2.0.0b3 of subcommander
+
* Sun Apr 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.2.4-1
- New upstream release
More information about the scm-commits
mailing list