From 339d121342267ad8942a119f6866cea39de02859 Mon Sep 17 00:00:00 2001 From: Michal Novotny Date: Aug 11 2011 15:01:50 +0000 Subject: Rebase to 0.4.3 for bz #683071 --- diff --git a/.gitignore b/.gitignore index b3b2a8c..76c7e38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libvirt-php-0.4.1.tar.gz +/php-libvirt-0.4.3.tar.gz diff --git a/php-libvirt.spec b/php-libvirt.spec index 20468dd..9617332 100644 --- a/php-libvirt.spec +++ b/php-libvirt.spec @@ -3,14 +3,14 @@ %define php_extdir %{_libdir}/php/modules Name: php-libvirt -Version: 0.4.1 -Release: 5%{?dist}%{?extra_release} +Version: 0.4.3 +Release: 1%{?dist}%{?extra_release} Summary: PHP language binding for Libvirt Group: Development/Libraries License: LGPLv2+ URL: http://libvirt.org/php -Source0: http://libvirt.org/sources/php/libvirt-php-%{version}.tar.gz +Source0: http://libvirt.org/sources/php/php-libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php-devel @@ -19,20 +19,35 @@ BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: xhtml1-dtds Requires: libvirt >= %{req_libvirt_version} +Requires: php Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +%define debug_package %{nil} %global _use_internal_dependency_generator 0 %description PHP language bindings for Libvirt API. For more details see: http://www.libvirt.org/php/ +%package -n php-libvirt-doc +Summary: Document of php-libvirt +Group: Development/Libraries +BuildArch: noarch +Requires: php-libvirt = %{version} + +%description -n php-libvirt-doc +PHP language bindings for Libvirt API. +For more details see: http://www.libvirt.org/php/ http://www.php.net/ + +This package contain the document for php-libvirt. + %prep -%setup -q -n libvirt-php-%{version} +%setup -q -n php-libvirt-%{version} %build -%configure --with-html-dir=%{_datadir}/doc --with-html-subdir=%{name}-%{version}/html --libdir=%{php_extdir} +%configure +./configure --with-html-dir=%{_datadir}/doc --with-html-subdir=%{name}-%{version}/html --libdir=%{php_extdir} make %{?_smp_mflags} %install @@ -44,11 +59,20 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc LICENSE README html +%doc %{php_extdir}/php-libvirt.so %config(noreplace) %{php_confdir}/php-libvirt.ini +%files -n php-libvirt-doc +%defattr(-,root,root,-) +%doc README +%dir %{_datadir}/doc/%{name}-%{version} +%{_datadir}/doc/%{name}-%{version}/html + %changelog +* Thu Aug 11 2011 Michal Novotny - 0.4.3 +- Rebase to 0.4.3 from master branch + * Tue Apr 19 2011 Michal Novotny - 0.4.1-5 - Minor memory leak fixes - Several bug fixes diff --git a/sources b/sources index eff8121..5e3d194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ad22f98bcbd9e3c2cf88db38e903744 libvirt-php-0.4.1.tar.gz +942faa45fee7dfe808ff1fc6d1a9c91e php-libvirt-0.4.3.tar.gz