Author: glen Date: Tue Oct 5 16:45:28 2010 GMT Module: packages Tag: HEAD ---- Log message: - source bcond
---- Files affected: packages/solr: solr.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/solr/solr.spec diff -u packages/solr/solr.spec:1.6 packages/solr/solr.spec:1.7 --- packages/solr/solr.spec:1.6 Tue Oct 5 18:42:36 2010 +++ packages/solr/solr.spec Tue Oct 5 18:45:23 2010 @@ -1,4 +1,9 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # don't build and run tests +%bcond_without source # don't build source jar + # TODO #get-colt: # [get] Getting: http://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.jar @@ -14,10 +19,9 @@ Summary(pl.UTF-8): Solr - profesjonalny serwer wyszukiwarki o otwartych źródłach Name: solr Version: 1.4.1 -Release: 0.1 +Release: 0.2 License: Apache Group: Development/Languages/Java -Obsoletes: apache-solr Source0: http://www.apache.org/dist/lucene/solr/%{version}/apache-%{name}-%{version}.tgz # Source0-md5: 258a020ed8c3f44e13b09e8ae46a1c84 URL: http://lucene.apache.org/solr/ @@ -26,6 +30,7 @@ BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils +Obsoletes: apache-solr BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,14 +50,18 @@ %prep %setup -q -n apache-%{name}-%{version} +%if %{with source} # remove bindist rm -rf dist/* +%endif %build required_jars="junit" export CLASSPATH=$(build-classpath $required_jars) +%if %{with source} %ant dist \ -Dversion=%{version} +%endif %install rm -rf $RPM_BUILD_ROOT @@ -82,6 +91,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2010/10/05 16:45:23 glen +- source bcond + Revision 1.6 2010/10/05 16:42:36 glen - install files as much as i understand ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/solr/solr.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
