From 5682686a4e81a7d8bb65024bc3ab4ab2ede465ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 22 May 2014 01:34:57 +0300 Subject: [PATCH] use virtual names for php deps --- CodeIgniter.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/CodeIgniter.spec b/CodeIgniter.spec index 7265e3c..dfffabf 100644 --- a/CodeIgniter.spec +++ b/CodeIgniter.spec @@ -15,16 +15,16 @@ BuildRequires: rpm-php-pearprov >= 4.3 BuildRequires: rpmbuild(macros) >= 1.461 BuildRequires: sed >= 4.0 BuildRequires: unzip -Requires: php-common >= 4:%{php_min_version} -Requires: php-ctype -Requires: php-date -Requires: php-hash -Requires: php-mbstring -Requires: php-mysql -Requires: php-pcre -Requires: php-session -Requires: php-simplexml -Requires: php-spl +Requires: php(core) >= %{php_min_version} +Requires: php(ctype) +Requires: php(date) +Requires: php(hash) +Requires: php(mbstring) +Requires: php(mysql) +Requires: php(pcre) +Requires: php(session) +Requires: php(simplexml) +Requires: php(spl) BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,16 +52,15 @@ CodeIgniter documentation. %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT%{_appdir} -install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - cp -r index.php application system $RPM_BUILD_ROOT%{_appdir} cp -r user_guide/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -install %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} + +install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -d $RPM_BUILD_ROOT%{_bindir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} +install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} find $RPM_BUILD_ROOT%{_datadir}/%{name} -name index.html -delete -- 2.44.0