packages: php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec - ...

[glen]

Author: glen                         Date: Wed Jan 20 11:30:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package config to /etc/pear; rel 3

---- Files affected:
packages/php-pear-Services_Amazon_SQS:
   php-pear-Services_Amazon_SQS.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec
diff -u packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec:1.2 packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec:1.3
--- packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec:1.2	Sun Mar 29 00:28:50 2009
+++ packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec	Wed Jan 20 12:30:12 2010
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - -cli subpackage for CLI tools (bin+config)?
 %include	/usr/lib/rpm/macros.php
 %define		_class		Services
 %define		_subclass	Amazon_SQS
@@ -8,22 +10,26 @@
 Summary(pl.UTF-8):	API PHP oraz narzędzia do obsługi Amazon SQS
 Name:		php-pear-%{_pearname}
 Version:	0.1.0
-Release:	2
+Release:	3
 License:	Apache v2.0
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	56adf2ee5af123d1a0f9a3c6f74093a5
 URL:		http://pear.php.net/package/Services_Amazon_SQS/
-BuildRequires:	php-pear-PEAR
+BuildRequires:	php-pear-PEAR >= 1:1.7.2-9
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-pear
 Requires:	php-pear-Console_Getopt
 Requires:	php-pear-Crypt_HMAC2 >= 0.2.1
 Requires:	php-pear-HTTP_Request2 >= 0.1.0
-Requires:	php-pear-PEAR >= 1.7.0
+Requires:	php-pear-PEAR-core >= 1:1.7.2-9
 BuildArch:	noarch
+Requires:	php-pear-PEAR >= 1:1.7.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir		%(pear config-get cfg_dir 2>/dev/null || ERROR)/%{_pearname}
+
 %description
 This package provides an object-oriented interface to the Amazon
 Simple Queue Service (SQS). Included are client libraries and a
@@ -46,9 +52,9 @@
 Summary:	Tests for PEAR::%{_pearname}
 Summary(pl.UTF-8):	Testy dla PEAR::%{_pearname}
 Group:		Development/Languages/PHP
-AutoReq:	no
 Requires:	%{name} = %{version}-%{release}
 AutoProv:	no
+AutoReq:	no
 
 %description tests
 Tests for PEAR::%{_pearname}.
@@ -59,11 +65,16 @@
 %prep
 %pear_package_setup
 
+# pear/tests/pearname/tests -> pear/tests/pearname
+mv ./%{php_pear_dir}/tests/%{_pearname}/{tests/*,}
+rmdir ./%{php_pear_dir}/tests/%{_pearname}/tests
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir},%{_sysconfdir}}
 %pear_package_install
-install {./,$RPM_BUILD_ROOT}%{_bindir}/sqs
+install -p {./,$RPM_BUILD_ROOT}%{_bindir}/sqs
+cp -a {./,$RPM_BUILD_ROOT}%{_sysconfdir}/sqs.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,17 +82,19 @@
 %files
 %defattr(644,root,root,755)
 %doc install.log
-%attr(755,root,root) %{_bindir}/sqs
-%dir %{php_pear_dir}/Services/Amazon
-%dir %{php_pear_dir}/cfg/Services_Amazon_SQS
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/cfg/Services_Amazon_SQS/sqs.ini
-%{php_pear_dir}/Services/Amazon/SQS
+%dir %{php_pear_dir}/Services/Amazon
 %{php_pear_dir}/Services/Amazon/SQS.php
+%{php_pear_dir}/Services/Amazon/SQS
+
+# - cli?
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sqs.ini
+%attr(755,root,root) %{_bindir}/sqs
 
 %files tests
 %defattr(644,root,root,755)
-%{php_pear_dir}/tests/Services_Amazon_SQS
+%{php_pear_dir}/tests/%{_pearname}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,9 +102,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/20 11:30:12  glen
+- package config to /etc/pear; rel 3
+
 Revision 1.2  2009/03/28 23:28:50  areq
 - rel 2, add missing dirs
 
 Revision 1.1  2009/01/11 00:16:42  adamg
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-Services_Amazon_SQS/php-pear-Services_Amazon_SQS.spec?r1=1.2&r2=1.3&f=u