Author: glen Date: Thu Dec 13 23:50:27 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - unify java package; rel 2
---- Files affected: SPECS: jakarta-commons-el.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-el.spec diff -u SPECS/jakarta-commons-el.spec:1.6 SPECS/jakarta-commons-el.spec:1.7 --- SPECS/jakarta-commons-el.spec:1.6 Tue Nov 20 19:03:40 2007 +++ SPECS/jakarta-commons-el.spec Fri Dec 14 00:50:22 2007 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): Jakarta Commons Extension Language - język rozszerzeń Jakarta Commons Name: jakarta-commons-el Version: 1.0 -Release: 1 +Release: 2 License: Apache Software License Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz @@ -18,8 +18,9 @@ BuildRequires: junit BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 -BuildRequires: servletapi5 +BuildRequires: servlet Obsoletes: commons-el +Requires: jpackage-utils BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,9 +53,10 @@ %build cat > build.properties <<EOF build.compiler=modern -servlet-api.jar=$(build-classpath servlet-api) -jsp-api.jar=$(build-classpath jsp-api) -junit.jar=$(build-classpath junit) +servlet-api.jar=$(find-jar servlet) +jsp-api.jar=$(find-jar jsp-api) +junit.jar=$(find-jar junit) + servletapi.build.notrequired=true jspapi.build.notrequired=true EOF @@ -68,22 +70,21 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -for a in dist/*.jar; do - jar=${a##*/} - cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar - ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar -done + +# jars +cp -a dist/commons-el.jar $RPM_BUILD_ROOT%{_javadir}/commons-el-%{version}.jar +ln -s commons-el-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-el.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink %clean rm -rf $RPM_BUILD_ROOT %post javadoc -ln -sf %{name}-%{version} %{_javadocdir}/%{name} +ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %files %defattr(644,root,root,755) @@ -101,6 +102,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2007-12-13 23:50:22 glen +- unify java package; rel 2 + Revision 1.6 2007-11-20 18:03:40 glen - java deps; adapter @@ -109,7 +113,7 @@ Revision 1.4 2007/04/11 23:41:21 glen - renamed to jakarta-commons-el -- svn admin plz rename commons-el.spec,v +- cvs admin plz rename commons-el.spec,v Revision 1.3 2007/04/11 20:49:20 glen - bootstrap not needed anymore ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-el.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
