X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=composer.spec;h=100b9961475ce04eecf7b8595b250f61ca573014;hb=3981fe32c2ffe220f5c87384708bd5f111089fed;hp=b78e22901f9d5afee2cf6b4e3e27f875762f9b35;hpb=9fe8f2af99c1774e22b671f7252d65ad11fc449e;p=packages%2Fcomposer.git

diff --git a/composer.spec b/composer.spec
index b78e229..100b996 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,37 +1,32 @@
 #
 # Conditional build:
-%bcond_with	tests		# build with tests
+%bcond_without	tests		# build with tests
 
-# NOTE
-# - release tarballs: http://getcomposer.org/download/
-
-%define		rel		15
-#define		githash	5744981
-# $ git rev-list 1.0.0-alpha11..%{githash} --count
-#define		commits	216
-%define		subver	alpha11
 %define		php_min_version 5.3.4
 %include	/usr/lib/rpm/macros.php
 Summary:	Dependency Manager for PHP
 Name:		composer
-Version:	1.0.0
-Release:	%{rel}.%{subver}%{?commits:.%{commits}}%{?githash:.g%{githash}}
+Version:	1.2.2
+Release:	1
 License:	MIT
 Group:		Development/Languages/PHP
-#Source0:       https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
-Source0:	https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5:	5e4ff16cff75fae31285196c5f51a8f8
+Source0:	https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	2cdaba60950b7e5fe8061f2585dbe6f6
 Source2:	https://raw.githubusercontent.com/iArren/%{name}-bash-completion/86a8129/composer
 # Source2-md5:	cdeebf0a0da1fd07d0fd886d0461642e
 Source3:	autoload.php
 Patch0:		autoload.patch
 Patch1:		update-memory-limit.patch
 Patch2:		svn-ignore-externals.patch
-Patch3:		version.patch
 URL:		http://www.getcomposer.org/
+BuildRequires:	php-devel
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.673
 %if %{with tests}
+# instead of filling duplicate deps for running tests,
+# update composer version that have neccessary runtime dependencies
+BuildRequires:	composer >= 1.1.0
+BuildRequires:	git-core
 BuildRequires:	phpab
 BuildRequires:	phpunit
 %endif
@@ -49,10 +44,13 @@ Requires:	php(simplexml)
 Requires:	php(spl)
 Requires:	php(zip)
 Requires:	php(zlib)
+Requires:	php-composer-ca-bundle >= 1.0.2
 Requires:	php-composer-semver >= 1.0.0
 Requires:	php-composer-spdx-licenses >= 1.0.0
-Requires:	php-justinrainbow-json-schema >= 1.4
-Requires:	php-seld-jsonlint >= 1.1.2
+Requires:	php-justinrainbow-json-schema >= 1.6
+Requires:	php-psr-Log >= 1.0
+Requires:	php-seld-cli-prompt >= 1.0.0
+Requires:	php-seld-jsonlint >= 1.4
 Requires:	php-seld-phar-utils >= 1.0.0
 Requires:	php-symfony2-ClassLoader >= 2.7.7
 Requires:	php-symfony2-Console >= 2.7.7
@@ -62,6 +60,7 @@ Suggests:	bash-completion-%{name}
 Suggests:	git-core
 Suggests:	mercurial
 Suggests:	subversion
+Conflicts:	satis < 1.0.0-1.alpha1.193
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,12 +84,10 @@ Bash completion for Composer package and dependency manager.
 Pakiet ten dostarcza bashowe uzupełnianie nazw dla Composera.
 
 %prep
-%setup -qc -n %{name}-%{version}-%{release}
-mv composer-*/* .
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 mv composer.lock{,.disabled}
 # NOTE: do not use %{__php} macro here, need unversioned php binary
@@ -98,6 +95,9 @@ mv composer.lock{,.disabled}
 
 cp -p %{SOURCE3} src/Composer/autoload.php
 
+# AutoloadGenerator needs this runtime
+mv LICENSE res
+
 # move to Composer dir, this will simplify testing
 mv res src/Composer
 ln -s src/Composer/res
@@ -105,6 +105,27 @@ ln -s src/Composer/res
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+# needs newer phpunit:
+# missing method PHPUnit_Framework_MockObject_Builder_InvocationMocker::willReturn()
+rm tests/Composer/Test/ApplicationTest.php
+rm tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
+rm tests/Composer/Test/IO/ConsoleIOTest.php
+rm tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
+rm tests/Composer/Test/Package/RootAliasPackageTest.php
+rm tests/Composer/Test/Package/Version/VersionGuesserTest.php
+rm tests/Composer/Test/Repository/ComposerRepositoryTest.php
+rm tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php
+rm tests/Composer/Test/Util/GitHubTest.php
+rm tests/Composer/Test/Util/GitLabTest.php
+# method PHPUnit_Framework_MockObject_Builder_InvocationMocker::withConsecutive()
+rm tests/Composer/Test/Util/BitbucketTest.php
+# Call to undefined method Composer\Test\Repository\Vcs\GitLabDriverTest::prophesize()
+rm tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
+# Mocked method does not exist.
+rm tests/Composer/Test/Installer/LibraryInstallerTest.php
+# Uncaught Error: Call to undefined method Mock_InputInterface_0ced1568::method()
+rm tests/Composer/Test/Command/RunScriptCommandTest.php
+
 %build
 %if %{with tests}
 phpab -n -o src/bootstrap.php -e '*/Fixtures/*' src/ tests/
@@ -126,7 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md CHANGELOG.md LICENSE PORTING_INFO
+%doc README.md CHANGELOG.md PORTING_INFO
+%doc src/Composer/res/LICENSE
 %attr(755,root,root) %{_bindir}/composer
 %{php_data_dir}/Composer