From 21f2c80a52bec149b70a12df035134f0258733bc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 11 Jan 2014 15:23:18 +0100 Subject: php-doctrine-collections: backport --- Makefile | 4 ++++ php-doctrine-collections.spec | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/php-doctrine-collections.spec b/php-doctrine-collections.spec index e472901..449d517 100644 --- a/php-doctrine-collections.spec +++ b/php-doctrine-collections.spec @@ -18,6 +18,7 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # For tests BuildRequires: php(language) >= %{php_min_ver} @@ -45,6 +46,7 @@ Conflicts: php-pear(pear.doctrine-project.org/DoctrineCommon) < 2.4 %install +rm -rf %{buildroot} mkdir -p %{buildroot}/%{_datadir}/php cp -rp lib/* %{buildroot}/%{_datadir}/php/ @@ -66,7 +68,12 @@ sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml %{_bindir}/phpunit --include-path ./lib:./tests -d date.timezone="UTC" +%clean +rm -rf %{buildroot} + + %files +%defattr(-,root,root,-) %doc LICENSE *.md composer.json %dir %{_datadir}/php/Doctrine %dir %{_datadir}/php/Doctrine/Common @@ -74,6 +81,9 @@ sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml %changelog +* Sat Jan 11 2014 Remi Collet 1.1-3.20131221git8198717 +- backport for remi repo + * Mon Jan 06 2014 Shawn Iwinski 1.1-3.20131221git8198717 - Minor syntax changes -- cgit