Author: pawelz Date: Thu Feb 24 19:13:33 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.6.1 - do not try to build it from source
---- Files affected: packages/java-slf4j: java-slf4j.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/java-slf4j/java-slf4j.spec diff -u packages/java-slf4j/java-slf4j.spec:1.4 packages/java-slf4j/java-slf4j.spec:1.5 --- packages/java-slf4j/java-slf4j.spec:1.4 Fri Apr 23 02:03:41 2010 +++ packages/java-slf4j/java-slf4j.spec Thu Feb 24 20:13:28 2011 @@ -9,19 +9,13 @@ %define srcname slf4j Summary: Simple Logging Facade for Java Name: java-slf4j -Version: 1.5.8 -Release: 0.1 +Version: 1.6.1 +Release: 1 License: MIT Group: Libraries/Java -Source0: http://xatka.net/~z/PLD/slf4j-%{version}.tar.bz2 -# Source0-md5: 841e16c3d5d5a323ceabfc6bdce10bb8 -Source1: %{name}-genbuildxml.sh +Source0: http://www.slf4j.org/dist/slf4j-1.6.1.tar.gz +# Source0-md5: 289d4ce9b710269614e97f1ae6a27906 URL: http://www.slf4j.org/ -BuildRequires: java-commons-lang -BuildRequires: java-commons-logging -BuildRequires: java-log4j -BuildRequires: jdk -BuildRequires: javassist BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 @@ -38,37 +32,15 @@ %prep %setup -q -n %{srcname}-%{version} -find -name MANIFEST.MF | xargs sed -i 's,${project.version},%{version},g' - -# break build if any macro is left -find -name MANIFEST.MF | ! xargs grep '\${' - %build -export JAVA_HOME="%{java_home}" - -export LC_ALL=en_US # source code not US-ASCII - -sh %{SOURCE1} > build.xml - -javassist_jar=$(find-jar javassist) -commons_logging_jar=$(find-jar commons-logging-api) -commons_lang_jar=$(find-jar commons-lang) -log4j_jar=$(find-jar log4j) - -%ant jars \ - -Djavassist-jar=$javassist_jar \ - -Dcommons-logging-jar=$commons_logging_jar \ - -Dcommons-lang-jar=$commons_lang_jar \ - -Dlog4j-jar=$log4j_jar - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} # jars -for j in dist/*.jar; do - n=$(basename $j .jar) +for j in *%{version}.jar; do + n=$(basename $j -%{version}.jar) cp -a $j $RPM_BUILD_ROOT%{_javadir}/$n-%{version}.jar ln -s $n-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$n.jar done @@ -86,6 +58,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2011/02/24 19:13:28 pawelz +- up to 1.6.1 +- do not try to build it from source + Revision 1.4 2010/04/23 00:03:41 pawelz - Don't force specific jdk. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-slf4j/java-slf4j.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
