[Kimchi-devel] [PATCH V3 1/3] Remove the legacy files from automake and package configurations

Shu Ming shuming at linux.vnet.ibm.com
Thu Jan 9 03:55:25 UTC 2014


Remove the legacy files from automake and package configurations.
Then the legacy files will not be installed and packaged into the
distro packages

Signed-off-by: Shu Ming <shuming at linux.vnet.ibm.com>
---
 contrib/kimchi.spec.fedora.in | 3 ---
 contrib/kimchi.spec.suse.in   | 3 ---
 ui/css/Makefile.am            | 2 +-
 ui/images/Makefile.am         | 2 +-
 ui/js/Makefile.am             | 1 -
 ui/pages/Makefile.am          | 1 -
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index 75435b3..38c72f1 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -119,18 +119,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo
 %{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/css/dev.*.css
 %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.*
 %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
 %{_datadir}/kimchi/ui/css/novnc/base.css
 %{_datadir}/kimchi/ui/css/theme-default.min.css
-%{_datadir}/kimchi/ui/images/*.jpg
 %{_datadir}/kimchi/ui/images/*.png
 %{_datadir}/kimchi/ui/images/*.ico
 %{_datadir}/kimchi/ui/images/theme-default/*.png
 %{_datadir}/kimchi/ui/images/theme-default/*.gif
 %{_datadir}/kimchi/ui/js/kimchi.min.js
-%{_datadir}/kimchi/ui/js/dev.main.js
 %{_datadir}/kimchi/ui/js/jquery-ui.js
 %{_datadir}/kimchi/ui/js/jquery.min.js
 %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index bcfb6db..7be4984 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -66,18 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo
 %{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/css/dev.*.css
 %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.*
 %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
 %{_datadir}/kimchi/ui/css/novnc/base.css
 %{_datadir}/kimchi/ui/css/theme-default.min.css
-%{_datadir}/kimchi/ui/images/*.jpg
 %{_datadir}/kimchi/ui/images/*.png
 %{_datadir}/kimchi/ui/images/*.ico
 %{_datadir}/kimchi/ui/images/theme-default/*.png
 %{_datadir}/kimchi/ui/images/theme-default/*.gif
 %{_datadir}/kimchi/ui/js/kimchi.min.js
-%{_datadir}/kimchi/ui/js/dev.main.js
 %{_datadir}/kimchi/ui/js/jquery-ui.js
 %{_datadir}/kimchi/ui/js/jquery.min.js
 %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index 45f8aa7..e835cdf 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = novnc fonts
 EXTRA_DIST = theme-default
 
 cssdir = $(datadir)/kimchi/ui/css
-dist_css_DATA = dev.*.css theme-default.min.css
+dist_css_DATA = theme-default.min.css
 
 theme-default.min.css: theme-default/*.css
 	cat $^ > $@
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 3af7afa..cb78efb 100644
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -22,4 +22,4 @@ SUBDIRS = theme-default
 
 imagedir = $(datadir)/kimchi/ui/images
 
-dist_image_DATA = *.jpg *.png *.ico
+dist_image_DATA = *.png *.ico
diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am
index 337e369..6808226 100644
--- a/ui/js/Makefile.am
+++ b/ui/js/Makefile.am
@@ -26,7 +26,6 @@ jsdir = $(datadir)/kimchi/ui/js
 
 dist_js_DATA = \
 	kimchi.min.js \
-	dev.main.js \
 	jquery.min.js \
 	jquery-ui.js \
 	modernizr.custom.2.6.2.min.js \
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index d4718a4..0535c84 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -25,7 +25,6 @@ htmldir = $(datadir)/kimchi/ui/pages
 dist_html_DATA = \
 	error.html.tmpl \
 	kimchi-ui.html.tmpl \
-	dev-ui.html.tmpl \
 	guest-add.html.tmpl \
 	guest-edit.html.tmpl \
 	guest.html.tmpl \
-- 
1.8.1.4




More information about the Kimchi-devel mailing list