rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 15 ++++++++++++--- search-server/spacewalk-search/src/config/rhn-search | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-)
New commits: commit 1f3484e88826e8474b5bf1abfcf3142a7709f0ef Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 12 13:39:01 2013 +0100
Automatic commit of package [spacewalk-search] release [2.1.9-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index a0a7bb2..c6d3eef 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.8-1 search-server/spacewalk-search/ +2.1.9-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index fde2c4b..15e0963 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.8 +Version: 2.1.9 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -190,6 +190,11 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog +* Thu Dec 12 2013 Tomas Lestach tlestach@redhat.com 2.1.9-1 +- do not let cleanindex log into the console +- there're no objectweb-asm on rhel5 +- let spacewalk-search require c3p0 >= 0.9.1 + * Wed Dec 11 2013 Milan Zazrivec mzazrivec@redhat.com 2.1.8-1 - 1040540 - have package search return all matching results
commit 865d879b94b4b358864d60b9e1f799ff181d452d Author: Tomas Lestach tlestach@redhat.com Date: Thu Dec 12 13:28:41 2013 +0100
do not let cleanindex log into the console
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index 6bff688..dbaf4d9 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -77,7 +77,7 @@ unlock() { removeindex() { JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc' SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar` - CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes + CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes > /dev/null }
# Do not modify anything beyond this point
commit c50870ffbb10fd252e5fcd19d8de3c24f7cc052e Author: Tomas Lestach tlestach@redhat.com Date: Wed Dec 11 17:11:09 2013 +0100
there're no objectweb-asm on rhel5
let's do it in the same way like spacewalk-java does
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 1672840..fde2c4b 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -37,7 +37,11 @@ Requires: jakarta-oro Requires: oro %endif #Requires: lucene +%if 0%{?fedora} Requires: objectweb-asm +%else +Requires: asm +%endif Requires: quartz < 2.0 Conflicts: quartz >= 2.0 Requires: redstone-xmlrpc
commit d72488c1e575ba8da501079857f826c07b68fefc Author: Tomas Lestach tlestach@redhat.com Date: Wed Dec 11 16:44:07 2013 +0100
let spacewalk-search require c3p0 >= 0.9.1
that supports ConnectionCustomizer
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index e8f362c..1672840 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch
#Requires: apache-ibatis-sqlmap -Requires: c3p0 +Requires: c3p0 >= 0.9.1 Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli @@ -47,7 +47,7 @@ Requires: simple-core Obsoletes: rhn-search < 5.3.0 BuildRequires: ant #BuildRequires: apache-ibatis-sqlmap -BuildRequires: c3p0 +BuildRequires: c3p0 >= 0.9.1 BuildRequires: jakarta-commons-cli BuildRequires: jakarta-commons-codec BuildRequires: jakarta-commons-httpclient
spacewalk-commits@lists.fedorahosted.org