rpms/crossvc/devel crossvc-1.5.2-nocreate.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 crossvc.spec, 1.11, 1.12 sources, 1.5, 1.6 crossvc-1.5.1-nocreate.patch, 1.3, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Sun Sep 16 19:12:55 UTC 2007
- Previous message (by thread): rpms/farsight/devel .cvsignore, 1.10, 1.11 farsight.spec, 1.17, 1.18 sources, 1.10, 1.11
- Next message (by thread): rpms/highlight/devel .cvsignore, 1.10, 1.11 highlight.spec, 1.22, 1.23 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25114
Modified Files:
.cvsignore crossvc.spec sources
Added Files:
crossvc-1.5.2-nocreate.patch
Removed Files:
crossvc-1.5.1-nocreate.patch
Log Message:
New upstream release
crossvc-1.5.2-nocreate.patch:
Index: crossvc-1.5.2-nocreate.patch
===================================================================
RCS file: crossvc-1.5.2-nocreate.patch
diff -N crossvc-1.5.2-nocreate.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.2-nocreate.patch 16 Sep 2007 19:12:53 -0000 1.3
@@ -0,0 +1,137 @@
+diff -up CrossVC/src/ImportDialog.ui.nocreate CrossVC/src/ImportDialog.ui
+--- CrossVC/src/ImportDialog.ui.nocreate 2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialog.ui 2007-09-16 20:59:55.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>
+diff -up CrossVC/src/ImportDialogImpl.h.nocreate CrossVC/src/ImportDialogImpl.h
+--- CrossVC/src/ImportDialogImpl.h.nocreate 2006-11-05 11:40:30.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.h 2007-09-16 20:59:55.000000000 +0200
+@@ -129,8 +129,6 @@ class ImportDialogImpl : public ImportDi
+ int mode();
+ int rshMode();
+ bool getKeepFTime();
+- bool getCreateDirs();
+-
+
+ public slots:
+
+diff -up CrossVC/src/Import.cpp.nocreate CrossVC/src/Import.cpp
+--- CrossVC/src/Import.cpp.nocreate 2007-09-16 21:06:04.000000000 +0200
++++ CrossVC/src/Import.cpp 2007-09-16 21:08:33.000000000 +0200
+@@ -171,7 +171,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,8 +235,6 @@ void Import::acceptCvs() {
+ files += " import ";
+
+ if (keepFTime) files += "-d ";
+- if (m_bCreateCvsDirs) files += "-C ";
+-
+
+ //ignore files:
+ QString sIgnore = "-I ! ";
+@@ -307,57 +304,6 @@ void Import::afterCall(int cmd, CvsBuffe
+ return;
+ }
+
+- if (m_bCreateCvsDirs) {
+- //cvs dir is already in workbench?
+- QString topProjectDir = "";
+- QString subProjectDir = "";
+- bool found = false;
+- DirBase * myChild = NULL;
+-
+- QString importDir = m_localDir;
+- int pos = importDir.length();
+- do {
+-
+- pos = importDir.findRev("/");
+- importDir.truncate(pos);
+-
+- if ( (myChild = m_workBench->find(importDir)) ) {
+-
+- if (myChild->isAnalyzed()) {
+-
+- QString dirToAdd = m_localDir;
+- dirToAdd = dirToAdd.left(dirToAdd.find("/",myChild->fullName().length()+1));
+- DirBase * unanalyzedDir = myChild->addDir(dirToAdd);
+- if (unanalyzedDir && myChild->isOpen()) {//will not be analyzed on open() because it is already open
+- myChild->setOpen(TRUE);
+- }
+- if (myChild->isSelected()) {
+- myChild->activateItem(TRUE);//reread files
+- } else {
+- m_workBench->setSelected(myChild,TRUE);//reread files
+- }
+- }
+-
+- emit showInfo( tr("Import Info"), tr("This project subdir has been added.") );
+- topProjectDir = myChild->topDir()->shortName();
+- DirBase * tmp = m_workBench->find(m_localDir);
+- if (tmp) {
+- subProjectDir = tmp->topControlledDir()->relativeName();
+- projectSettings->set(subProjectDir, SSHACCESS, m_sshAccess);
+- }
+- found = true;
+- }
+-
+- } while ( !found && (pos > -1));
+-
+- if ( !found) {
+- QString path = m_localDir.left(m_localDir.findRev("/"));
+- QString name = m_localDir.mid(m_localDir.findRev("/") + 1);
+- emit addCheckedOutProject(path, name, m_sshAccess);
+- }
+-
+- }
+-
+ break;
+ }
+ default: {
+diff -up CrossVC/src/ImportDialogImpl.cpp.nocreate CrossVC/src/ImportDialogImpl.cpp
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate 2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.cpp 2007-09-16 20:59:55.000000000 +0200
+@@ -231,11 +231,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
+ if (m_ignoreString.find("!") > -1) m_ignoreString = m_ignoreString.mid(m_ignoreString.findRev("!", -1) + 1);
+
+ 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 Sep 2007 20:03:27 -0000 1.5
+++ .cvsignore 16 Sep 2007 19:12:53 -0000 1.6
@@ -1 +1 @@
-crossvc-1.5.1-0-generic-src.tgz
+crossvc-1.5.2-0-generic-src.tgz
Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- crossvc.spec 9 Sep 2007 20:20:23 -0000 1.11
+++ crossvc.spec 16 Sep 2007 19:12:53 -0000 1.12
@@ -1,18 +1,15 @@
Name: crossvc
-Version: 1.5.1
-Release: 7%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
Summary: Graphical CVS Client
Group: Development/Tools
License: GPLv2
URL: http://www.lincvs.org
-# 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: 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)
@@ -88,6 +85,9 @@
%changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-1
+- New upstream release
+
* Sun Sep 9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-7
- Downgrade to last stable release
- Add Req to qt-3.3.8-6 (#246024)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Sep 2007 20:03:27 -0000 1.5
+++ sources 16 Sep 2007 19:12:53 -0000 1.6
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4 crossvc-1.5.1-0-generic-src.tgz
+4fb196e4e5fb5b6c5d901601869308b2 crossvc-1.5.2-0-generic-src.tgz
--- crossvc-1.5.1-nocreate.patch DELETED ---
- Previous message (by thread): rpms/farsight/devel .cvsignore, 1.10, 1.11 farsight.spec, 1.17, 1.18 sources, 1.10, 1.11
- Next message (by thread): rpms/highlight/devel .cvsignore, 1.10, 1.11 highlight.spec, 1.22, 1.23 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list