Revert "[Tizen]Enable VectorImageRender only when tizen 6.5 or above."

This reverts commit 0321bc3755184a994c875affd48bd1558b58a29c.

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index dfd4850..e931c3a 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -20,12 +20,6 @@ AC_ARG_WITH([tizen_55_or_greater],
             [with_tizen_55_or_greater=yes],
             [with_tizen_55_or_greater=no])
 
-AC_ARG_WITH([tizen_65_or_greater],
-            [AC_HELP_STRING([--with-tizen-65-or-greater],
-                            [Use this conditional when Tizen version is 6.5 or greater])],
-            [with_tizen_65_or_greater=yes],
-            [with_tizen_65_or_greater=no])
-
 PKG_CHECK_MODULES([DALI], [dali2-core dali2-adaptor dali2-toolkit])
 
 AC_CONFIG_SUBDIRS(key)
@@ -35,14 +29,10 @@ AC_CONFIG_SUBDIRS(color-controller)
 
 if test "x$with_tizen_55_or_greater" = "xyes"; then
   AC_CONFIG_SUBDIRS(vector-animation-renderer)
+  AC_CONFIG_SUBDIRS(vector-image-renderer)
   AC_CONFIG_SUBDIRS(web-engine-chromium)
   AC_CONFIG_SUBDIRS(web-engine-lwe)
 fi
-
-if test "x$with_tizen_65_or_greater" = "xyes"; then
-  AC_CONFIG_SUBDIRS(vector-image-renderer)
-fi
-
 AC_CONFIG_SUBDIRS(dali-extension)
 
 devincludepath=${includedir}

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 9ea33c9..0ec8263 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -44,11 +44,6 @@ dali-extension
 %define tizen_55_or_greater 1
 %endif
 
-%if ( 0%{?tizen_version_major} == 6 && 0%{?tizen_version_minor} >= 5 ) || 0%{?tizen_version_major} >= 7
-%define tizen_65_or_greater 1
-%endif
-
-
 # # Note
 # %if 0%{?tizen_version_major} >= 6
 # %define tizen_60_or_greater 1
@@ -135,22 +130,20 @@ BuildRequires:  pkgconfig(rlottie)
 %description vector-animation-renderer-plugin
 Plugin to render a vector animation
 
-# tizen_65 is temporary
-%if 0%{?tizen_65_or_greater}
 ####################################
 # Vector Image Renderer Plugin
 ####################################
 %package vector-image-renderer-plugin
 Summary:    Plugin to render a vector image
 Group:      System/Libraries
+# tizen_55 is temporary
+%if 0%{?tizen_55_or_greater}
 BuildRequires:  pkgconfig(thorvg)
-#define enable_vector_image_renderer_build 1
+%endif
 
 %description vector-image-renderer-plugin
 Plugin to render a vector image
 
-%endif
-
 ####################################
 # color controller Plugin
 ####################################
@@ -276,7 +269,7 @@ exit 0
 exit 0
 %endif
 
-%if 0%{?tizen_65_or_greater}
+%if 0%{?tizen_60_or_greater}
 %post vector-image-renderer-plugin
 /sbin/ldconfig
 exit 0
@@ -329,7 +322,7 @@ exit 0
 exit 0
 %endif
 
-%if 0%{?tizen_65_or_greater}
+%if 0%{?tizen_60_or_greater}
 %postun vector-image-renderer-plugin
 /sbin/ldconfig
 exit 0
@@ -397,7 +390,7 @@ exit 0
 %license LICENSE
 %endif
 
-%if 0%{?tizen_65_or_greater}
+%if 0%{?tizen_60_or_greater}
 %files vector-image-renderer-plugin
 %manifest dali-extension.manifest
 %defattr(-,root,root,-)