rpms/crossvc/devel crossvc-1.5.1-nocreate.patch, 1.2, 1.3 crossvc.spec, 1.9, 1.10 crossvc-1.5.2-nocreate.patch, 1.1, NONE

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Sun Sep 9 20:19:46 UTC 2007


Author: s4504kr

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

Modified Files:
	crossvc.spec 
Added Files:
	crossvc-1.5.1-nocreate.patch 
Removed Files:
	crossvc-1.5.2-nocreate.patch 
Log Message:
Correct wrong patch in SPEC file

crossvc-1.5.1-nocreate.patch:

Index: crossvc-1.5.1-nocreate.patch
===================================================================
RCS file: crossvc-1.5.1-nocreate.patch
diff -N crossvc-1.5.1-nocreate.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.1-nocreate.patch	9 Sep 2007 20:19:44 -0000	1.3
@@ -0,0 +1,50 @@
+--- CrossVC/src/ImportDialog.ui.nocreate	2007-06-28 19:38:19.000000000 +0200
++++ CrossVC/src/ImportDialog.ui	2007-06-28 19:40:49.000000000 +0200
+@@ -651,14 +651,6 @@ enter the appropriate value or leave thi
+                 <property name="name">
+                     <cstring>unnamed</cstring>
+                 </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</string>
+-                    </property>
+-                </widget>
+                 <widget class="QCheckBox" row="0" column="0">
+                     <property name="name">
+                         <cstring>m_KeepFTime</cstring>
+--- CrossVC/src/Import.cpp.nocreate	2007-06-28 19:42:23.000000000 +0200
++++ CrossVC/src/Import.cpp	2007-06-28 19:43:13.000000000 +0200
+@@ -185,7 +185,6 @@ void Import::acceptCvs() {
+    int rshMode = dlg->rshMode();
+    int sshAccess = dlg->getSshPreset();
+    bool keepFTime = dlg->getKeepFTime();
+-   bool createDirs = dlg->getCreateDirs();
+    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
+    QStringList binaryWildcards = dlg->getBinaryWildcards();
+ 
+@@ -250,8 +249,7 @@ void Import::acceptCvs() {
+    files += " import ";
+    
+    if (keepFTime) files += "-d ";
+-   if (createDirs) files += "-C ";
+-    
++      
+   
+    //ignore files:
+    QString sIgnore = "-I ! ";
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-06-28 19:41:17.000000000 +0200
++++ CrossVC/src/ImportDialogImpl.cpp	2007-06-28 19:42:12.000000000 +0200
+@@ -691,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: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- crossvc.spec	9 Sep 2007 20:11:01 -0000	1.9
+++ crossvc.spec	9 Sep 2007 20:19:44 -0000	1.10
@@ -12,7 +12,7 @@
 # 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.2-nocreate.patch
+Patch1:		  crossvc-1.5.1-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


--- crossvc-1.5.2-nocreate.patch DELETED ---




More information about the fedora-extras-commits mailing list