change recipes name

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

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index 5ce921a..d006360 100644 (file)
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -94,9 +94,9 @@ ignore= glibc-devel-32bit, gdm, tk, subversion-perl, cvsps, perl-DBD-SQLite, cvs
 acl=libacl-devel
 ail=pkgconfig(ail)
 alsa-lib=pkgconfig(alsa), alsa
-alsa-scenario-0.2=pkgconfig(libascenario)
+alsa-scenario=pkgconfig(libascenario)
 app-checker=pkgconfig(app-checker), pkgconfig(app-checker-server)
-application=pkgconfig(capi-appfw-application)
+capi-appfw-application=pkgconfig(capi-appfw-application)
 attr=libattr-devel, attr-devel
 audio-session-manager=pkgconfig(audio-session-mgr)
 aul=pkgconfig(aul)
@@ -104,7 +104,7 @@ avsystem=pkgconfig(avsystem), pkgconfig(avsysaudio)
 bundle=pkgconfig(bundle)
 bzip2=pkgconfig(bzip2), bzip2-devel
 cairo=pkgconfig(cairo), pkgconfig(cairo-egl), pkgconfig(cairo-glesv2),pkgconfig(cairo-gobject)
-common=pkgconfig(capi-base-common)
+capi-base-common=pkgconfig(capi-base-common)
 dbus= pkgconfig(dbus-1),dbus-devel, dbus-1
 dbus-glib=pkgconfig(dbus-glib-1),dbus-glib-devel
 dlog=pkgconfig(dlog)
@@ -132,13 +132,13 @@ libpam=pam-devel
 libpng=pkgconfig(libpng)
 librua=pkgconfig(rua)
 libslp-db-util=pkgconfig(db-util)
-libslp-sensor=pkgconfig(sensor)
+sensor=pkgconfig(sensor)
 system-server=pkgconfig(sysman), sysman-devel, pkgconfig(haptic), pkgconfig(pmapi), devman, pkgconfig(devman)
 libvpx=libvpx-devel
 libxkbcommon=pkgconfig(xkbcommon)
 libxml2=pkgconfig(libxml-2.0), libxml2-devel
 libxslt=pkgconfig(libxslt), libxslt-tools, xsltproc
-location-manager=pkgconfig(capi-location-manager)
+capi-location-manager=pkgconfig(capi-location-manager)
 libslp-location=pkgconfig(location)
 lua=pkgconfig(lua), lua-devel
 mesa=pkgconfig(egl), pkgconfig(glesv2), pkgconfig(gbm),mesa-devel, mesa-libEGL, mesa-libGLESv2
@@ -151,7 +151,7 @@ pango=pkgconfig(pangocairo), pkgconfig(pango)
 pciutils=pkgconfig(libpci)
 pixman=pkgconfig(pixman-1)
 pkgmgr-info=pkgconfig(pkgmgr-info), pkgconfig(pkgmgr-parser)
-privacy-manager=pkgconfig(privacy-manager-client)
+privacy-manager-server=pkgconfig(privacy-manager-client)
 poppler=pkgconfig(poppler-glib)
 popt=pkgconfig(popt), popt-devel
 pulseaudio=pkgconfig(libpulse), pkgconfig(pulseaudio-module-devel), config(pulseaudio), libpulse-devel
@@ -159,9 +159,9 @@ shadow=/usr/sbin/groupadd
 python=python-devel, pkgconfig(python),pkgconfig(python-2.7)
 readline=readline-devel
 security-server=pkgconfig(security-server)
-sound-manager=pkgconfig(capi-media-sound-manager)
+capi-media-sound-manager=pkgconfig(capi-media-sound-manager)
 sqlite3=pkgconfig(sqlite3), /usr/bin/sqlite3, sqlite-devel
-system-info=pkgconfig(capi-system-info)
+capi-system-info=pkgconfig(capi-system-info)
 systemd=pkgconfig(libsystemd-login), pkgconfig(libsystemd-daemon), /usr/bin/systemctl, pkgconfig(systemd), systemd-devel, pkgconfig(libsystemd-journal), pkgconfig(udev)
 tizen-platform-config=pkgconfig(libtzplatform-config), libtzplatform-config-devel
 udev=pkgconfig(libudev), libudev-devel
@@ -174,16 +174,16 @@ xdgmime=pkgconfig(xdgmime), xdgmime-devel
 xz=xz-devel, pkgconfig(liblzma)
 zlib=zlib-devel
 bundle=pkgconfig(bundle)
