rpms/crossvc/devel crossvc-1.5.2-nocreate.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 crossvc.spec, 1.4, 1.5 sources, 1.3, 1.4 crossvc-1.5.1-nocreate.patch, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Jul 9 17:02:44 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17386
Modified Files:
.cvsignore crossvc.spec sources
Added Files:
crossvc-1.5.2-nocreate.patch
Removed Files:
crossvc-1.5.1-nocreate.patch
Log Message:
Prerelease of CrossVC-1.5.2
crossvc-1.5.2-nocreate.patch:
--- NEW FILE crossvc-1.5.2-nocreate.patch ---
--- CrossVC/src/ImportDialog.ui.nocreate 2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialog.ui 2007-07-09 18:36:48.000000000 +0200
@@ -657,17 +657,6 @@ enter the appropriate value or leave thi
<property name="spacing">
<number>2</number>
</property>
- <widget class="QCheckBox" row="1" column="0">
- <property name="name">
- <cstring>m_CreateDirs</cstring>
- </property>
- <property name="text">
- <string>Create CVS directories while importing (needs CVSNT)</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Activate this option if you want to convert your import folder into a working copy while importing.<br>Please note that this option is only available if <b>CVSNT</b> is used on both client and server!</string>
- </property>
- </widget>
<widget class="QCheckBox" row="0" column="0">
<property name="name">
<cstring>m_KeepFTime</cstring>
--- CrossVC/src/Import.cpp.nocreate 2007-01-20 22:55:21.000000000 +0100
+++ CrossVC/src/Import.cpp 2007-07-09 18:36:48.000000000 +0200
@@ -124,7 +124,6 @@ Import::Import(const QIconSet &whatsThis
m_parent(parent),
m_workBench(workBench),
m_dir(dir),
- m_bCreateCvsDirs(false),
m_sshAccess(NOSSH),
m_dlg(NULL),
m_mode(mode)
@@ -171,7 +170,6 @@ void Import::acceptCvs() {
int rshMode = dlg->rshMode();
m_sshAccess = dlg->getSshPreset();
bool keepFTime = dlg->getKeepFTime();
- m_bCreateCvsDirs = dlg->getCreateDirs();
QStringList ignoreWildcards = dlg->getIgnoreWildcards();
QStringList binaryWildcards = dlg->getBinaryWildcards();
@@ -236,9 +234,7 @@ void Import::acceptCvs() {
files += " import ";
if (keepFTime) files += "-d ";
- if (m_bCreateCvsDirs) files += "-C ";
-
-
+
//ignore files:
QString sIgnore = "-I ! ";
if (!ignoreWildcards.empty()) {
--- CrossVC/src/ImportDialogImpl.cpp.nocreate 2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialogImpl.cpp 2007-07-09 18:40:04.000000000 +0200
@@ -232,11 +232,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
m_binaryList = BINARYFILESPECLIST;
- if (CVSVERSION != "cvsnt") {
- m_CreateDirs->setEnabled(false);
- m_CreateDirs->setChecked(false);
- }
-
if (!m_defaultProfile->isEmpty()) {
setDefaultProfile(*m_defaultProfile);
}
@@ -696,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
return m_KeepFTime->isChecked();
}
-bool ImportDialogImpl::getCreateDirs() {
- return m_CreateDirs->isChecked();
-}
-
void ImportDialogImpl::getAndSetModule() {
m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
m_ModuleBrowser = NULL;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 26 Feb 2007 20:20:02 -0000 1.3
+++ .cvsignore 9 Jul 2007 17:02:05 -0000 1.4
@@ -1 +1 @@
-crossvc-1.5.1-0-generic-src.tgz
+crossvc-1.5.2pre.tgz
Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- crossvc.spec 28 Jun 2007 18:27:00 -0000 1.4
+++ crossvc.spec 9 Jul 2007 17:02:05 -0000 1.5
@@ -1,15 +1,19 @@
Name: crossvc
-Version: 1.5.1
-Release: 3%{?dist}
+Version: 1.5.2
+Release: 0.1%{?dist}
Summary: Graphical CVS Client
Group: Development/Tools
License: GPL
URL: http://www.lincvs.org
-Source0: http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
+# This is a prerelease of crossvc-1.5.2 which I have got
+# from upstream via mail. This should contains a workaroud
+# for a bug in qt-3.3.8
+source0: crossvc-1.5.2pre.tgz
+#Source0: http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
Source1: crossvc.desktop
-Patch1: crossvc-1.5.1-nocreate.patch
+Patch1: crossvc-1.5.2-nocreate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,6 +88,9 @@
%changelog
+* Mon Jul 9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-0.1
+- Prerelease of CrossVC-1.5.2 (Fix #246024)
+
* Thu Jun 28 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-3
- Disable 'Create Dir' Checkbox in ImportDialog
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 26 Feb 2007 20:20:02 -0000 1.3
+++ sources 9 Jul 2007 17:02:05 -0000 1.4
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4 crossvc-1.5.1-0-generic-src.tgz
+9914bbf275a53dd5da60c8b7e20d81ab crossvc-1.5.2pre.tgz
--- crossvc-1.5.1-nocreate.patch DELETED ---
More information about the fedora-extras-commits
mailing list