Author: gotar Date: Sun Aug 6 17:22:07 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: ant-nodeps, no more double gzip, added %install section
---- Files affected: SPECS: avalon-framework.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/avalon-framework.spec diff -u SPECS/avalon-framework.spec:1.5 SPECS/avalon-framework.spec:1.6 --- SPECS/avalon-framework.spec:1.5 Sun May 28 10:22:20 2006 +++ SPECS/avalon-framework.spec Sun Aug 6 19:22:02 2006 @@ -12,6 +12,7 @@ # Source1-md5: 62499f9b32ac4d722a46a4f2cfbbf0d8 URL: http://excalibur.apache.org/framework/ BuildRequires: ant >= 1.5 +BuildRequires: ant-nodeps BuildRequires: jpackage-utils BuildRequires: rpmbuild(macros) >= 1.300 BuildArch: noarch @@ -32,14 +33,14 @@ %prep %setup -q -c -T -# double gzip... sigh. -zcat %{SOURCE0} | tar xz -zcat %{SOURCE1} | tar xz +tar xzf %{SOURCE0} +tar xzf %{SOURCE1} %build required_jars='junit' export CLASSPATH="`/usr/bin/build-classpath $required_jars`" export JAVA_HOME=%{java_home} +#export JAVA_HOME=/usr/lib/jvm/java-sun-1.5.0.06 export JAVAC=%{javac} export JAVA=%{java} @@ -56,7 +57,11 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -# XXX +install %{name}-impl-%{version}/target/%{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar +install %{name}-api-%{version}/target/%{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar + +ln -sf %{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar +ln -sf %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar %clean rm -rf $RPM_BUILD_ROOT @@ -71,6 +76,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/08/06 17:22:02 gotar +- BR: ant-nodeps, no more double gzip, added %install section + Revision 1.5 2006/05/28 08:22:20 qboosh - fixed md5s ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/avalon-framework.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
