From e4dfb813def69f05923ee23fed87f72e7fd9c934 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 3 Nov 2015 08:19:51 +0100
Subject: apigen: drop dependencies on herrera deprecated lib.

---
 apigen.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'apigen.spec')

diff --git a/apigen.spec b/apigen.spec
index f86ceac..dc81463 100644
--- a/apigen.spec
+++ b/apigen.spec
@@ -17,7 +17,7 @@
 
 Name:           %{c_project}
 Version:        4.1.1
-%global specrel 1
+%global specrel 2
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        PHP source code API generator
 
@@ -29,6 +29,7 @@ Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 # Use RPM autoloader
+# and drop Herrera dependencies (only used for phar selfupdate command)
 Patch0:         %{name}-rpm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +53,6 @@ BuildRequires:  php-composer(kdyby/events) >= 2.0
 BuildRequires:  php-composer(symfony/options-resolver) >= 2.6.1
 BuildRequires:  php-composer(symfony/console) >= 2.6
 BuildRequires:  php-composer(symfony/yaml) >= 2.3
-BuildRequires:  php-composer(herrera-io/phar-update) >= 2.0
 BuildRequires:  php-composer(apigen/theme-default) >= 1.0.1
 BuildRequires:  php-composer(apigen/theme-bootstrap) >= 1.1.2
 BuildRequires:  php-iconv
@@ -68,7 +68,6 @@ BuildRequires:  php-composer(symfony/class-loader)
 #        "herrera-io/box": "~1.6"
 # mockery 0.9.3 for autoloader
 BuildRequires:  php-composer(mockery/mockery) >= 0.9.3
-BuildRequires:  php-composer(herrera-io/box) >= 1.6
 %endif
 
 # from composer.json, "require": {
@@ -125,8 +124,6 @@ Requires:       php-composer(symfony/console) >= 2.6
 Requires:       php-composer(symfony/console) <  3
 Requires:       php-composer(symfony/yaml) >= 2.3
 Requires:       php-composer(symfony/yaml) <  3
-Requires:       php-composer(herrera-io/phar-update) >= 2.0
-Requires:       php-composer(herrera-io/phar-update) <  3
 Requires:       php-composer(apigen/theme-default) >= 1.0.1
 Requires:       php-composer(apigen/theme-default) <  1.1
 Requires:       php-composer(apigen/theme-bootstrap) >= 1.1.2
@@ -152,7 +149,12 @@ Smart and Readable Documentation for your PHP project.
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
+%patch0 -p1 -b .rpm
+rm -r tests/Herrera
+rm -r src/Herrera
+rm    src/Command/SelfUpdateCommand.php
+
+find src -name \*rpm -exec rm {} \;
 
 
 %build
@@ -194,5 +196,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov  3 2015 Remi Collet <remi@fedoraproject.org> - 4.1.1-2
+- drop herrera from dependencies (only used for phar
+  selfupdate command)
+
 * Sun Nov  1 2015 Remi Collet <remi@fedoraproject.org> - 4.1.1-1
 - initial package
\ No newline at end of file
-- 
cgit