rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: pcheung

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19053

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
* Thu Jan 25 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-6jpp.1
- Merge from upstream and rpmlint cleanup




Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-lang.spec	10 Aug 2006 21:45:44 -0000	1.20
+++ jakarta-commons-lang.spec	13 Mar 2007 16:20:03 -0000	1.21
@@ -34,30 +34,29 @@
 
 %define base_name       lang
 %define short_name      commons-%{base_name}
-%define section         free
 
 Name:           jakarta-%{short_name}
 Version:        2.1
-Release:        5jpp.1
+Release:        6jpp.1%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
-URL:            http://jakarta.apache.org/commons/lang.html
-#wget http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.1-src.tar.gz
-Source0:        commons-lang-2.1-src.tar.gz
+URL:            http://jakarta.apache.org/commons/lang
+Source0:        http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.1-src.tar.gz
 Patch0:         %{name}-notarget.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRequires:  ant-junit, jpackage-utils >= 0:1.5, %{__perl}
+BuildRequires:  sed
 
 %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
@@ -89,6 +88,9 @@
 
 %patch0
 
+%{__sed} -i 's/\r//' STATUS.html
+%{__sed} -i 's/\r//' PROPOSAL.html
+
 %build
 # FIXME: There are failures with gcj. Ignore them for now.
 %if %{gcj_support}
@@ -136,16 +138,16 @@
   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
@@ -167,6 +169,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 25 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-6jpp.1
+- Merge from upstream and rpmlint cleanup
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-5jpp.1
 - Added missing requirements.
 - Added missing postun section for javadoc.