[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    orion pushed to zabbix (master). "Change %{name} to %{srcname} where needed"
From:       notifications () fedoraproject ! org
Date:       2017-06-30 21:09:09
Message-ID: 20170630210909.8F7ED60468C9 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

From 70939859d8de468bed188ceaf82cdc7e8a05d79a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 30 Jun 2017 15:08:39 -0600
Subject: Change %{name} to %{srcname} where needed

---
 zabbix.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zabbix.spec b/zabbix.spec
index a13bb4b..2bdc3e7 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -422,13 +422,13 @@ touch \
$RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php  
 # Replace bundled font and JS libraries
 # There is no jquery-ui package yet
-rm frontends/php/fonts/DejaVuSans.ttf && ln -sf \
%{_datadir}/fonts/dejavu/DejaVuSans.ttf \
                $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/DejaVuSans.ttf
-rm frontends/php/js/vendor/jquery.js && ln -sf \
%{_datadir}/web-assets/jquery/1/jquery.js \
                $RPM_BUILD_ROOT%{_datadir}/%{name}/js/vendor/jquery.js 
-rm frontends/php/js/vendor/prototype.js && ln -sf %{_datadir}/prototype/prototype.js \
$RPM_BUILD_ROOT%{_datadir}/%{name}/js/vendor/prototype.js  +rm \
frontends/php/fonts/DejaVuSans.ttf && ln -sf %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
$RPM_BUILD_ROOT%{_datadir}/%{srcname}/fonts/DejaVuSans.ttf +rm \
frontends/php/js/vendor/jquery.js && ln -sf %{_datadir}/web-assets/jquery/1/jquery.js \
$RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendor/jquery.js  +rm \
frontends/php/js/vendor/prototype.js && ln -sf %{_datadir}/prototype/prototype.js \
$RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendor/prototype.js   
 # Move MVC override directory out; We are not owning or creating this directory!
 #TODO: README dort
-rm -r frontends/php/local/ && ln -sf %{_usr}/local/share/zabbix/local \
$RPM_BUILD_ROOT%{_datadir}/%{name}/local +rm -r frontends/php/local/ && ln -sf \
%{_usr}/local/share/zabbix/local $RPM_BUILD_ROOT%{_datadir}/%{srcname}/local  #TODO: \
local vielleicht doch unter /etc/zabbix/web?  
 # This file is used to switch the frontend to maintenance mode
-- 
cgit v1.1


	https://src.fedoraproject.org/cgit/zabbix.git/commit/?h=master&id=70939859d8de468bed188ceaf82cdc7e8a05d79a
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org


[prev in list] [next in list] [prev in thread] [next in thread]