Remove unused isf-log and scim-launcher

Change-Id: I85086c4c9c24e5852273362418cbebc8886c52aa
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index 5f48636..dbd677d 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -191,25 +191,8 @@ libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION)
 
 libscim@SCIM_EPOCH@_la_LIBADD  = libltdlc.la
 
-bin_PROGRAMS           = isf-log
-
-isf_log_SOURCES                = isf_log.cpp
-isf_log_LDADD          = libscim@SCIM_EPOCH@.la
-if SCIM_BUILD_GTK_UTILS
-isf_log_CXXFLAGS       = @GTK2_CFLAGS@ -fPIE
-isf_log_LDFLAGS                = @LTLIBINTL@ -rpath $(libdir) -L@GTK_LIBDIR@ -lgtk-x11-2.0 -lgdk-x11-2.0 -lglib-2.0 -lgobject-2.0 -pie
-else
-isf_log_CXXFLAGS       = -fPIE
-isf_log_LDFLAGS                = @LTLIBINTL@ -rpath $(libdir) -pie
-endif
-
 libexecdir             = $(libdir)/scim@SCIM_EPOCH@
-libexec_PROGRAMS        = scim-launcher scim-helper-launcher
-
-scim_launcher_SOURCES  = scim_launcher.cpp
-scim_launcher_LDADD    = libscim@SCIM_EPOCH@.la libisf_pkg.la
-scim_launcher_CXXFLAGS  = @VCONF_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE
-scim_launcher_LDFLAGS  = @LTLIBINTL@ @VCONF_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie
+libexec_PROGRAMS        = scim-helper-launcher
 
 scim_helper_launcher_SOURCES   = scim_helper_launcher.cpp
 scim_helper_launcher_CXXFLAGS  = -fPIE

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 59aea1a..6a435cc 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -255,7 +255,6 @@ cp 500.isf_upgrade_24to30.sh %{buildroot}/usr/share/upgrade/scripts/
 %if "%{?profile}" != "common" && "%{?profile}" != "wearable" && "%{?profile}" != "mobile" && "%{?profile}" != "ivi"
 mv build_tv/bin/isf-demo-efl %{buildroot}%{_bindir}/isf-demo-efl.tv
 mv build_tv/bin/isf-panel-efl %{buildroot}%{_bindir}/isf-panel-efl.tv
-mv build_tv/bin/isf-log %{buildroot}%{_bindir}/isf-log.tv
 rm -rf %{buildroot}%{_datadir}/scim/remote-input
 mkdir -p %{buildroot}%{_datadir}/scim
 mv -f build_tv/remote-input %{buildroot}%{_datadir}/scim/
@@ -263,7 +262,6 @@ mv -f build_tv/remote-input %{buildroot}%{_datadir}/scim/
 pushd build_tv/lib/
 for FILE in libscim-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE.tv"; done
 popd
-mv build_tv/lib/scim-1.0/scim-launcher %{buildroot}%{_libdir}/scim-1.0/scim-launcher.tv
 mv build_tv/lib/scim-1.0/scim-helper-launcher %{buildroot}%{_libdir}/scim-1.0/scim-helper-launcher.tv
 %endif
 
@@ -272,12 +270,10 @@ mv build_tv/lib/scim-1.0/scim-helper-launcher %{buildroot}%{_libdir}/scim-1.0/sc
 %if "%{?profile}" != "tv" && "%{?profile}" != "mobile" && "%{?profile}" != "common"
 mv build_wearable/bin/isf-demo-efl %{buildroot}%{_bindir}/isf-demo-efl.wearable
 mv build_wearable/bin/isf-panel-efl %{buildroot}%{_bindir}/isf-panel-efl.wearable
-mv build_wearable/bin/isf-log %{buildroot}%{_bindir}/isf-log.wearable
 #mv build_wearable/lib/libscim-*.so* %{buildroot}%{_libdir}/libscim-*.so*.wearable
 pushd build_wearable/lib/
 for FILE in libscim-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE.wearable"; done
 popd
-mv build_wearable/lib/scim-1.0/scim-launcher %{buildroot}%{_libdir}/scim-1.0/scim-launcher.wearable
 mv build_wearable/lib/scim-1.0/scim-helper-launcher %{buildroot}%{_libdir}/scim-1.0/scim-helper-launcher.wearable
 %endif
 
@@ -286,8 +282,6 @@ mv build_wearable/lib/scim-1.0/scim-helper-launcher %{buildroot}%{_libdir}/scim-
 %if "%{?profile}" == "tv" || "%{?profile}" == "wearable" || "%{?profile}" == "ivi"
 rm %{buildroot}%{_bindir}/isf-demo-efl
 rm %{buildroot}%{_bindir}/isf-panel-efl
