summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-solr2.spec59
1 files changed, 17 insertions, 42 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index 72f9042..162110c 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -7,13 +7,11 @@
#
# Please, preserve the changelog entries
#
-%{?scl: %scl_package php-pecl-solr2}
%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
%{!?__pecl: %global __pecl %{_bindir}/pecl}
%{!?__php: %global __php %{_bindir}/php}
%global pecl_name solr
-#global prever b
%global with_zts 0%{?__ztsphp:1}
%if "%{php_version}" < "5.6"
# After curl, json
@@ -25,57 +23,41 @@
Summary: Object oriented API to Apache Solr
Summary(fr): API orientée objet pour Apache Solr
-Name: %{?scl_prefix}php-pecl-solr2
+Name: php-pecl-solr2
Version: 2.0.0
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/solr
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{?scl_prefix}php-devel
-BuildRequires: %{?scl_prefix}php-pear
-BuildRequires: %{?scl_prefix}php-curl
-BuildRequires: %{?scl_prefix}php-json
+BuildRequires: php-devel
+BuildRequires: php-pear
+BuildRequires: php-curl
+BuildRequires: php-json
BuildRequires: curl-devel
BuildRequires: libxml2-devel
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
-Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires: %{?scl_prefix}php(api) = %{php_core_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
%if "%{php_version}" < "5.4"
# php 5.3.3 in EL-6 don't use arched virtual provides
# so only requires real packages instead
-Requires: %{?scl_prefix}php-common%{?_isa}
+Requires: php-common%{?_isa}
%else
-Requires: %{?scl_prefix}php-curl%{?_isa}
-Requires: %{?scl_prefix}php-json%{?_isa}
+Requires: php-curl%{?_isa}
+Requires: php-json%{?_isa}
%endif
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-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}
+Provides: php-%{pecl_name} = %{version}
+Provides: php-%{pecl_name}%{?_isa} = %{version}
+Provides: php-pecl(%{pecl_name}) = %{version}
+Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}
# Only one version of the extension
-Conflicts: %{?scl_prefix}php-pecl-solr < 2
-
-%if "%{?vendor}" == "Remi Collet"
-Obsoletes: php53-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php53u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php54-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php54w-pecl-%{pecl_name}2 <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php55w-pecl-%{pecl_name}2 <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version}
-%endif
-%endif
+Conflicts: php-pecl-solr < 2
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
# Filter shared private
@@ -150,8 +132,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make -C NTS install INSTALL_ROOT=%{buildroot}
# Install XML package description
@@ -165,7 +145,6 @@ make -C ZTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
-
# Test & Documentation
for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
@@ -223,12 +202,7 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-, root, root, -)
%doc %{pecl_docdir}/%{pecl_name}
%doc %{pecl_testdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -245,6 +219,7 @@ rm -rf %{buildroot}
%changelog
* Tue Jun 24 2014 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
- update to 2.0.0
+- cleanup for review
* Mon Jun 23 2014 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4
- test build before 2.0.0 finale