rpms/multithreadedtc/devel multithreadedtc.spec, 1.1, 1.2 multithreadedtc-build.patch, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/multithreadedtc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8187/devel

Modified Files:
	multithreadedtc.spec multithreadedtc-build.patch 
Log Message:
* Wed Jun 2 2010 Alexander Kurtakov <akurtako at redhat.com> 1.01-5
- Fix build.xml to really compile sources.
- Fix depmap.


Index: multithreadedtc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multithreadedtc/devel/multithreadedtc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- multithreadedtc.spec	1 Jun 2010 01:46:17 -0000	1.1
+++ multithreadedtc.spec	2 Jun 2010 19:39:04 -0000	1.2
@@ -1,7 +1,7 @@
-%define project_name MultithreadedTC
+%global project_name MultithreadedTC
 Name:           multithreadedtc
 Version:        1.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A framework for testing concurrent Java application
 
 Group:          Development/Libraries
@@ -41,7 +41,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{project_name}-%{version}-source
-%patch0 -p0
+%patch0 -p0 -b .sav
 
 rm -f *.jar
 
@@ -63,8 +63,8 @@ install -m 644 %{project_name}-%{version
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
     do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-%add_to_maven_depmap edu.umd.cs.mtc multithreadedtc %{version} JPP multithreadedtc
-%add_to_maven_depmap edu.umd.cs.mtc multithreadedtc-jdk14 %{version} JPP multithreadedtc
+%add_to_maven_depmap edu.umd.cs.mtc multithreadedtc %{version} JPP %{project_name}
+%add_to_maven_depmap edu.umd.cs.mtc multithreadedtc-jdk14 %{version} JPP %{project_name}
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -99,6 +99,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jun 2 2010 Alexander Kurtakov <akurtako at redhat.com> 1.01-5
+- Fix build.xml to really compile sources.
+- Fix depmap.
+
 * Thu May 27 2010 Hui Wang <huwang at redhat.com> 1.01-4
 - Fix LICENSE and txt README.txt encoding
 - Delete jar files in pre section
@@ -116,4 +120,4 @@ rm -rf %{buildroot}
 - Fix javadoc encoding
 
 * Tue May 25 2010 Hui Wang <huwang at redhat.com> 1.01-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package

multithreadedtc-build.patch:
 build.xml |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Index: multithreadedtc-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/multithreadedtc/devel/multithreadedtc-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- multithreadedtc-build.patch	1 Jun 2010 01:46:17 -0000	1.1
+++ multithreadedtc-build.patch	2 Jun 2010 19:39:04 -0000	1.2
@@ -1,16 +1,25 @@
---- build.xml.orig	2010-05-27 14:46:35.000000000 +0800
-+++ build.xml	2010-05-27 14:53:10.000000000 +0800
-@@ -11,6 +11,7 @@
+--- build.xml.sav	2007-08-13 18:49:46.000000000 +0300
++++ build.xml	2010-06-02 22:34:58.490132827 +0300
+@@ -10,15 +10,22 @@
+ 	<property name="all.info.files" value="${info.files},README-JDK14.txt" />
  
  	<!-- Create distribution jar -->
- 	<target name="distjar">
-+        <mkdir dir="bin"/>
- 		<jar destfile="${jarfile}" update="true">
+-	<target name="distjar">
+-		<jar destfile="${jarfile}" update="true">
++	<target name="distjar" depends="compile">
++        	<jar destfile="${jarfile}" update="true">
  			<fileset dir="bin" includes="edu/**/*class" />
  			<fileset dir="." includes="${info.files}" />
-@@ -18,7 +19,7 @@
+ 		</jar>
  	</target>
  	
++	<target name="compile" 
++        description="compile the source " >
++        <mkdir dir="bin"/>
++    	<javac srcdir="src" destdir="bin"/>
++	</target>
++
++	
  	<!-- Create Source Distribution zip -->
 -	<target name="sourcezip" depends="distjar,distjar-jdk14">
 +	<target name="sourcezip" depends="distjar">