diff --git a/.gitignore b/.gitignore index c2fad47..ff7dbb5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ package-*.xml /rrd-1.0.3.tgz /rrd-1.0.4.tgz +/rrd-1.0.5.tgz diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec index 9d0c620..8532f14 100644 --- a/php-pecl-rrd.spec +++ b/php-pecl-rrd.spec @@ -5,9 +5,9 @@ Summary: PHP Bindings for rrdtool Name: php-pecl-rrd -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} -License: PHP +License: BSD Group: Development/Languages URL: http://pecl.php.net/package/rrd @@ -42,6 +42,17 @@ system for time series data. %prep %setup -c -q +extver=$(sed -n '/#define PHP_RRD_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}%{?pre}/php_rrd.h) +if test "x${extver}" != "x%{version}%{?pre}"; then + : Error: Upstream version is ${extver}, expecting %{version}. + exit 1 +fi + +cat > %{pecl_name}.ini << 'EOF' +; Enable %{pecl_name} extension module +extension=%{pecl_name}.so +EOF + %build cd %{pecl_name}-%{version} @@ -52,20 +63,14 @@ make %{?_smp_mflags} %install -cd %{pecl_name}-%{version} rm -rf %{buildroot} -make install INSTALL_ROOT=%{buildroot} +make install -C %{pecl_name}-%{version}%{?pre} INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration -mkdir -p %{buildroot}%{_sysconfdir}/php.d -cat > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF' -; Enable %{pecl_name} extension module -extension=%{pecl_name}.so -EOF +install -D -m 644 %{pecl_name}.ini %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini # Install XML package description -mkdir -p %{buildroot}%{pecl_xmldir} -install -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml +install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %check @@ -119,6 +124,10 @@ fi %changelog +* Fri Nov 18 2011 Remi Collet 1.0.5-1 +- update to 1.0.5 +- change license from PHP to BSD + * Tue Aug 16 2011 Remi Collet 1.0.4-1 - Version 1.0.4 (stable) - API 1.0.4 (stable) - fix filters diff --git a/sources b/sources index e33c4fd..2843caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a0a88fae41d9d9858eaaa3e59f82f22 rrd-1.0.4.tgz +71def9c2bbe192769b9c929f4180db14 rrd-1.0.5.tgz