php-password-compat: 1.0.4HEADmaster

1 files changed, 33 insertions, 21 deletions

diff --git a/php-password-compat.spec b/php-password-compat.spec
index bce1137..1e2880b 100644
--- a/php-password-compat.spec
+++ b/php-password-compat.spec
@@ -1,27 +1,36 @@
-%global commit 58151cf24e73119576c2a016393120f9c146448b
+%global commit 5c5cde8822a69545767f7c7f3058cb15ff84614c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global real_name password_compat
 
 
 Name:           php-password-compat
-Version:        1.0.0
-Release:        4.git%{shortcommit}%{?dist}
-Summary:        PHP password_* function for PHP 5.3 and 5.4
+Version:        1.0.4
+Release:        1%{?dist}
+Summary:        PHP password_* functions for PHP 5.3 and 5.4
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/ircmaxell/password_compat
-Source0:        https://github.com/ircmaxell/%{real_name}/archive/%{commit}/%{real_name}-%{version}-%{shortcommit}.tar.gz
+# Upstream tests are exclude from archive
+# git clone https://github.com/ircmaxell/password_compat.git
+# cd password_compat;  git checkout v1.0.4
+# cd ..; tar cvJf password_compat-1.0.4.tar.xz --exclude .git* password_compat
+Source0:        %{real_name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires:  php-phpunit-PHPUnit
 
-Requires:       php(language) >= 5.3.7
-Requires:       php-mcrypt
+Requires:       php(language) >= 5.3.3
+# From phpcompatinfo report for 1.0.4
 Requires:       php-openssl
 Requires:       php-pcre
+# Option
+Requires:       php-mbstring
+# Optional and ignored php-mcrypt
+
+Provides:       php-composer(ircmaxell/password-compat) = %{version}
 
 
 %description
@@ -30,7 +39,7 @@ being worked on for PHP 5.5
 
 
 %prep
-%setup -q -n %{real_name}-%{commit}
+%setup -q -n %{real_name}
 
 
 %build
@@ -41,28 +50,31 @@ being worked on for PHP 5.5
 # create needed directories
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/%{real_name}
 install -m 0644 -p lib/password.php $RPM_BUILD_ROOT%{_datadir}/php/%{real_name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/tests/%{real_name}
-cp -pr test $RPM_BUILD_ROOT%{_datadir}/tests/%{real_name}
 
 %check
-cd test
-
-# Version 1.0.0-1-git58121cf : OK (30 tests, 30 assertions)
+# Version 1.0.4: OK (32 tests, 32 assertions)
 %{_bindir}/phpunit
 
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.md README.md composer.json
-%dir %{_datadir}/php/%{real_name}
-%{_datadir}/php/%{real_name}/*
-%dir %{_datadir}/tests
-%dir %{_datadir}/tests/%{real_name}
-%{_datadir}/tests/%{real_name}/*
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.md
+%doc README.md composer.json
+%{_datadir}/php/%{real_name}/
 
 
 %changelog
-* Tue Jan 29 2013 Remi Collet <rpms@fedoraproject.org> - 1.0.0-4.git5815cf
+* Thu Nov 27 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-1
+- update to 1.0.4 #1168498
+- drop test from package
+- provide php-composer(ircmaxell/password-compat)
+- source from git clone (for tests)
+- fix license handling
+- drop dependency on php-mcrypt #1091225
+- add dependency on optional php-mbstring
+
+* Tue Jan 29 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-4.git5815cf
 - backport for remi repo
 
 * Tue Jan 29 2013 Johan Cwiklinski <johan AT x-tnd DOT be> - 1.0.0-4.git5815cf