TINF-394: preinstall util-linux

diff --git a/Tizen:IVI.build.conf b/Tizen:IVI.build.conf
index ac5143d4028fe3df531778f7208294a9251228bb..763db76e61765de4b75f813b21d303e38e236a69 100644 (file)
--- a/Tizen:IVI.build.conf
+++ b/Tizen:IVI.build.conf
@@ -4,6 +4,7 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+
 FileProvides: /usr/sbin/groupadd pwdutils
 Prefer: util-linux
 Prefer: nfc-manager
@@ -23,11 +24,12 @@ Prefer: mesa-libEGL
 
 #This solves emulators needs
 %if "%_repository" == "emulator"
-  Prefer: simulator-opengl-devel
+  Prefer: emulator-macros
   Prefer: emulator-yagl
 %endif
 
 %define gcc_version 48
+
 %define _with_ivi 1
 %define _with_wayland 1
 %define _with_tizen 1
@@ -47,6 +49,7 @@ Prefer: mesa-libEGL
 # mesa
 Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl)
 Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) 
+#Prefer: mesa-libEGL
 Prefer: nfc-manager-neard
 Prefer: nfc-common-lib-neard
 Prefer: calendar-service-devel
@@ -73,17 +76,17 @@ Keep: qemu-linux-user
 %ifarch armv7hl 
 Preinstall: qemu-accel-armv7hl
 Runscripts: qemu-accel-armv7hl
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 %ifarch armv7l 
 Preinstall: qemu-accel-armv7l
 Runscripts: qemu-accel-armv7l
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 %ifarch armv7el
 Preinstall: qemu-accel-armv7el
 Runscripts: qemu-accel-armv7el
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 
 ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7el armv7l armv7hl
@@ -108,9 +111,10 @@ Preinstall: liblzma
 Preinstall: nss nspr libfreebl3 libsoftokn3
 Preinstall: libmagic
 Preinstall: liblua
-Preinstall: smack libsmack libxml2 libmagic  libmagic-data
+Preinstall: smack libsmack libxml2 libmagic libmagic-data
 Preinstall: libsqlite
 Preinstall: rpm-security-plugin
+Preinstall: util-linux
 
 VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux  
 
@@ -184,12 +188,12 @@ Macros:
 %_with_bluetooth_frwk_libnotification 1
 %_with_audio_session_manager 1
 %_with_audio_session_manager_with_murphy 1
+%_with_dlog_to_systemd_journal 1
+%_with_wrt_option_eds 1
 %_with_x 1
 
-
 %tizen_version 3.0
 %tizen 3.0
 
 %vendor tizen
 %_vendor tizen
-

diff --git a/Tizen:IVI:Release.build.conf b/Tizen:IVI:Release.build.conf
index 11cea418f719ce4e386c78e23128aa48322f5e39..763db76e61765de4b75f813b21d303e38e236a69 100644 (file)
--- a/Tizen:IVI:Release.build.conf
+++ b/Tizen:IVI:Release.build.conf
@@ -1,5 +1,3 @@
-%define _repository standard
-
 Patterntype: rpm-md comps
 Release: <CI_CNT>.<B_CNT>
 Support: build 
@@ -26,7 +24,7 @@ Prefer: mesa-libEGL
 
 #This solves emulators needs
 %if "%_repository" == "emulator"
-  Prefer: simulator-opengl-devel
+  Prefer: emulator-macros
   Prefer: emulator-yagl
 %endif
 
@@ -78,17 +76,17 @@ Keep: qemu-linux-user
 %ifarch armv7hl 
 Preinstall: qemu-accel-armv7hl
 Runscripts: qemu-accel-armv7hl
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 %ifarch armv7l 
 Preinstall: qemu-accel-armv7l
 Runscripts: qemu-accel-armv7l
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 %ifarch armv7el
 Preinstall: qemu-accel-armv7el
 Runscripts: qemu-accel-armv7el
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
 %endif
 
 ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7el armv7l armv7hl
@@ -113,9 +111,10 @@ Preinstall: liblzma
 Preinstall: nss nspr libfreebl3 libsoftokn3
 Preinstall: libmagic
 Preinstall: liblua
-Preinstall: smack libsmack libxml2 libmagic  libmagic-data
+Preinstall: smack libsmack libxml2 libmagic libmagic-data
 Preinstall: libsqlite
 Preinstall: rpm-security-plugin
+Preinstall: util-linux
 
 VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux