]> review.fuel-infra Code Review - openstack-build/horizon-build.git/commitdiff
Remove RHOS patches
authorRoman Vyalov <rvyalov@mirantis.com>
Tue, 15 Apr 2014 11:03:48 +0000 (15:03 +0400)
committerRoman Vyalov <rvyalov@mirantis.com>
Tue, 15 Apr 2014 14:01:01 +0000 (18:01 +0400)
https://bugs.launchpad.net/fuel/+bug/1307996
Change-Id: I679d84c4d98d61799acaa425d02575f29dbd1fd3

rpm/SPECS/python-django-horizon.spec

index a7e34bc50aa66382e8d0840625449ab20d0b95bf..4e6a60be08d83de4980945c3885a2babc3424f9f 100755 (executable)
@@ -156,8 +156,8 @@ Customization module for OpenStack Dashboard to provide a branded logo.
 
 %prep
 %setup -q -n horizon-%{version}
-# Use git to manage patches.
-# http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/
+# Use git to manage patches.           
+# http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/            
 git init
 git config user.email "python-django-horizon-owner@fedoraproject.org"
 git config user.name "python-django-horizon"
@@ -241,8 +241,8 @@ cp manage.py %{buildroot}%{_datadir}/openstack-dashboard
 rm -rf %{buildroot}%{python_sitelib}/openstack_dashboard
 
 # move customization stuff to /usr/share
-mv openstack_dashboard/dashboards/theme %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/
-mv openstack_dashboard/enabled/_99_customization.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/enabled
+#mv openstack_dashboard/dashboards/theme %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/
+#mv openstack_dashboard/enabled/_99_customization.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/enabled
 
 
 # Move config to /etc, symlink it back to /usr/share
@@ -326,7 +326,7 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/settings
 %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/__init__.py*
 %{_datadir}/openstack-dashboard/openstack_dashboard/enabled
-%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.py
+#%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.py
 %{_datadir}/openstack-dashboard/openstack_dashboard/local
 %{_datadir}/openstack-dashboard/openstack_dashboard/openstack
 %{_datadir}/openstack-dashboard/openstack_dashboard/static
@@ -356,8 +356,8 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %doc html
 
 %files -n openstack-dashboard-theme
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/theme
-%{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.py
+#%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/theme
+#%{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.py
 
 %changelog
 * Fri Apr 04 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.12.rc1