rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: mwringe

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

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
Merge with latest jpp version
fix rpmlint isuses



Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-discovery.spec	10 Aug 2006 19:26:52 -0000	1.11
+++ jakarta-commons-discovery.spec	25 Apr 2007 23:54:16 -0000	1.12
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,8 @@
 
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
-Version:        0.3
-Release:        4jpp.1
+Version:        0.4
+Release:        2jpp.1%{?dist}
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -46,17 +46,19 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commonsdiscovery0.3src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  ant, jpackage-utils >= 0:1.5
+Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant
+BuildRequires:  ant-nodeps
 BuildRequires:  junit >= 0:3.7
-BuildRequires:  jakarta-commons-logging >= 0:1.0.1
-Requires:       jakarta-commons-logging >= 0:1.0.1
+BuildRequires:  jakarta-commons-logging >= 0:1.0.4
+Requires:       jakarta-commons-logging >= 0:1.0.4
 
 %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
@@ -81,12 +83,9 @@
 # -----------------------------------------------------------------------------
 
 %prep
-%setup -q -n commons-discovery-%{version}
+%setup -q -n commons-discovery-%{version}-src
 chmod u+w .
 
-# No NOTICE.txt file in the sources
-touch NOTICE.txt 
-
 # -----------------------------------------------------------------------------
 
 %build
@@ -108,7 +107,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 # -----------------------------------------------------------------------------
 
@@ -120,25 +119,17 @@
 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
@@ -148,20 +139,36 @@
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
+%doc NOTICE.txt
+%doc RELEASE-NOTES.txt
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.4.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 1:0.4-2jpp.1
+- Merge with latest jpp version
+- fix rpmlint isuses
+
+* Sat Feb 17 2007 Fernando Nasser <fnasser at redhat.com> - 1:0.4-2jpp
+- Remove distribution and vendor tags
+- Fix empty post postun messages
+- Use spaces and no tabs all over
+
+* Sat Feb 17 2007 Fernando Nasser <fnasser at redhat.com> - 1:0.4-1jpp
+- Upgrade to 0.4
+- New license is ASL 2
+- Add NOTICE.txt real file
+
 * Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-4jpp.1
 - Merge with upstream version
  - Add missing javadoc post and postun
@@ -186,12 +193,12 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:0.2-2jpp
 - Rebuild with ant-1.6.2
 
-* Thu Apr 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 1:0.2-1jpp
+* Thu Apr 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 1:0.2-1jpp
 - Update to 0.2 and JPackage 1.5.
 
-* Fri Sep 13 2002 Ville Skyttä <ville.skytta at iki.fi> 1:0.1-1jpp
+* Fri Sep 13 2002 Ville Skyttä <ville.skytta at iki.fi> 1:0.1-1jpp
 - 0.1.
 
-* Sat Sep  7 2002 Ville Skyttä <ville.skytta at iki.fi> 1.0-0.rc1.1jpp
+* Sat Sep  7 2002 Ville Skyttä <ville.skytta at iki.fi> 1.0-0.rc1.1jpp
 - First JPackage release.