-slp-pkgmgr=pkgconfig(pkgmgr-installer), pkgconfig(pkgmgr)
+pkgmgr=pkgconfig(pkgmgr-installer), pkgconfig(pkgmgr)
 app-core=pkgconfig(appcore-efl),pkgconfig(appcore-common)
 elementary=pkgconfig(elementary)
 libsf-common=pkgconfig(sf_common)
 app-svc=pkgconfig(appsvc)
 notification=pkgconfig(notification)
 alarm-manager =pkgconfig(alarm-service)
-com-core=pkgconfig(com-core)
-libtapi-legacy=pkgconfig(tapi)
-libtapi=pkgconfig(tapi-3.0)
+libcom-core=pkgconfig(com-core)
+libtapi=pkgconfig(tapi)
+libtapi3=pkgconfig(tapi-3.0)
 libsoup-2.4=pkgconfig(libsoup-2.4)
 json-glib=pkgconfig(json-glib-1.0), json-glib-devel
 json-c=pkgconfig(json),libjson-devel
@@ -197,18 +197,18 @@ coreutils=/usr/bin/install, /usr/bin/chmod, /usr/bin/mkdir, /bin/touch, /bin/cho
 bluez4=pkgconfig(bluez)
 sbc=pkgconfig(sbc)
 binutils=binutils-gold
-app-manager=pkgconfig(capi-appfw-app-manager)
-package-manager=pkgconfig(capi-appfw-package-manager)
-bluetooth=pkgconfig(capi-network-bluetooth)
-connection=pkgconfig(capi-network-connection)
-device=pkgconfig(capi-system-device)
-power=pkgconfig(capi-system-power)
-runtime-info=pkgconfig(capi-system-runtime-info)
-sensor=pkgconfig(capi-system-sensor)
-system-settings=pkgconfig(capi-system-system-settings)
-favorites=pkgconfig(capi-web-favorites)
-url-download=pkgconfig(capi-web-url-download)
-media-content=pkgconfig(capi-content-media-content)
+capi-appfw-app-manager=pkgconfig(capi-appfw-app-manager)
+capi-appfw-package-manager=pkgconfig(capi-appfw-package-manager)
+capi-network-bluetooth=pkgconfig(capi-network-bluetooth)
+capi-network-connection=pkgconfig(capi-network-connection)
+capi-system-device=pkgconfig(capi-system-device)
+capi-system-power=pkgconfig(capi-system-power)
+capi-system-runtime-info=pkgconfig(capi-system-runtime-info)
+capi-system-sensor=pkgconfig(capi-system-sensor)
+capi-system-system-settings=pkgconfig(capi-system-system-settings)
+capi-web-favorites=pkgconfig(capi-web-favorites)
+capi-web-url-download=pkgconfig(capi-web-url-download)
+capi-content-media-content=pkgconfig(capi-content-media-content)
 bluetooth-frwk=pkgconfig(bluetooth-api)
 libmedia-service=pkgconfig(libmedia-service)
 libmedia-thumbnail=pkgconfig(media-thumbnail)
@@ -220,7 +220,7 @@ drm-client=pkgconfig(drm-client)
 libav=pkgconfig(libavcodec), pkgconfig(libavutil), pkgconfig(libswscale), pkgconfig(libavformat)
 libwifi-direct=pkgconfig(wifi-direct)
 libdevice-node=pkgconfig(device-node)
-tethering=pkgconfig(capi-network-tethering)
+capi-network-tethering=pkgconfig(capi-network-tethering)
 syspopup=pkgconfig(syspopup-caller)
 status=pkgconfig(status),pkgconfig(status-monitor)
 libnet-client=pkgconfig(network)
@@ -278,13 +278,13 @@ ico-uxf-utilities=ico-uxf-utilities-devel
 ico-uxf-weston-plugin=ico-uxf-weston-plugin-devel
 weston-ivi-shell=weston-ivi-shell-devel, weston-ivi-shell-clients
 opencv=pkgconfig(opencv)
-wayland-ivi-extension=genivi-shell, genivi-shell-devel
+genivi-shell=genivi-shell, genivi-shell-devel
 badge=pkgconfig(badge)
 libical=pkgconfig(libical)
 libaccounts-svc=pkgconfig(accounts-svc)
 gcr=pkgconfig(gcr-base-3)
 libsecret=pkgconfig(libsecret-unstable)
-image-util=pkgconfig(capi-media-image-util)
+capi-media-image-util=pkgconfig(capi-media-image-util)
 pims-ipc=pkgconfig(pims-ipc)
 zeromq=pkgconfig(libzmq)
 libtasn1=libtasn1-devel, pkgconfig(libtasn1)
@@ -295,24 +295,24 @@ libassuan=libassuan-devel
 libgpg-error=libgpg-error-devel
 libksba=libksba-devel
 pth=libpth-devel
-nfc=pkgconfig(capi-network-nfc)
+capi-network-nfc=pkgconfig(capi-network-nfc)
 libgsignon-glib=pkgconfig(libgsignon-glib)
 nfc-manager-neard=nfc-client-lib-neard-devel, nfc-common-neard-devel
 neardal=pkgconfig(neardal)
-wifi=pkgconfig(capi-network-wifi)
-wav-player=pkgconfig(capi-media-wav-player)
+capi-network-wifi=pkgconfig(capi-network-wifi)
+capi-media-wav-player=pkgconfig(capi-media-wav-player)
 libhangul=pkgconfig(libhangul)
 libpinyin=libpinyin-devel
 ecryptfs-utils=pkgconfig(libecryptfs)
 keyutils=keyutils-devel
 python-pycairo=python-cairo
-message-port-dbus=message-port, pkgconfig(message-port)
+message-port=message-port, pkgconfig(message-port)
 gssdp=pkgconfig(gssdp-1.0)
 usbutils=pkgconfig(usbutils)
 gsignond=pkgconfig(gsignond)
 libgsasl=pkgconfig(libgsasl)
-common-api-dbus-runtime=pkgconfig(CommonAPI-DBus)
-common-api-runtime=pkgconfig(CommonAPI)
+CommonAPI-DBus=pkgconfig(CommonAPI-DBus)
+CommonAPI=pkgconfig(CommonAPI)
 sync-agent=pkgconfig(sync-agent)
 xmlsec1=pkgconfig(xmlsec1)
 libslp-memo=pkgconfig(memo)

diff --git a/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec b/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
index f61921a..b57b459 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
@@ -42,6 +42,7 @@ BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(sm)
 %endif
 
+BuildRequires:  pkgconfig
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig(bullet)
 BuildRequires:  pkgconfig(openssl)

diff --git a/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec b/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
index ce3d17d..d5c0990 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
@@ -13,6 +13,7 @@ Source0:        elementary-%{version}.tar.bz2
 Source1001:     elementary.manifest
 BuildRequires:  doxygen
 BuildRequires:  gettext-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(ecore-evas)
 BuildRequires:  pkgconfig(ecore-file)
@@ -145,5 +146,3 @@ cp %{SOURCE1001} .
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/cmake/Elementary/ElementaryConfig.cmake
 %{_libdir}/cmake/Elementary/ElementaryConfigVersion.cmake
-
-%changelog

diff --git a/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-oauth/packaging/gsignond-plugin-oauth.spec b/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-oauth/packaging/gsignond-plugin-oauth.spec
index 25a6cb9..4b80286 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-oauth/packaging/gsignond-plugin-oauth.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-oauth/packaging/gsignond-plugin-oauth.spec
@@ -1,32 +1,33 @@
-Name: gsignond-plugin-oauth
-Summary: OAuth plugin for GLib based Single Sign-On
+Name:    gsignond-plugin-oauth
+Summary: OAuth plugin for GLib
 Version: 1.0.0
-Release: 1
-Group: Security/Accounts
+Release: 0
+Group:   Security/Accounts
 License: LGPL-2.1+
-Source: %{name}-%{version}.tar.gz
+Source:  %{name}-%{version}.tar.gz
 Source1: %{name}.manifest
-URL: https://01.org/gsso
-Requires(post): /sbin/ldconfig
+URL:     https://01.org/gsso
+
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gsignond) >= 1.0.0
 BuildRequires: pkgconfig(gnutls)
 BuildRequires: pkgconfig(libsoup-2.4)
 BuildRequires: json-glib-devel
 
-
 %description
-%{summary}.
+OAuth plugin for GLib based on Single Sign-On.
 
 
 %package doc
-Summary:    Documentation files for %{name}
+Summary:    Documentation for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description doc
-%{summary}.
+Documentation files for %{name}.
 
 
 %prep
@@ -35,8 +36,8 @@ cp %{SOURCE1} .
 
 
 %build
-%configure 
-make %{?_smp_mflags}
+%reconfigure
+%__make %{?_smp_mflags}
 
 
 %install
