From f89118000e8214707f8ae64ac0168274fc894449 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Mar 2013 15:04:38 +0100 Subject: php-pecl-msgpack: cleanup for review --- php-pecl-msgpack.spec | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'php-pecl-msgpack.spec') diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index a7374d8..745d542 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -1,4 +1,6 @@ -%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} +%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}} +%{!?php_incldir: %{expand: %%global php_incldir %{_includedir}/php}} +%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %global with_zts 0%{?__ztsphp:1} %global pecl_name msgpack @@ -6,7 +8,7 @@ Summary: API for communicating with MessagePack serialization Name: php-pecl-msgpack Version: 0.5.5 -Release: 1%{?dist}.2 +Release: 2%{?dist} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/msgpack @@ -15,8 +17,8 @@ Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz # https://github.com/msgpack/msgpack-php/issues/16 Patch0: %{pecl_name}.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: php-devel, php-pear +BuildRequires: php-devel +BuildRequires: php-pear Requires(post): %{__pecl} Requires(postun): %{__pecl} @@ -28,17 +30,6 @@ Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} -# 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 -%if "%{php_version}" > "5.5" -Obsoletes: php55-pecl-%{pecl_name} -%endif - - # Filter private shared %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} %{?filter_setup} @@ -74,10 +65,8 @@ These are the files needed to compile programs using MessagePack serializer. %setup -q -c cd %{pecl_name}-%{version} - %patch0 -p1 -b .build - # When this file will be removed, clean the description. [ -f EXPERIMENTAL ] || exit 1 @@ -122,10 +111,9 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C %{pecl_name}-%{version} install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{pecl_name}.ini %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini +install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini # Install the ZTS stuff %if %{with_zts} @@ -167,26 +155,21 @@ if [ $1 -eq 0 ] ; then fi -%clean -rm -rf %{buildroot} - - %files -%defattr(-, root, root, 0755) %doc %{pecl_name}-%{version}/{ChangeLog,CREDITS,LICENSE,README.md} %{pecl_xmldir}/%{name}.xml -%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini +%config(noreplace) %{php_inidir}/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so %if %{with_zts} -%{php_ztsextdir}/%{pecl_name}.so %config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini +%{php_ztsextdir}/%{pecl_name}.so %endif + %files devel -%defattr(-, root, root, 0755) -%{_includedir}/php/ext/%{pecl_name} +%{php_incldir}/ext/%{pecl_name} %if %{with_zts} %{php_ztsincldir}/ext/%{pecl_name} @@ -194,6 +177,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 26 2013 Remi Collet - 0.5.5-2 +- cleanups + * Wed Feb 20 2013 Remi Collet - 0.5.5-1 - Update to 0.5.5 -- cgit