Skip to content

Commit

Permalink
Merge branch 'Lynx-12.7.0' of https://github.com/kaltura/platform-ins…
Browse files Browse the repository at this point in the history
…tall-packages into Lynx-12.7.0
  • Loading branch information
Jess Portnoy committed Dec 22, 2016
2 parents 6c5120d + 64c150a commit ef8fbc5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions RPM/SPECS/kaltura-base.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Summary: Kaltura Open Source Video Platform
Name: kaltura-base
Version: 12.7.0
Release: 6
Release: 7
License: AGPLv3+
Group: Server/Platform
Source0: https://github.com/kaltura/server/archive/%{codename}-%{version}.zip
Expand All @@ -30,7 +30,7 @@ Source19: IndexController.php
Source20: sphinx.populate.template.rc
Source25: kaltura_populate.template
Source26: kaltura_batch.template
Source28: embedIframeJsAction.class.php
#Source28: embedIframeJsAction.class.php
Source32: KDLOperatorFfmpeg1_1_1.php
#Source33: kuserPeer.php
Source34: clients-generator-%{codename}-%{version}.zip
Expand Down Expand Up @@ -149,7 +149,7 @@ cp %{SOURCE17} $RPM_BUILD_ROOT%{prefix}/app/admin_console/configs/navigation.xml
cp %{SOURCE18} $RPM_BUILD_ROOT%{prefix}/app/admin_console/views/scripts/index/monit.phtml
cp %{SOURCE19} $RPM_BUILD_ROOT%{prefix}/app/admin_console/controllers/IndexController.php
# patch for auto embed to work, should be dropped when core merge.
cp %{SOURCE28} $RPM_BUILD_ROOT%{prefix}/app/alpha/apps/kaltura/modules/extwidget/actions/embedIframeJsAction.class.php
#cp %{SOURCE28} $RPM_BUILD_ROOT%{prefix}/app/alpha/apps/kaltura/modules/extwidget/actions/embedIframeJsAction.class.php
# we bring a1nother in kaltura-batch
rm $RPM_BUILD_ROOT%{prefix}/app/configurations/batch/batch.ini.template
cp %{SOURCE32} $RPM_BUILD_ROOT%{prefix}/app/infra/cdl/kdl/KDLOperatorFfmpeg1_1_1.php
Expand Down

0 comments on commit ef8fbc5

Please sign in to comment.