SPECS: jakarta-commons-logging.spec - s/jakarta-log4j/logging-log4...

[jajcus]

Author: jajcus                       Date: Thu May 25 13:04:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- s/jakarta-log4j/logging-log4j/
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- ExclusiveArch
- javadoc now in %{_javadocdir} in a javadoc subpackage
- put jars in $CLASSPATH instead of modifying build.properties or passing args to ant
- versioned jar filenames

---- Files affected:
SPECS:
   jakarta-commons-logging.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-logging.spec
diff -u SPECS/jakarta-commons-logging.spec:1.11 SPECS/jakarta-commons-logging.spec:1.12
--- SPECS/jakarta-commons-logging.spec:1.11	Fri May 19 13:28:19 2006
+++ SPECS/jakarta-commons-logging.spec	Thu May 25 15:04:10 2006
@@ -10,10 +10,13 @@
 # Source0-md5:	db5dc75c89e794f794be92d10df6be1b
 URL:		http://jakarta.apache.org/commons/logging/
 BuildRequires:	ant
-BuildRequires:	jakarta-log4j
+BuildRequires:	logging-log4j
 BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre >= 1.4
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,44 +34,48 @@
 niewielka liczba podstawowych implementacji, aby pozwolić użytkownikom
 na używanie pakietu samodzielnie.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons Logging documentation
 Summary(pl):	Dokumentacja do Jakarta Commons Logging
 Group:		Development/Languages/Java
+Obsoletes:	jakarta-commons-logging-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Logging documentation.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja do Jakarta Commons Logging.
 
 %prep
 %setup -q -n commons-logging-%{version}-src
 
 %build
-cat << EOF > build.properties
-log4j.jar=%{_javadir}/log4j.jar
-EOF
-ant dist \
-	-Dlog4j.jar=%{_javadir}/log4j.jar
+export CLASSPATH="`build-classpath log4j`"
+export JAVA_HOME="%{java_home}"
+ant dist javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
+install dist/commons-logging-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}-api.jar
+install dist/commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
+ln -s commons-logging-%{version}-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar
+ln -s commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging.jar
+
+cp -R dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc dist/LICENSE.txt
+%doc dist/*.txt
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc dist/docs
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +83,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/05/25 13:04:10  jajcus
+- s/jakarta-log4j/logging-log4j/
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- ExclusiveArch
+- javadoc now in %{_javadocdir} in a javadoc subpackage
+- put jars in $CLASSPATH instead of modifying build.properties or passing args to ant
+- versioned jar filenames
+
 Revision 1.11  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-logging.spec?r1=1.11&r2=1.12&f=u