fixes for dependency on svn

defaults/yacy.init

@@ -125,7 +125,7 @@ update.cycle = 168
 # It is recommended to set this list to low developer version numbers
 update.blacklist = ...[123]
 # a update can also restricted with a concept property, which can decide if an
-# update is only valid if it either is a main release or any svn release including new development releases
+# update is only valid if it either is a main release or any release including new development releases
 # Valid keywords are 'main' and 'any'
 update.concept = any
 # the following values are set automatically:

htroot/ConfigUpdate_p.java

@@ -127,7 +127,7 @@ public class ConfigUpdate_p {
                     sb.getLog().logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl());
                     final File downloaded = updateVersion.downloadRelease();
                     prop.putHTML("candeploy_autoUpdate_downloadedRelease", updateVersion.getName());
-                    final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists();
+                    final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
                     if (devenvironment) {
                         sb.getLog().logInfo("AUTO-UPDATE: omitting update because this is a development environment");
                         prop.put("candeploy_autoUpdate", "3");
@@ -156,7 +156,7 @@ public class ConfigUpdate_p {
         // version information
         final String versionstring = yacyBuildProperties.getVersion() + "/" + yacyBuildProperties.getSVNRevision();
         prop.putHTML("candeploy_versionpp", versionstring);
-        final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists();
+        final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
         float thisVersion = Float.parseFloat(yacyBuildProperties.getVersion());
         // cut off the SVN Rev in the Version
         try {

htroot/Steering.java

@@ -73,7 +73,7 @@ public class Steering {
 
         if (post.containsKey("update")) {
             Log.logInfo("STEERING", "update request from " + requestIP);
-            final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists();
+            final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
             final String releaseFileName = post.get("releaseinstall", "");
             final File releaseFile = new File(sb.getDataPath(), "DATA/RELEASE/".replace("/", File.separator) + releaseFileName);
             if ((!devenvironment) && (releaseFileName.length() > 0) && (releaseFile.exists())) {

source/net/yacy/search/Switchboard.java

@@ -1788,7 +1788,7 @@ public final class Switchboard extends serverSwitch {
                 // there is a version that is more recent. Load it and re-start with it
                 this.log.logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl());
                 final File downloaded = updateVersion.downloadRelease();
-                final boolean devenvironment = new File(this.getAppPath(), ".svn").exists();
+                final boolean devenvironment = new File(this.getAppPath(), ".git").exists();
                 if (devenvironment) {
                     this.log.logInfo("AUTO-UPDATE: omitting update because this is a development environment");
                 } else if ((downloaded == null) || (!downloaded.exists()) || (downloaded.length() == 0)) {

yacy-svn-4.spec

@@ -9,8 +9,8 @@ Version:		@REPL_VERSION@_@REPL_REVISION_NR@
 Release:		3
 License:		GPL
 Group:			Application/Internet
-Source0:		svn://svn.berlios.de/yacy/trunk
-URL:			http://www.yacy.net/yacy/
+Source0:		git@gitorious.org:yacy/rc1.git
+URL:			http://yacy.net
 Requires:		bash
 Requires:		sudo
 Requires:		coreutils
@@ -90,6 +90,7 @@ cp AUTHORS COPYRIGHT ChangeLog gpl.txt readme.txt ${RPM_BUILD_ROOT}$YACYDDIR/
 
 install -m 744 *.sh ${RPM_BUILD_ROOT}$YACYCDIR/				# start/stop/kill scripts
 rm -r `find ${RPM_BUILD_ROOT}/ -type d -name '.svn'`		# delete unwanted .svn-folders
+rm -r `find ${RPM_BUILD_ROOT}/ -type d -name '.git'`		# delete unwanted .git-folders
 
 # location for init-script
 install -d ${RPM_BUILD_ROOT}/etc/init.d/