rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec,1.29,1.30

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/jakarta-commons-lang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21234

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
* Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 0:2.3-4.4
- Update Source0 URL.
- Fix Group tags.
- Add more stuff to %{with_maven} sections.
- Fix %files attrs.


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- jakarta-commons-lang.spec	25 Jul 2009 03:50:44 -0000	1.29
+++ jakarta-commons-lang.spec	8 Jan 2010 22:26:35 -0000	1.30
@@ -40,13 +40,13 @@
 
 Name:           jakarta-%{short_name}
 Version:        2.3
-Release:        4.3%{?dist}
+Release:        4.4%{?dist}
 Epoch:          0
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 URL:            http://commons.apache.org/lang/
-Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
@@ -94,7 +94,7 @@ as hashCode, toString and equals.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 BuildRequires:  java-javadoc
 
 %description    javadoc
@@ -103,7 +103,7 @@ Javadoc for %{name}.
 %if %{with_maven}
 %package manual
 Summary:        Documents for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description manual
 %{summary}.
@@ -114,6 +114,11 @@ Group:          Development/Documentatio
 %{__perl} -pi -e 's/\r//g' *.txt
 %{__sed} -i 's/\r//' STATUS.html
 
+%patch0
+%patch1
+
+%build
+%if %{with_maven}
 if [ ! -f %{SOURCE4} ]; then
 export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml
 echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
@@ -127,11 +132,7 @@ echo >> $DEPCAT
 echo '</depset>' >> $DEPCAT
 /usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml
 fi
-%patch0
-%patch1
 
-%build
-%if %{with_maven}
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
     cp project.xml project.xml.orig
@@ -176,12 +177,14 @@ cp -p dist/%{short_name}.jar $RPM_BUILD_
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+%if %{with_maven}
 %add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{name}
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 install -m 644 %{SOURCE5} \
     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+%endif
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -209,6 +212,7 @@ cp -pr target/docs/* $RPM_BUILD_ROOT%{_d
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with_maven}
 %post
 %update_maven_depmap
 %if %{gcj_support}
@@ -226,33 +230,41 @@ then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%endif
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/STATUS.html
 %doc %{_docdir}/%{name}-%{version}/*.txt
 #%doc PROPOSAL.html STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
+%if %{with_maven}
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
+%endif
 %if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
+%{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %if %{with_maven}
 %files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/site
 %endif
 
 %changelog
+* Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 0:2.3-4.4
+- Update Source0 URL.
+- Fix Group tags.
+- Add more stuff to %%{with_maven} sections.
+- Fix %%files attrs.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3-4.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild