update Modello

Change-Id: Ib008f9ded3858affc313dc8fc4cdbbc71a5f11f9
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/modello-ambsimulator.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/Modello-AMBSimulator.spec
similarity index 84%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/modello-ambsimulator.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/Modello-AMBSimulator.spec
index 883c732..752055c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/modello-ambsimulator.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_AMBSimulator/packaging/Modello-AMBSimulator.spec
@@ -1,4 +1,4 @@
-Name:       Modello_AMBSimulator
+Name:       Modello-AMBSimulator
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,10 +6,10 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_AMBSimulator.manifest
+Source1001: Modello-AMBSimulator.manifest
 
 BuildRequires:  zip
-Requires:       Modello_Common
+Requires:       Modello-Common
 BuildRequires:  pkgconfig(libtzplatform-config)
 
 BuildArchitectures: noarch
@@ -34,5 +34,5 @@ install -m 0644 AMBSimulator_icon.png %{buildroot}%{_datadir}/Modello/Common/ico
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_AMBSimulator.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/AMBSimulator_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/modello-appmanager.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/Modello-Appmanager.spec
similarity index 84%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/modello-appmanager.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/Modello-Appmanager.spec
index cc00f6a..b8d4828 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/modello-appmanager.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Appmanager/packaging/Modello-Appmanager.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Appmanager
+Name:       Modello-Appmanager
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,10 +6,10 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Appmanager.manifest
+Source1001: Modello-Appmanager.manifest
 
 BuildRequires: zip
-Requires:      Modello_Common
+Requires:      Modello-Common
 BuildRequires: pkgconfig(libtzplatform-config)
 
 BuildArchitectures: noarch
@@ -34,5 +34,5 @@ install -m 0644 AppManager_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_Appmanager.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/AppManager_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/modello-common.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/Modello-Common.spec
similarity index 91%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/modello-common.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/Modello-Common.spec
index 951b7eb..12a5685 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/modello-common.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Common/packaging/Modello-Common.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Common
+Name:       Modello-Common
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,7 +6,7 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Common.manifest
+Source1001: Modello-Common.manifest
 
 BuildRequires:  fdupes
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/modello-dashboard.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/Modello-Dashboard.spec
similarity index 85%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/modello-dashboard.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/Modello-Dashboard.spec
index a4eb9dd..400ccab 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/modello-dashboard.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Dashboard/packaging/Modello-Dashboard.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Dashboard
+Name:       Modello-Dashboard
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,9 +6,9 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Dashboard.manifest
+Source1001: Modello-Dashboard.manifest
 
-Requires:       Modello_Common
+Requires:       Modello-Common
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  zip
 
@@ -34,5 +34,5 @@ install -m 0644 Dashboard_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_Dashboard.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/Dashboard_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec
similarity index 84%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec
index 1c4eded..bbfa863 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/Modello-Homescreen.spec
@@ -1,13 +1,15 @@
-Name:       Modello_Homescreen
+Name:       Modello-Homescreen
 Summary:    A proof of concept pure html5 UI
 Version:    0.0.2
-Release:    1
+Release:    0
 Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
+Source1001: Modello-Homescreen.manifest
+
 BuildRequires:  zip
-Requires:   Modello_Common
+Requires:   Modello-Common
 BuildArchitectures: noarch
 
 
@@ -16,10 +18,10 @@ A proof of concept pure html5 UI files
 
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
 
 %build
-
-make wgtPkg
+%__make wgtPkg
 
 %install
     %make_install
@@ -32,7 +34,7 @@ make wgtPkg
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt
+/opt/usr/apps/.preinstallWidgets/%{name}.wgt
 /opt/usr/apps/_common/icons/Homescreen_icon.png
 %{_unitdir_user}/Modello_Homescreen.service
 %{_unitdir_user}/Modello_Homescreen-launchpad-ready.path

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/Modello-Hvac.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/Modello-Hvac.spec
new file mode 100644 (file)
index 0000000..9bd883b
--- /dev/null
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/Modello-Hvac.spec
@@ -0,0 +1,37 @@
+Name:       Modello-Hvac
+Summary:    Pure html5 UI
+Version:    0.0.2
+Release:    0
+Group:      Automotive/Modello
+License:    Apache-2.0
+URL:        http://www.tizen.org
+Source0:    %{name}-%{version}.tar.bz2
+Source1001: Modello-Hvac.manifest
+
+Requires:       Modello-Common
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  zip
+
+BuildArchitectures: noarch
+
+%description
+A proof of concept pure html5 UI
+
+%prep
+%setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+
+%build
+#empty
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml css HVAC_icon.png index.html js
+install -m 0644 HVAC_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
+
+%files
+%defattr(-,root,root,-)
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
+%{_datadir}/Modello/Common/icons/HVAC_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/modello-hvac.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/modello-hvac.spec
deleted file mode 100644 (file)
index 7b6df49..0000000
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Hvac/packaging/modello-hvac.spec
+++ /dev/null
@@ -1,29 +0,0 @@
-Name:       Modello_Hvac
-Summary:    A proof of concept pure html5 UI
-Version:    0.0.2
-Release:    1
-Group:      Applications/System
-License:    Apache 2.0
-URL:        http://www.tizen.org
-Source0:    %{name}-%{version}.tar.bz2
-BuildRequires:  zip
-Requires:   Modello_Common
-
-%description
-A proof of concept pure html5 UI
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-
-make wgtPkg
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-%files
-%defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Hvac.wgt
-/opt/usr/apps/_common/icons/HVAC_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/modello-installer.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec
similarity index 54%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/modello-installer.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec
index 75daaff..3eed87b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/modello-installer.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Installer/packaging/Modello-Installer.spec
@@ -1,15 +1,15 @@
 %define MODELLO_INSTALL_USER app
-%define MODELLO_WIDGET_DIR /opt/usr/apps/.preinstallWidgets
-%define MODELLO_COMMON_DIR /opt/usr/apps/_common
+%define MODELLO_COMMON_DIR   %{_datadir}/Modello/Common
 
-Name:       Modello_Installer
+Name:       Modello-Installer
 Summary:    Installer for Modello
 Version:    0.0.2
 Release:    0
-Group:      Base/Configuration
+Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
+Source1001: Modello-Installer.manifest
 
 %description
 Installer for Modello package
@@ -17,23 +17,31 @@ Installer for Modello package
 %package xwalk
 Summary: The Xwalk version of Modello Installer
 Requires:   crosswalk
-Requires:   Modello_AMBSimulator
-Requires:   Modello_Appmanager
-Requires:   Modello_Common
-Requires:   Modello_Dashboard
-Requires:   Modello_Homescreen
-Requires:   Modello_Hvac
-Requires:   Modello_Multimediaplayer
-Requires:   Modello_Nav
-Requires:   Modello_Phone
-Requires:   Modello_SDL
+Requires:   Modello-AMBSimulator
+Requires:   Modello-Appmanager
+Requires:   Modello-Common
+Requires:   Modello-Dashboard
+Requires:   Modello-Homescreen
+Requires:   Modello-Hvac
+Requires:   Modello-Multimediaplayer
+Requires:   Modello-Nav
+Requires:   Modello-Phone
+Requires:   Modello-SDL
 Requires:   tizen-platform-config
 
 %description xwalk
 The Xwalk version of Modello Installer package
 
+%package wrt
+Summary: The WRT version of Modello Installer
+Requires:   wrt-installer
+
+%description wrt
+Installs Modello using wrt-installer package
+
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
 
 %build
 #build section
@@ -42,7 +50,7 @@ The Xwalk version of Modello Installer package
 %make_install
 
 %post xwalk
-source %_sysconfdir/tizen-platform.conf
+source %{_sysconfdir}/tizen-platform.conf
 
 export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket"
 
