From e21cc8a3c921c6d51697fca2193e83899cc540af Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 20 Jun 2014 15:11:02 +0200 Subject: php-pecl-solr: 1.1.1 (stable) --- REFLECTION | 6 ++--- bootstrap.inc | 5 ---- php-pecl-solr.spec | 40 +++++++++----------------------- response_xml.1.xml | 5 ---- skip.if.server_not_configured.inc | 7 ------ test.config.inc | 49 --------------------------------------- 6 files changed, 14 insertions(+), 98 deletions(-) delete mode 100644 bootstrap.inc delete mode 100644 response_xml.1.xml delete mode 100644 skip.if.server_not_configured.inc delete mode 100644 test.config.inc diff --git a/REFLECTION b/REFLECTION index cd88db0..4e2ab69 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #162 solr version 1.1.0 ] { +Extension [ extension #169 solr version 1.1.1 ] { - Dependencies { Dependency [ libxml (Required) ] @@ -8,8 +8,8 @@ Extension [ extension #162 solr version 1.1.0 ] { - Constants [4] { Constant [ integer SOLR_MAJOR_VERSION ] { 1 } Constant [ integer SOLR_MINOR_VERSION ] { 1 } - Constant [ integer SOLR_PATCH_VERSION ] { 0 } - Constant [ string SOLR_EXTENSION_VERSION ] { 1.1.0 } + Constant [ integer SOLR_PATCH_VERSION ] { 1 } + Constant [ string SOLR_EXTENSION_VERSION ] { 1.1.1 } } - Functions { diff --git a/bootstrap.inc b/bootstrap.inc deleted file mode 100644 index 0a3912d..0000000 --- a/bootstrap.inc +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec index b757476..abc8010 100644 --- a/php-pecl-solr.spec +++ b/php-pecl-solr.spec @@ -25,7 +25,7 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages @@ -33,15 +33,6 @@ URL: http://pecl.php.net/package/solr Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/bootstrap.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c -Source1: bootstrap.inc -# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/test.config.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c -Source2: test.config.inc -# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/skip.if.server_not_configured.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c -Source3: skip.if.server_not_configured.inc -# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/files/response_xml.1.xml;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c -Source4: response_xml.1.xml - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -68,17 +59,19 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?vendor}" == "Remi Collet" # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} Obsoletes: php53u-pecl-%{pecl_name} -%if "%{php_version}" > "5.4" -Obsoletes: php54-pecl-%{pecl_name} -%endif +Obsoletes: php54w-pecl-%{pecl_name} %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55w-pecl-%{pecl_name} %endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -144,26 +137,12 @@ PECL Solr 2 est disponible dans le paquet php-pecl-solr2. mv %{pecl_name}-%{version}%{?prever} NTS cd NTS -# Restore missing file in archive -cp %{SOURCE1} %{SOURCE2} %{SOURCE3} tests/ -mkdir tests/files -cp %{SOURCE4} tests/files/ - # Check version extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' php_solr_version.h) if test "x${extver}" != "x%{version}"; then : Error: Upstream version is ${extver}, expecting %{version}. exit 1 fi - -# Fix rights -chmod -x README.* \ - CREDITS \ - LICENSE \ - TODO \ - docs/documentation.php \ - *.c \ - *.h cd .. # Create configuration file @@ -240,7 +219,7 @@ TEST_PHP_ARGS="-n $DEP -d extension=$PWD/modules/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__php} \ - %{__php} \ + %{__php} -n \ run-tests.php %if %{with_zts} @@ -255,7 +234,7 @@ TEST_PHP_ARGS="-n $DEP -d extension=$PWD/modules/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__ztsphp} \ - %{__ztsphp} \ + %{__ztsphp} -n \ run-tests.php %endif @@ -280,6 +259,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 20 2014 Remi Collet - 1.1.1-1 +- Update to 1.1.1 (stable) + * Thu Jun 19 2014 Remi Collet - 1.1.0-1 - Update to 1.1.0 (stable) diff --git a/response_xml.1.xml b/response_xml.1.xml deleted file mode 100644 index 9a24708..0000000 --- a/response_xml.1.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -07215151321http-8983-3WAITINGorg.apache.tomcat.util.net.JIoEndpoint$Worker@1bf68a960.0000ms40.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:416)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:442)java.lang.Thread.run(Thread.java:595)20http-8983-2WAITINGorg.apache.tomcat.util.net.JIoEndpoint$Worker@1706eb70.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:416)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:442)java.lang.Thread.run(Thread.java:595)19http-8983-1RUNNABLE160.0000ms160.0000mssun.management.ThreadImpl.getThreadInfo0(Native Method)sun.management.ThreadImpl.getThreadInfo(ThreadImpl.java:142)org.apache.solr.handler.admin.ThreadDumpHandler.handleRequestBody(ThreadDumpHandler.java:73)org.apache.solr.handler.RequestHandlerBase.handleRequest(RequestHandlerBase.java:131)org.apache.solr.core.SolrCore.execute(SolrCore.java:1299)org.apache.solr.servlet.SolrDispatchFilter.execute(SolrDispatchFilter.java:338)org.apache.solr.servlet.SolrDispatchFilter.doFilter(SolrDispatchFilter.java:241)org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:286)org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:845)org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:447)java.lang.Thread.run(Thread.java:595)17TP-MonitorTIMED_WAITINGorg.apache.tomcat.util.threads.ThreadPool$MonitorRunnable@74db2c0.0000ms0.0000msjava.lang.Object.wait(Native Method)org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565)java.lang.Thread.run(Thread.java:595)16TP-Processor4RUNNABLEtrue0.0000ms0.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:306)org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:660)org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:870)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)java.lang.Thread.run(Thread.java:595)15TP-Processor3WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@1e164830.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)14TP-Processor2WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@8ddb930.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)13TP-Processor1WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@14ab51b0.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)12http-8983-Acceptor-0RUNNABLEtrue0.0000ms0.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61)org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:310)java.lang.Thread.run(Thread.java:595)11ContainerBackgroundProcessor[StandardEngine[Catalina]]TIMED_WAITING1400.0000ms920.0000msjava.lang.Thread.sleep(Native Method)org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579)java.lang.Thread.run(Thread.java:595)10pool-1-thread-1WAITING100.0000ms100.0000mssun.misc.Unsafe.park(Native Method)java.util.concurrent.locks.LockSupport.park(LockSupport.java:118)java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(AbstractQueuedSynchronizer.java:1841)java.util.concurrent.LinkedBlockingQueue.take(LinkedBlockingQueue.java:359)java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:470)java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:674)java.lang.Thread.run(Thread.java:595)4Signal DispatcherRUNNABLE0.0000ms0.0000ms3FinalizerWAITINGjava.lang.ref.ReferenceQueue$Lock@1b82d690.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:120)java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:136)java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159)2Reference HandlerWAITINGjava.lang.ref.Reference$Lock@ad65130.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116)1mainRUNNABLEtrue3340.0000ms3180.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.catalina.core.StandardServer.await(StandardServer.java:389)org.apache.catalina.startup.Catalina.await(Catalina.java:642)org.apache.catalina.startup.Catalina.start(Catalina.java:602)sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)java.lang.reflect.Method.invoke(Method.java:585)org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288)org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) - - \ No newline at end of file diff --git a/skip.if.server_not_configured.inc b/skip.if.server_not_configured.inc deleted file mode 100644 index 583a72e..0000000 --- a/skip.if.server_not_configured.inc +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/test.config.inc b/test.config.inc deleted file mode 100644 index 4fba603..0000000 --- a/test.config.inc +++ /dev/null @@ -1,49 +0,0 @@ - -- cgit