packages: php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec - up t...

[glen]

Author: glen                         Date: Sat Oct  9 16:31:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.1.1

---- Files affected:
packages/php-pear-Science_Chemistry:
   php-pear-Science_Chemistry.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec
diff -u packages/php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec:1.26 packages/php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec:1.27
--- packages/php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec:1.26	Thu Jan 31 13:17:19 2008
+++ packages/php-pear-Science_Chemistry/php-pear-Science_Chemistry.spec	Sat Oct  9 18:31:18 2010
@@ -1,25 +1,22 @@
 # $Revision$, $Date$
 %include	/usr/lib/rpm/macros.php
-%define		_class		Science
-%define		_subclass	Chemistry
 %define		_status		stable
-%define		_pearname	%{_class}_%{_subclass}
-
+%define		_pearname	Science_Chemistry
 Summary:	%{_pearname} - manipulate chemical objects: atoms, molecules, etc
 Summary(pl.UTF-8):	%{_pearname} - manipulacje na klasach obiektów chemicznych
 Name:		php-pear-%{_pearname}
-Version:	1.1.0
-Release:	5
-Epoch:		0
+Version:	1.1.1
+Release:	1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	6ee17eb8ac2b67b31bbf5e222739000c
+# Source0-md5:	536264ef58b9ed19bc0e8ef80e2809fe
 URL:		http://pear.php.net/package/Science_Chemistry/
 BuildRequires:	php-pear-PEAR
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-pear
+Obsoletes:	php-pear-Science_Chemistry-tests
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,47 +35,30 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
-%package tests
-Summary:	Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):	Testy dla PEAR::%{_pearname}
-Group:		Development/Languages/PHP
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-AutoReq:	no
-AutoProv:	no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
-
 %prep
 %pear_package_setup
 
-install -d ./%{php_pear_dir}/tests/%{_pearname}/data
-mv ./%{php_pear_dir}/{%{_class}/%{_subclass}/test/*,tests/%{_pearname}}
-mv ./%{php_pear_dir}/{data/%{_pearname}/%{_subclass}/test/*,tests/%{_pearname}/data}
+install -d docs
+mv .%{php_pear_dir}/data/Science_Chemistry/{README,TODO} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 
+# tests should not be packaged
+rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/tests/%{_pearname}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc install.log
-%doc docs/%{_pearname}/%{_subclass}/*
-%dir %{php_pear_dir}/%{_class}/%{_subclass}/
+%doc docs/*
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
-%{php_pear_dir}/%{_class}/%{_subclass}/*.php
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*
+%{php_pear_dir}/Science/Chemistry.php
+%{php_pear_dir}/Science/Chemistry
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -86,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/10/09 16:31:18  glen
+- up to 1.1.1
+
 Revision 1.26  2008/01/31 12:17:19  glen
 - rel 5
 
================================================================

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