@@ -63,7 +71,9 @@ do
 done
 
 %postun xwalk
-source %_sysconfdir/tizen-platform.conf
+source %{_sysconfdir}/tizen-platform.conf
+
+export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket"
 
 for list3 in $(su %{MODELLO_INSTALL_USER} -c "xwalkctl" | grep Modello | cut -c 1-32)
 do
@@ -71,7 +81,27 @@ do
         su %{MODELLO_INSTALL_USER} -c "xwalkctl -u $list3"
 done
 
+%post wrt
+source %{_sysconfdir}/tizen-platform.conf
+
+for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*")
+do
+#wrt-installer requires you be root to install files
+        wrt-installer -i $list
+done
+
+for list2 in $(ls -d /opt/usr/apps/*/)
+do
+        mkdir -p "$list2/css"
+        mkdir -p "$list2/js"
+        cp -r %{MODELLO_COMMON_DIR}/js/services "$list2/res/wgt/js/"
+        cp -r %{MODELLO_COMMON_DIR}/css/* "$list2/res/wgt/css/"
+done
 
 %files xwalk
 %defattr(-,root,root,-)
+%manifest %{name}.manifest
 
+%files wrt
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
\ No newline at end of file

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/modello-multimediaplayer.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/Modello-Multimediaplayer.spec
similarity index 83%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/modello-multimediaplayer.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/Modello-Multimediaplayer.spec
index aa3874c..cdc96b6 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/modello-multimediaplayer.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Multimediaplayer/packaging/Modello-Multimediaplayer.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Multimediaplayer
+Name:       Modello-Multimediaplayer
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,9 +6,9 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Multimediaplayer.manifest
+Source1001: Modello-Multimediaplayer.manifest
 
-Requires:      Modello_Common
+Requires:      Modello-Common
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: zip
 
@@ -34,5 +34,5 @@ install -m 0644 MultimediaPlayer_icon.png %{buildroot}%{_datadir}/Modello/Common
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_Multimediaplayer.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/MultimediaPlayer_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/modello-nav.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/Modello-Nav.spec
similarity index 86%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/modello-nav.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/Modello-Nav.spec
index 6c361ec..a86712c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/modello-nav.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Nav/packaging/Modello-Nav.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Nav
+Name:       Modello-Nav
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,9 +6,9 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Nav.manifest
+Source1001: Modello-Nav.manifest
 
-Requires:      Modello_Common
+Requires:      Modello-Common
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: zip
 
@@ -34,5 +34,5 @@ install -m 0644 Navigation_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_Nav.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/Navigation_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/modello-phone.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/Modello-Phone.spec
similarity index 86%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/modello-phone.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/Modello-Phone.spec
index 2143e0e..759f74c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/modello-phone.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Phone/packaging/Modello-Phone.spec
@@ -1,4 +1,4 @@
-Name:       Modello_Phone
+Name:       Modello-Phone
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,9 +6,9 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_Phone.manifest
+Source1001: Modello-Phone.manifest
 
-Requires:      Modello_Common
+Requires:      Modello-Common
 Requires:      phoned
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: zip
@@ -35,5 +35,5 @@ install -m 0644 Phone_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_Phone.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/Phone_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/modello-sdl.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/Modello-SDL.spec
similarity index 87%
rename from proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/modello-sdl.spec
rename to proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/Modello-SDL.spec
index a03c300..3614c8e 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/modello-sdl.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_SDL/packaging/Modello-SDL.spec
@@ -1,4 +1,4 @@
-Name:       Modello_SDL
+Name:       Modello-SDL
 Summary:    Pure html5 UI
 Version:    0.0.2
 Release:    0
@@ -6,9 +6,9 @@ Group:      Automotive/Modello
 License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-Source1001: Modello_SDL.manifest
+Source1001: Modello-SDL.manifest
 
-Requires:      Modello_Common
+Requires:      Modello-Common
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: zip
 
@@ -34,5 +34,5 @@ install -m 0644 SmartDeviceLink_icon.png %{buildroot}%{_datadir}/Modello/Common/
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{TZ_SYS_APP_PREINSTALL}/Modello_SDL.wgt
+%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt
 %{_datadir}/Modello/Common/icons/SmartDeviceLink_icon.png

diff --git a/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec b/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec
index 646b79e..1950a18 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec
@@ -1,11 +1,11 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version: 0.2.43
-Release:    3
+Version:    0.2.43
+Release:    0
 Group:      System/Libraries
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    libmedia-service.manifest
+Source1001: libmedia-service.manifest
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -22,37 +22,30 @@ BuildRequires:  pkgconfig(mm-fileinfo)
 BuildRequires:  pkgconfig(media-thumbnail)
 BuildRequires:  pkgconfig(drm-client)
 BuildRequires:  pkgconfig(libmedia-utils)
-BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
-Media information service library for multimedia applications
+Media information service library for multimedia applications files
 
 %package devel
-Summary:    Media information service library for multimedia applications. (development)
+Summary:    Media information service library for multimedia applications. (dev)
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
 Media information service library for multimedia applications. (development files)
 
-
 %prep
 %setup -q 
 cp %{SOURCE1001} .
 
-
 %build
 %cmake . 
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-#License
-mkdir -p %{buildroot}/%{_datadir}/license
-cp -rf %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_datadir}/license/%{name}
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -68,8 +61,7 @@ cp -rf %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_datadir}/license/
 %{_libdir}/libmedia-content-plugin.so
 %{_libdir}/libmedia-content-plugin.so.1
 %{_libdir}/libmedia-content-plugin.so.1.0.0
-#License
-%{_datadir}/license/%{name}
+%license LICENSE
 
 %files devel
 %manifest %{name}.manifest

diff --git a/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec b/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
index e51868b..284d22f 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
@@ -14,6 +14,7 @@ Source1004: %{name}-server.manifest
 Source1005: %{name}-installer.manifest
 Source1006: %{name}-installer-devel.manifest
 Source1007: %{name}-types-devel.manifest
+
 BuildRequires:  cmake
 BuildRequires:  unzip
 BuildRequires:  gettext-tools
@@ -31,8 +32,7 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgmgr-info-parser-devel
 BuildRequires:  pkgmgr-info-parser
 BuildRequires:  libsmack
-Requires:  pwdutils
-Requires:              libcap-tools
+BuildRequires:  fdupes
 
 %description
 Packager Manager client library package for packaging
@@ -100,7 +100,7 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} %{SOURC
     -DX11_SUPPORT=On
 %endif
 
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 %make_install
@@ -110,18 +110,20 @@ rm -f %{buildroot}%{_libdir}/libpkgmgr_parser_lib_sample.so
 
 mkdir -p %{buildroot}%{_sysconfdir}/package-manager/backend
 mkdir -p %{buildroot}%{_sysconfdir}/package-manager/backendlib
-mkdir -p %{buildroot}/etc/opt/upgrade
+mkdir -p %{buildroot}%{_sysconfdir}/opt/upgrade
 
 mkdir -p %{buildroot}%{_sysconfdir}/package-manager/server
 
 %find_lang package-manager
 
+%fdupes %{buildroot}
+
 %post
 /sbin/ldconfig
 
 # For pkgmgr-install:
 # Update mime database to support package mime types
-update-mime-database /usr/share/mime
+update-mime-database %{_datadir}/mime
 
 %post -n pkgmgr-server -p /sbin/ldconfig
 

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index 2ac8fc5..3c2997e 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -664,6 +664,7 @@ class SpecParser:
 
         rpmspec_command += " --define='BUILD_BASENAME %{basename}' "
         rpmspec_command += " --define='find_lang  #find_lang' "
+        rpmspec_command += " --define='fdupes  #fdupes' "
         rpmspec_command += " --define='lang_package #lang_package' "
         rpmspec_command += " --define='with_wayland  1' "