rpms/axis/devel axis-build_xml.patch,NONE,1.1 axis.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: pcheung

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv526

Modified Files:
	axis.spec 
Added Files:
	axis-build_xml.patch 
Log Message:
Fix building javadoc and rpmlint cleanup


axis-build_xml.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE axis-build_xml.patch ---
--- build.xml	2007-04-04 21:59:46.000000000 -0400
+++ build.xml	2007-04-04 21:59:31.000000000 -0400
@@ -359,6 +359,7 @@ Copyright:
 
     <mkdir dir="${build.javadocs}"/>
     <javadoc packagenames="${packages}"
+             source="1.3"
              sourcepath="${src.dir}"
              classpathref="classpath"
              destdir="${build.javadocs}"


Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- axis.spec	4 Aug 2006 22:52:01 -0000	1.21
+++ axis.spec	16 Apr 2007 15:07:21 -0000	1.22
@@ -4,21 +4,21 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define archivever 1_2_1
-%define section    free
 
 Name:          axis
 Version:       1.2.1
-Release:       2jpp.6
+Release:       2jpp.7%{?dist}
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
 Group:         Development/Libraries/Java
 Url:           http://ws.apache.org/%{name}/
-Source0:       %{name}-src-%{archivever}-RHCLEAN.tar.bz2
+Source0:       http://archive.apache.org/dist/ws/axis/1_2_1/axis-src-1_2_1.tar.gz
 Patch1:        %{name}-bz152255.patch
 Patch2:        %{name}-imageio.patch
 Patch3:        %{name}-objectweb.patch
 Patch4:        %{name}-%{version}-DH.patch
+Patch5:        %{name}-build_xml.patch
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: java-devel
 BuildRequires: ant >= 0:1.6, ant-nodeps
@@ -47,19 +47,19 @@
 Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-httpclient
 Requires:      javamail
-Requires: jaxp_parser_impl
+Requires:      jaxp_parser_impl
 Requires:      log4j
 Requires:      wsdl4j
 
 %if ! %{gcj_support}
 BuildArch:     noarch
 %endif
-BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:       java-gcj-compat-devel
+Requires(post):      java-gcj-compat
+Requires(postun):    java-gcj-compat
 %endif
 
 %description
@@ -80,8 +80,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -94,18 +92,28 @@
 Documentation for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{archivever}
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
 %patch4
+%patch5
 
 # Remove provided binaries
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.zip" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
+# Fix for wrong-file-end-of-line-encoding problem
+for i in `find docs -iname "*.html"`; do %{__sed} -i 's/\r//' $i; done
+for i in `find docs -iname "*.css"`; do %{__sed} -i 's/\r//' $i; done
+for i in `find docs -iname "*.bib"`; do %{__sed} -i 's/\r//' $i; done
+%{__sed} -i 's/\r//' README
+%{__sed} -i 's/\r//' LICENSE
+%{__sed} -i 's/\r//' docs/docbook/testing-again.dbk
+%{__sed} -i 's/\r//' release-notes.html
+%{__sed} -i 's/\r//' changelog.html
+
 %build
 
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -131,6 +139,7 @@
     clean compile javadocs
 
 %install
+rm -rf $RPM_BUILD_ROOT
 
 ### Jar files
 
@@ -156,9 +165,11 @@
 
 pushd docs
    rm -fr apiDocs
-   ln -fs %{_javadocdir}/%{name} apiDocs
+   ln -fs %{_javadocdir}/%{name}-%{version} apiDocs
 popd
 
+ln -sf %{_javadocdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -166,25 +177,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%post
 %if %{gcj_support}
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -205,13 +207,18 @@
 %defattr(0644,root,root,0755)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
+%{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/*
 
 %changelog
-* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-4jpp.6
+* Wed Apr 04 2007 Permaine Cheung <pcheung at redhat.com> 0:1.2.1-2jpp.7
+- Fix building javadoc
+- rpmlint cleanup
+
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-2jpp.6
 - Added missing requirements
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.1-2jpp_5fc