BIGTOP-879. Bump version of Solr to 4.2.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/920121c6 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/920121c6 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/920121c6 Branch: refs/heads/master Commit: 920121c636e0ef185edf30717e9132c94ab8d4d0 Parents: 99bdf4d Author: Roman Shaposhnik <[email protected]> Authored: Mon Mar 25 09:00:35 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Mon Mar 25 09:00:35 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/deb/solr/rules | 2 +- bigtop-packages/src/rpm/solr/SPECS/solr.spec | 6 +++--- bigtop.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/920121c6/bigtop-packages/src/deb/solr/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/solr/rules b/bigtop-packages/src/deb/solr/rules index ff5fb97..72d118d 100755 --- a/bigtop-packages/src/deb/solr/rules +++ b/bigtop-packages/src/deb/solr/rules @@ -32,7 +32,7 @@ override_dh_auto_build: override_dh_auto_install: sh -x debian/install_solr.sh \ - --build-dir=solr/build/apache-solr-${SOLR_BASE_VERSION} \ + --build-dir=solr/build/solr-${SOLR_BASE_VERSION} \ --doc-dir=/usr/share/doc/solr-doc \ --distro-dir=debian \ --prefix=debian/tmp http://git-wip-us.apache.org/repos/asf/bigtop/blob/920121c6/bigtop-packages/src/rpm/solr/SPECS/solr.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/solr/SPECS/solr.spec b/bigtop-packages/src/rpm/solr/SPECS/solr.spec index 93334f6..7e77847 100644 --- a/bigtop-packages/src/rpm/solr/SPECS/solr.spec +++ b/bigtop-packages/src/rpm/solr/SPECS/solr.spec @@ -49,7 +49,7 @@ Group: Development/Libraries BuildArch: noarch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: ASL 2.0 -Source0: apache-solr-%{solr_base_version}-src.tgz +Source0: solr-%{solr_base_version}-src.tgz Source1: do-component-build Source2: install_%{name}.sh Source3: server.xml @@ -98,7 +98,7 @@ This package contains the documentation for Apache Solr Documentation for Apache Solr %prep -%setup -n apache-solr-%{solr_base_version} +%setup -n solr-%{solr_base_version} %build env FULL_VERSION=%{solr_base_version} bash %{SOURCE1} @@ -106,7 +106,7 @@ env FULL_VERSION=%{solr_base_version} bash %{SOURCE1} %install %__rm -rf $RPM_BUILD_ROOT sh $RPM_SOURCE_DIR/install_solr.sh \ - --build-dir=solr/build/apache-solr-%{solr_base_version} \ + --build-dir=solr/build/solr-%{solr_base_version} \ --prefix=$RPM_BUILD_ROOT \ --distro-dir=$RPM_SOURCE_DIR \ --doc-dir=%{doc_solr} http://git-wip-us.apache.org/repos/asf/bigtop/blob/920121c6/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 6e99990..e92b46f 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -216,12 +216,12 @@ $(eval $(call PACKAGE,datafu,DATAFU)) SOLR_NAME=solr SOLR_RELNOTES_NAME=Search engine server SOLR_PKG_NAME=solr -SOLR_BASE_VERSION=4.0.0 -SOLR_PKG_VERSION=4.0.0 +SOLR_BASE_VERSION=4.2.0 +SOLR_PKG_VERSION=4.2.0 SOLR_RELEASE_VERSION=1 -SOLR_TARBALL_DST=apache-solr-4.0.0-src.tgz +SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz SOLR_TARBALL_SRC=$(SOLR_TARBALL_DST) -SOLR_DOWNLOAD_PATH=/lucene/solr/4.0.0 +SOLR_DOWNLOAD_PATH=/lucene/solr/$(SOLR_BASE_VERSION) SOLR_SITE=$(APACHE_MIRROR)$(SOLR_DOWNLOAD_PATH) SOLR_ARCHIVE=$(APACHE_ARCHIVE)$(SOLR_DOWNLOAD_PATH) $(eval $(call PACKAGE,solr,SOLR))