@@ -45,19 +46,16 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
+%license COPYING.LIB
 %{_libdir}/gsignond/gplugins/liboauth*.so
 
 
 %files doc
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/%{name}/*
-

diff --git a/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-sasl/packaging/gsignond-plugin-sasl.spec b/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-sasl/packaging/gsignond-plugin-sasl.spec
index f91b722..3974d40 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-sasl/packaging/gsignond-plugin-sasl.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/gsignond-plugin-sasl/packaging/gsignond-plugin-sasl.spec
@@ -1,30 +1,31 @@
-Name: gsignond-plugin-sasl
-Summary: SASL plugin for GLib based Single Sign-On
+Name:    gsignond-plugin-sasl
+Summary: SASL plugin for GLib
 Version: 1.0.0
-Release: 1
-Group: Security/Accounts
+Release: 0
+Group:   Security/Accounts
 License: LGPL-2.1+
-Source: %{name}-%{version}.tar.gz
+Source:  %{name}-%{version}.tar.gz
 Source1: %{name}.manifest
-URL: https://01.org/gsso
-Requires(post): /sbin/ldconfig
+URL:     https://01.org/gsso
+
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gsignond) >= 1.0.0
 BuildRequires: pkgconfig(libgsasl)
 
-
 %description
-%{summary}.
+SASL plugin for GLib based on Single Sign-On.
 
 
 %package doc
-Summary:    Documentation files for %{name}
+Summary:    Documentation for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description doc
-%{summary}.
+Documentation files for %{name}.
 
 
 %prep
@@ -33,8 +34,8 @@ cp %{SOURCE1} .
 
 
 %build
-%configure 
-make %{?_smp_mflags}
+%reconfigure
+%__make %{?_smp_mflags}
 
 
 %install
@@ -43,19 +44,15 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
+%license COPYING.LIB
 %{_libdir}/gsignond/gplugins/libsasl*.so
 
-
 %files doc
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/%{name}/*
-

diff --git a/proto-meta-Tizen_generic/specfile-initial/gsignond/packaging/gsignond.spec b/proto-meta-Tizen_generic/specfile-initial/gsignond/packaging/gsignond.spec
index fa02588..1cd201c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/gsignond/packaging/gsignond.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/gsignond/packaging/gsignond.spec
@@ -19,6 +19,7 @@ Requires: dbus-1
 %endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gobject-2.0)
@@ -67,7 +68,7 @@ rm -rf %{buildroot}
 install -m 755 -d %{buildroot}%{_unitdir_user}
 install -m 644 data/gsignond.service %{buildroot}%{_unitdir_user}/
 install -m 755 -d %{buildroot}%{_unitdir_user}/weston.target.wants
-ln -s ../gsignond.service %{buildroot}%{_unitdir_user}/weston.target.wants/gsignond.service
+ln -sf ../gsignond.service %{buildroot}%{_unitdir_user}/weston.target.wants/gsignond.service
 
 %post
 /sbin/ldconfig
@@ -79,7 +80,7 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
+%doc AUTHORS COPYING.LIB
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
 %{_libdir}/%{name}/extensions/*.so*

diff --git a/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec b/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
index e0bdf16..af3d5a7 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/weekeyboard/packaging/weekeyboard.spec
@@ -19,6 +19,7 @@ BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(eet)
 BuildRequires:  pkgconfig(efreet)
 BuildRequires:  pkgconfig(eldbus)
+BuildRequires:  pkgconfig
 BuildRequires:  ibus
 
 Requires:       ibus
@@ -32,8 +33,9 @@ ExclusiveArch:
 %endif
 
 %description
-Weekeyboard is virtual keyboard application written in EFL and
+Weekeyboard is a virtual keyboard application written in EFL and
 made for Wayland compositors.
+
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -41,7 +43,7 @@ cp %{SOURCE1001} .
 %build
 
 %reconfigure --disable-ibus
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
 %make_install
@@ -52,4 +54,3 @@ make %{?_smp_mflags}
 %license COPYING
 %{_bindir}/weekeyboard
 %{_datadir}/weekeyboard/*.edj
-

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index 4259cbf..2ac8fc5 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -1424,10 +1424,9 @@ class MetaSpec:
         '''
         init the MetaSpec class
         '''
-        self.__package_recipes_dir = package_recipes_dir.replace( "_", "-" )
+        
         self.__package_name = package_name.replace( "_", "-" )
 
-
         self.__package_git_srv_src = package_git_srv_src
         self.__package_git_srv_path = package_git_srv_path
 
@@ -1443,6 +1442,8 @@ class MetaSpec:
         self.setm_provided_dico()
         self.__rdepends_dico = self.__spec_parser.get_rdepends()
 
+        self.__package_name = self.__spec_parser.get_name().replace( "_", "-" )
+        self.__package_recipes_dir = os.path.join(package_recipes_dir,self.__package_name)
         self.__base_file = self.__package_name + ".inc"
         #self.__base_depends_file = self.__package_name + "-depends.inc"
         #self.__base_rdepends_file = self.__package_name + "-rdepends.inc"
@@ -2175,7 +2176,7 @@ class package_def:
                                               [self.name, self.name + "-initial"],
                                                dest_spec_path )
 
-        self.__my_meta_spec = MetaSpec( os.path.join( package_recipes_dir, self.name ),
+        self.__my_meta_spec = MetaSpec( package_recipes_dir,
                                         self.name,
                                         package_spec_path,
                                         self.git_src,