- ant doesn't create SPECS and WINDOWS folders per default now

- small fixes for spec-file

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2826 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.xml

@@ -181,8 +181,6 @@
   <!-- deleting old file -->
   <delete file="${build}/yacy.java" failonerror="false"/>
   <copy file="${src}/yacy.java" tofile="${build}/yacy.java" overwrite="true" filtering="true" />
-  <copy file="yacy-svn-3.spec" tofile="${release}/SPECS/yacy-svn.spec" overwrite="true" filtering="true" />
-  <copy file="yacy.nsi" tofile="${release}/WINDOWS/yacy.nsi" overwrite="true" filtering="true" />
   <!--<copy file="${doc}/Download.html" tofile="${doc}/Download.html.up" filtering="true" />-->
 </target>
   	
@@ -577,6 +575,8 @@
 	
 	<delete dir="${release_main}"/>
 	<delete dir="${release_ext}"/>	
+	<delete dir="${release}/WINDOWS" failonerror="false" />
+	<delete dir="${release}/SPECS" failonerror="false" />
 </target>
 
 <!-- make dist file including main sources and extensions -->   
@@ -736,12 +736,14 @@
   <taskdef name="jsmoothgen"
            classname="net.charabia.jsmoothgen.ant.JSmoothGen"
            classpath="addon/jsmooth/lib/jsmoothgen-ant.jar" />
+  <jsmoothgen project="addon/jsmooth/yacy.jsmooth" skeletonroot="addon/jsmooth/skeletons" />
 	
-    <jsmoothgen project="addon/jsmooth/yacy.jsmooth" skeletonroot="addon/jsmooth/skeletons"/>
-	
-	  <delete>
-	    <fileset dir="${build}" includes="**/*.class" />
-	  </delete>	
+  <delete>
+    <fileset dir="${build}" includes="**/*.class" />
+  </delete>	
+  <move file="${release}/WINDOWS/yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.exe"
+		tofile="${release}/yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.exe" />
+  <delete dir="${release}/WINDOWS" failonerror="false" />
 </target>	
 
 <target name="distWinExe" depends="makeWinExe,distAllInOne">	
@@ -750,23 +752,30 @@
 <target name="rpm" depends="all" description="Creates the main rpm-package and another for libx">
 	<mkdir dir="${release}/RPMS/noarch" />
 	<mkdir dir="${release}/BUILD" />
+	<copy file="yacy-svn-4.spec" tofile="${release}/SPECS/yacy-svn.spec" overwrite="true" filtering="true" />
+	
 	<rpm specFile="yacy-svn.spec" topDir="${release}" />
-	<delete dir="${release}/SPECS" failonerror="false" />
-	<delete dir="${release}/WINDOWS" failonerror="false" />
+	
 	<move file="${release}/RPMS/noarch/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm"
 		  tofile="${release}/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
 	<move file="${release}/RPMS/noarch/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm"
 		  tofile="${release}/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
+	
+	<delete dir="${release}/SPECS" failonerror="false" />
 	<delete dir="${release}/RPMS" failonerror="false" />
 </target>
 
 <target name="exe" depends="all" description="Creates the windows installer.exe">
 	<!-- http://nsisant.sourceforge.net/ -->
+	<copy file="yacy.nsi" tofile="${release}/WINDOWS/yacy.nsi" overwrite="true" filtering="true" />
 	<taskdef name="nsis" classname="net.sf.nsisant.Task">
 		    <classpath location="nsisant-1.2.jar"/>
 	</taskdef>
 	<mkdir dir="${release}/WINDOWS" />
 	<nsis script="${release}/WINDOWS/yacy.nsi" nocd="yes" />
+	<move file="${release}/WINDOWS/yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.exe"
+		  tofile="${release}/yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.exe" />
+	<delete dir="${release}/WINDOWS" failonerror="false" />
 </target>
 
 </project>

yacy-svn-4.spec

@@ -21,6 +21,7 @@ Requires:		wget
 Requires:		jre >= 1.4.2
 BuildArch:		noarch
 BuildRoot:		@REPL_YACY_ROOT_DIR@/RELEASE/BUILD
+Packager:		Franz Brauße <mike-nought@gmx.de>
 
 %description
 YaCy is a Java-based peer-2-peer search engine.
@@ -29,7 +30,7 @@ It contains a proxy which gathers all the web-pages
 you retrieve with it. All private data stays private and
 is not indexed or processed in any way. Furthermore
 you'll get a individual .yacy-domain which makes you
-independant of the traditional DNS system.
+independent of the traditional DNS system.
 
 Also included in YaCy is a Wiki, a P2P-message-system, a
 Blog and a bookmark management system. YaCy can be configured
@@ -116,8 +117,6 @@ if [ ! -e /etc/yacy ]; then ln -s /var/lib/yacy/SETTINGS /etc/yacy; fi	# SETTING
 
 chown yacy -R /var/lib/yacy
 chown yacy -R /var/log/yacy
-chmod -R 750 /var/lib/yacy
-chmod -R 750 /var/log/yacy
 chmod +x /usr/share/yacy/startYACY.sh
 chmod +x /usr/share/yacy/stopYACY.sh
 chmod +x /usr/share/yacy/killYACY.sh
@@ -287,13 +286,16 @@ if [ `getent passwd yacy` ]; then userdel yacy &> /dev/null; fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(750,yacy,root) %config %dir /var/lib/yacy/
-%attr(750,yacy,root) %dir /var/log/yacy/
+%config %dir /var/lib/yacy/
+%dir /var/log/yacy/
+%attr (755) /usr/share/yacy/startYACY.sh
+%attr (755) /usr/share/yacy/stopYACY.sh
+%attr (755) /usr/share/yacy/killYACY.sh
 %defattr(644,root,root,755)
 /usr/share/yacy/*
 /usr/lib/yacy/lib/*
 /usr/lib/yacy/classes/*
-/usr/share/doc/yacy/*
+%doc /usr/share/doc/yacy/*
 
 %files libx
 #%dir /usr/lib/yacy/libx
@@ -321,7 +323,11 @@ rm -rf $RPM_BUILD_ROOT
 #/usr/lib/yacy/classes/de/anomic/yacy/seedUpload/*
 
 %changelog
+* Fri Oct 20 2006 Franz Brauße <mike-nought@gmx.de>
+- added Packager-Tag
+- marked documentation-files as such
+- fixed permissions
+
 * Sat Oct 14 2006 Franz Brauße <mike-nought@gmx.de>
 - initial spec file based on yacy-0.48-3.spec
 - some adaptions for build with ant
-