- source bcond

Changed files:
    solr.spec -> 1.7

diff --git a/solr.spec b/solr.spec
index ce400ff67b3a6972f34e83c91720bb3b2962780c..8d0fde132c42805610138c65ef2cf4edf9b5fa51 100644 (file)
--- a/solr.spec
+++ b/solr.spec
@@ -1,3 +1,8 @@
+#
+# 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
@@ -13,10 +18,9 @@ Summary:     Solr - open source enterprise search server
 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/
@@ -25,6 +29,7 @@ BuildRequires:        jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      jpackage-utils
+Obsoletes:     apache-solr
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,14 +49,18 @@ Tomcat.
 %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