php-pecl-krb5: cleanups for review

1 files changed, 19 insertions, 46 deletions

diff --git a/php-pecl-krb5.spec b/php-pecl-krb5.spec
index 43a2601..424ac03 100644
--- a/php-pecl-krb5.spec
+++ b/php-pecl-krb5.spec
@@ -6,54 +6,37 @@
 #
 # Please, preserve the changelog entries
 #
-%{?scl:          %scl_package         php-pecl-krb5}
-%{!?scl:         %global _root_includedir %{_includedir}}
-%{!?scl:         %global _root_bindir %{_bindir}}
 %{!?php_inidir:  %global php_inidir   %{_sysconfdir}/php.d}
 %{!?php_incldir: %global php_incldir  %{_includedir}/php}
 %{!?__pecl:      %global __pecl       %{_bindir}/pecl}
 %{!?__php:       %global __php        %{_bindir}/php}
 
-%global with_zts  0%{?__ztsphp:1}
 %global pecl_name krb5
+%global with_zts  0%{?__ztsphp:1}
 
 Summary:        Kerberos authentification extension
-Name:           %{?scl_prefix}php-pecl-%{pecl_name}
+Name:           php-pecl-%{pecl_name}
 Version:        1.0.0
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  krb5-devel >= 1.8
 BuildRequires:  pkgconfig(com_err)
-BuildRequires:  %{?scl_prefix}php-devel > 5.2
-BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  php-devel > 5.2
+BuildRequires:  php-pear
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-
-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}
-
-%if "%{?vendor}" == "Remi Collet"
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}
-Obsoletes:     php53u-pecl-%{pecl_name}
-Obsoletes:     php54-pecl-%{pecl_name}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{pecl_name}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-%{pecl_name}
-%endif
-%endif
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
+
+Provides:       php-%{pecl_name} = %{version}
+Provides:       php-%{pecl_name}%{?_isa} = %{version}
+Provides:       php-pecl(%{pecl_name}) = %{version}
+Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter shared private
@@ -75,7 +58,7 @@ Features:
 Summary:       Kerberos extension developer files (header)
 Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
+Requires:      php-devel%{?_isa}
 
 %description devel
 These are the files needed to compile programs using the Kerberos extension.
@@ -86,6 +69,9 @@ These are the files needed to compile programs using the Kerberos extension.
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
+# http://svn.php.net/viewvc?view=revision&revision=333126
+chmod -x php_krb5_gssapi.h
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_KRB5_EXT_VERSION/{s/.* "//;s/".*$//;p}' php_krb5.h)
 if test "x${extver}" != "x%{version}"; then
@@ -112,7 +98,7 @@ export CFLAGS="%{optflags} $(pkg-config --cflags com_err)"
 peclbuild() {
 %configure \
     --with-krb5 \
-    --with-krb5config=%{_root_bindir}/krb5-config \
+    --with-krb5config=%{_bindir}/krb5-config \
 %if "%{php_version}" > "5.5"
     --with-krb5kadm \
 %endif
@@ -132,10 +118,7 @@ peclbuild %{_bindir}/zts-php-config
 
 
 %install
-rm -rf %{buildroot}
-
-make -C NTS \
-     install INSTALL_ROOT=%{buildroot}
+make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini
@@ -144,8 +127,7 @@ install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
-make -C ZTS \
-     install INSTALL_ROOT=%{buildroot}
+make -C ZTS install INSTALL_ROOT=%{buildroot}
 
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
 %endif
@@ -185,12 +167,7 @@ cd ../ZTS
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -204,7 +181,6 @@ rm -rf %{buildroot}
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{pecl_testdir}/%{pecl_name}
 
 %{php_incldir}/ext/%{pecl_name}
@@ -215,8 +191,5 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Mar 19 2014 Remi Collet <rcollet@redhat.com> - 1.0.0-2
-- fix SCL dependencies
-
 * Sat Mar  1 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
 - initial package, version 1.0.0 (stable)
\ No newline at end of file