-rm %{buildroot}%{_bindir}/isf-log
-rm %{buildroot}%{_libdir}/scim-1.0/scim-launcher
 rm %{buildroot}%{_libdir}/scim-1.0/scim-helper-launcher
 %endif
 
@@ -307,8 +301,6 @@ ln -sf "module.so" %{_libdir}/ecore_imf/modules/wayland/v-1.16/libwltextinputmod
 %post profile_wearable
 ln -sf isf-demo-efl.wearable %{_bindir}/isf-demo-efl
 ln -sf isf-panel-efl.wearable %{_bindir}/isf-panel-efl
-ln -sf isf-log.wearable %{_bindir}/isf-log
-ln -sf scim-launcher.wearable %{_libdir}/scim-1.0/scim-launcher
 ln -sf scim-helper-launcher.wearable %{_libdir}/scim-1.0/scim-helper-launcher
 pushd %{_libdir}
 for FILE in libscim-*.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
@@ -319,8 +311,6 @@ popd
 if [ $1 -gt 0 ]; then
 rm %{_bindir}/isf-demo-efl
 rm %{_bindir}/isf-panel-efl
-rm %{_bindir}/isf-log
-rm %{_libdir}/scim-1.0/scim-launcher
 rm %{_libdir}/scim-1.0/scim-helper-launcher
 pushd %{_libdir}
 for FILE in libscim-*.so*; do rm "$FILE"; done
@@ -332,8 +322,6 @@ fi
 # files in bindir and libdir may differ.
 %{_bindir}/isf-demo-efl.wearable
 %{_bindir}/isf-panel-efl.wearable
-%{_bindir}/isf-log.wearable
-%{_libdir}/scim-1.0/scim-launcher.wearable
 %{_libdir}/scim-1.0/scim-helper-launcher.wearable
 %{_libdir}/libscim-*.so*.wearable
 
@@ -345,8 +333,6 @@ fi
 %post profile_tv
 ln -sf isf-demo-efl.tv %{_bindir}/isf-demo-efl
 ln -sf isf-panel-efl.tv %{_bindir}/isf-panel-efl
-ln -sf isf-log.tv %{_bindir}/isf-log
-ln -sf scim-launcher.tv %{_libdir}/scim-1.0/scim-launcher
 ln -sf scim-helper-launcher.tv %{_libdir}/scim-1.0/scim-helper-launcher
 pushd %{_libdir}
 for FILE in libscim-*.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
@@ -356,8 +342,6 @@ popd
 if [ $1 -gt 0 ]; then
 rm %{_bindir}/isf-demo-efl
 rm %{_bindir}/isf-panel-efl
-rm %{_bindir}/isf-log
-rm %{_libdir}/scim-1.0/scim-launcher
 rm %{_libdir}/scim-1.0/scim-helper-launcher
 pushd %{_libdir}
 for FILE in libscim-*.so*; do rm "$FILE"; done
@@ -366,11 +350,9 @@ fi
 
 %files profile_tv
 %manifest %{name}.manifest
-# files in bindir, lib/libscim*.so.*, lib/scim-1.0/scim-launcher are different
+# files in bindir, lib/libscim*.so.* are different
 %{_bindir}/isf-demo-efl.tv
 %{_bindir}/isf-panel-efl.tv
-%{_bindir}/isf-log.tv
-%{_libdir}/scim-1.0/scim-launcher.tv
 %{_libdir}/scim-1.0/scim-helper-launcher.tv
 %{_libdir}/libscim-*.so*.tv
 # TV Only: remote-input
@@ -397,7 +379,7 @@ fi
 %license COPYING
 %{TZ_SYS_ETC}/dump.d/module.d/*
 /usr/share/upgrade/scripts/*
-# files in bindir, lib/libscim*.so.*, lib/scim-1.0/scim-launcher are different
+# files in bindir, lib/libscim*.so.* are different
 %exclude %{_libdir}/libscim-*.so*.tv
 %exclude %{_libdir}/libscim-*.so*.wearable
 %{_libdir}/libscim-*.so*
@@ -410,11 +392,9 @@ fi
 %if "%{?profile}" != "tv" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi"
 %files profile_common
 %manifest %{name}.manifest
-# files in bindir, lib/libscim*.so.*, lib/scim-1.0/scim-launcher are different
+# files in bindir, lib/libscim*.so.* are different
 %{_bindir}/isf-demo-efl
 %{_bindir}/isf-panel-efl
-%{_bindir}/isf-log
-%{_libdir}/scim-1.0/scim-launcher
 %{_libdir}/scim-1.0/scim-helper-launcher
 # default .so are housed in the main pkg.
 %endif