rpms/directory-naming/devel directory-naming.spec,1.2,1.3

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23830/devel

Modified Files:
	directory-naming.spec 
Log Message:
- Remove patch and sed lines -not needed.


Index: directory-naming.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- directory-naming.spec	19 Aug 2009 14:02:42 -0000	1.2
+++ directory-naming.spec	20 Aug 2009 12:12:41 -0000	1.3
@@ -30,12 +30,12 @@
 
 Name:           directory-naming
 Version:        0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Directory Naming
 License:        ASL 2.0
 URL:            http://directory.apache.org
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 
 Source0:        directory-naming-0.8.tar.gz
 # svn export -r 124846 http://svn.apache.org/repos/asf/directory/sandbox/dormant-subprojects/naming/ directory-naming-0.8
@@ -47,8 +47,6 @@ Source8:        http://repo1.maven.org/m
 Source9:        http://repo1.maven.org/maven2/directory-naming/naming-management/0.8/naming-management-0.8.pom
 Source10:       http://repo1.maven.org/maven2/directory-naming/naming-resources/0.8/naming-resources-0.8.pom
 
-Patch0:         directory-naming-0.8-project.patch
-
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  ant >= 0:1.6.5
@@ -85,7 +83,7 @@ Old directory/naming module.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires(post): /bin/rm /bin/ln
 Requires(postun): /bin/rm
 
@@ -98,7 +96,7 @@ Requires(postun): /bin/rm
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
 done
-%patch0 -b .sav0
+sed -i "s/\r//" LICENSE.txt
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -122,19 +120,6 @@ CLASSPATH=$CLASSPATH:$(pwd)/naming-java/
 CLASSPATH=$CLASSPATH:$(pwd)/naming-management/target/classes:$(pwd)/naming-management/target/test-classes
 CLASSPATH=$CLASSPATH:$(pwd)/naming-resources/target/classes:$(pwd)/naming-resources/target/test-classes
 
-#FIXME failed to create task or type setproxy
-for f in $(find . -name build.xml); do
-    sed -i "s|<setproxy>|<!-- <setproxy> -->|g" $f
-    sed -i "s|</setproxy>|<!-- </setproxy> -->|g" $f
-done;
-
-#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
-#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
-
-#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
-#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
-
-
 export OPT_JAR_LIST="junit ant/ant-junit"
 
 ant -Dbuild.sysclasspath=only jar javadoc
@@ -191,6 +176,9 @@ done
 %{_mavendepmapfragdir}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-6
+- Remove patch and sed lines -not needed.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-5
 - Remove gcj support.
 - Build with build.sysclasspath=only.