- update project config.

diff --git a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
index bca9ce6..7bbdfdd 100644 (file)
--- a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
+++ b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
@@ -18,7 +18,6 @@ export WORKDIR=${WORKDIR}
 export PACKAGING=${PACKAGING} 
 export HOST_SYS=${HOST_SYS} 
 EOC
- X=$base_prefix
  SPECPATH=$(spec2yocto findBestSpecFile ${PACKAGING}/packaging/ --package_pn=${BPN})
  spec2yocto prep ${SPECPATH} --package_pn=${PN} >> ${WORKDIR}/temp/Bash_patch
  cd ${S}
@@ -79,7 +78,6 @@ find ${S} -iname  "*.Rules" -exec sed -e 's,:=,?=,g' -i {} \;
 find ${S} -iname  "*.Rules" -exec sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := \$(BUILD_CFLAGS),' -i {} \; 
 EOC
  
- X=${STAGING_DIR_HOST}
  SPECPATH=$(spec2yocto findBestSpecFile ${PACKAGING}/packaging/ --package_pn=${BPN})
  spec2yocto compile ${SPECPATH} --package_pn=${PN} >> ${WORKDIR}/temp/Bash_compile
  cd ${S}
@@ -121,7 +119,7 @@ EOC
      echo export RPM_BUILD_ROOT=${D}  >> ${WORKDIR}/temp/Bash_install
  fi
  echo export bindir="/usr/bin"  >> ${WORKDIR}/temp/Bash_install
- X=$base_prefix
+
  SPECPATH=$(spec2yocto findBestSpecFile ${PACKAGING}/packaging/ --package_pn=${BPN})
  spec2yocto install ${SPECPATH} --package_pn=${PN} >> ${WORKDIR}/temp/Bash_install
  cd ${S}

diff --git a/proto-meta-Tizen_ivi_3.0/.gitignore b/proto-meta-Tizen_ivi_3.0/.gitignore
index e0268fc..979a05c 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/.gitignore
+++ b/proto-meta-Tizen_ivi_3.0/.gitignore
@@ -1,3 +1,4 @@
 git_package
 *.orig
 *.rej
+specfile-patched

diff --git a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
index 4fac4de..54215b0 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
+++ b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc
@@ -44,7 +44,7 @@ blacklist=freetype, popt, pcre, which, findutils, tizen-coreutils, python,ncurse
 ignore=coreutils,tizen-coreutils,glibc-devel-32bit, eglibc, glibc
 #some buildRequire mean depends on native package not runtime
 #ex: automake will be replace by automake-native
-native=automake, fdupes, cmake, intltool, autoconf, pkgconfig, help2man
+native=automake, fdupes, cmake, intltool, autoconf, pkgconfig, help2man, bison
 #some buildRequire mean depends on cross package not runtime
 #ex: gcc will be replace by gcc-native
 cross=gcc,libtool

diff --git a/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/lib/platform/x86_64-linux/macros b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/lib/platform/x86_64-linux/macros
index 5603f19..b6a9b3c 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/lib/platform/x86_64-linux/macros
+++ b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/lib/platform/x86_64-linux/macros
@@ -25,22 +25,19 @@
 #==============================================================================
 # ---- configure macros.
 #
-%_prefix               /usr
 %_exec_prefix          %{_prefix}
 %_bindir               %{_exec_prefix}/bin
 %_sbindir              %{_exec_prefix}/sbin
 %_libexecdir           %{_exec_prefix}/libexec
 %_datarootdir          %{_prefix}/share
 %_datadir              %{_datarootdir}
-%_sysconfdir           /etc
+
 %_sharedstatedir       %{_prefix}/com
-%_localstatedir                /var
-%_lib                  lib64
-%_libdir               %{_prefix}/lib64
+
+%_lib                  lib
+%_libdir               %{_prefix}/lib
 %_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
+
 %_initddir             %{_sysconfdir}/init.d
 # Deprecated misspelling, present for backwards compatibility.
 %_initrddir            %{_initddir}

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-initial/calendar-service/packaging/calendar-service.spec b/proto-meta-Tizen_ivi_3.0/specfile-initial/calendar-service/packaging/calendar-service.spec
deleted file mode 100644 (file)
index 19e25f4..0000000
--- a/proto-meta-Tizen_ivi_3.0/specfile-initial/calendar-service/packaging/calendar-service.spec
+++ /dev/null
@@ -1,107 +0,0 @@
-Name:       calendar-service
-Summary:    DB library for calendar
-Version:    0.1.15
-Release:    1
-Group:      System/Libraries
-License:    Apache 2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1:    calendar.service
-Requires(post): /sbin/ldconfig
-Requires(post): /usr/bin/sqlite3, /bin/chown
-Requires(postun): /sbin/ldconfig
-
-BuildRequires: cmake
-BuildRequires: pkgconfig(db-util)
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(alarm-service)
-BuildRequires: pkgconfig(icu-i18n)
-BuildRequires: pkgconfig(appsvc)
-BuildRequires: pkgconfig(capi-base-common)
-BuildRequires: pkgconfig(contacts-service2)
-BuildRequires: pkgconfig(pims-ipc)
-BuildRequires: pkgconfig(bundle)
-
-%description
-DB library for calendar
-
-%package devel
-Summary:    DB library for calendar
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   pkgconfig(alarm-service)
-
-%description devel
-DB library for calendar (developement files)
-
-%prep
-%setup -q
-
-
-%build
-%cmake .
-
-
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-mkdir -p %{buildroot}/etc/rc.d/rc3.d/
-mkdir -p %{buildroot}/etc/rc.d/rc5.d/
-ln -s ../init.d/calendar-serviced.sh %{buildroot}/etc/rc.d/rc3.d/S85calendar-serviced
-ln -s ../init.d/calendar-serviced.sh %{buildroot}/etc/rc.d/rc5.d/S85calendar-serviced
-
-mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
-install %{SOURCE1} %{buildroot}%{_unitdir_user}/
-ln -s ../calendar.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/
-
-mkdir -p %{buildroot}/opt/usr/dbspace/.calendar-svc.db
-mkdir -p %{buildroot}/opt/usr/dbspace/.calendar-svc.db-journal
-
-%post
-/sbin/ldconfig
-
-chown :6003 /opt/usr/data/calendar-svc
-
-mkdir -p /opt/usr/dbspace
-
-chown :6003 /opt/usr/dbspace/.calendar-svc.db
-chown :6003 /opt/usr/dbspace/.calendar-svc.db-journal
-chown :6003 /opt/usr/data/calendar-svc/.CALENDAR_SVC_*
-
-chmod 660 /opt/usr/dbspace/.calendar-svc.db
-chmod 660 /opt/usr/dbspace/.calendar-svc.db-journal
-chmod 660 /opt/usr/data/calendar-svc/.CALENDAR_SVC_*
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest calendar-service.manifest
-%defattr(-,root,root,-)
-#%{_libdir}/libcalendar-service-native.so.*
-%{_bindir}/calendar-serviced*
-%{_libdir}/libcalendar-service2.so.*
-%attr(0755,root,root) /etc/rc.d/init.d/calendar-serviced.sh
-/etc/rc.d/rc3.d/S85calendar-serviced
-/etc/rc.d/rc5.d/S85calendar-serviced
-%dir %attr(0775,root,root) /opt/usr/data/calendar-svc/
-/opt/usr/data/calendar-svc/.CALENDAR_SVC_CALENDAR_CHANGED
-/opt/usr/data/calendar-svc/.CALENDAR_SVC_EVENT_CHANGED
-/opt/usr/data/calendar-svc/.CALENDAR_SVC_TODO_CHANGED
-/usr/share/calendar-svc/dft-calendar
-%config(noreplace) /opt/usr/dbspace/.calendar-svc.db*
-%{_unitdir_user}/calendar.service
-%{_unitdir_user}/tizen-middleware.target.wants/calendar.service
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/calendar-service/*.h
-%{_includedir}/calendar-service2/*.h
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/calendar.pc
-#%{_libdir}/pkgconfig/calendar-service-native.pc
-%{_libdir}/pkgconfig/calendar-service2.pc
-/opt/usr/data/calendar-svc/calendar-svc-initdb

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-initial/gst-libav/packaging/gst-ffmpeg.spec b/proto-meta-Tizen_ivi_3.0/specfile-initial/gst-libav/packaging/gst-ffmpeg.spec
deleted file mode 100644 (file)
index b209f2b..0000000
--- a/proto-meta-Tizen_ivi_3.0/specfile-initial/gst-libav/packaging/gst-ffmpeg.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-#sbs-git:slp/pkgs/g/gstreamer0.10-ffmpeg gst-ffmpeg 0.10.11 eab91d2292960a6c9af3b27ca939ad65a4418984
-Name:       gst-ffmpeg0.10
-Summary:    FFmpeg plugin for GStreamer
-Version:    0.10.11
-Release:    19
-Group:      Application/Multimedia
-License:    LGPLv2+
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  gettext
-BuildRequires:  which
-BuildRequires:  gstreamer0.10-tools
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10) 
-BuildRequires:  pkgconfig(gstreamer-0.10) 
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(theora)
-
-%description
-This GStreamer plugin supports a large number of audio and video compression
-formats through the use of the FFmpeg library.  The plugin contains GStreamer
-elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...),
-demuxing 30+ formats and colorspace conversion.
-
-
-%prep
-%setup -q 
-
-%build
-./autogen.sh 
-
-export CFLAGS+=" -Wall -g -fPIC\
- -DFFDEC_RANK_MODIFICATION"
-
-%configure  --disable-static \
-       --disable-nls \
-       --prefix=%{_prefix} \
-       --with-html-dir=/tmp/dump
-
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-
-%files
-%manifest gst-ffmpeg.manifest
-%defattr(-,root,root,-)
-%{_libdir}/gstreamer-0.10/libgstffmpeg.so

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/db4.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/db4.spec.patch
index bdbd987..17cad38 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patch/db4.spec.patch
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/db4.spec.patch
@@ -1,11 +1,11 @@
 diff --git a/packaging/db4.spec b/packaging/db4.spec
-index 4845063..8f4f149 100644
+index c46e86b..973d581 100644
 --- a/packaging/db4.spec
 +++ b/packaging/db4.spec
-@@ -60,8 +60,8 @@ This package contains the header files and libraries.
- 
+@@ -62,8 +62,8 @@ This package contains the header files and libraries.
  %prep
  %setup -q -n %{generic_name}-%{version}
+ cp %{SOURCE1001} .
 -cd ..
 -tar -jcf %{generic_name}-%{version}.tar.bz2 %{generic_name}-%{version}
 +#cd ..
@@ -13,7 +13,7 @@ index 4845063..8f4f149 100644
  
  %build
  cd dist
-@@ -72,12 +72,12 @@ DIST_DATE=`date '+%B %e, %Y' --date="@$LAST_MOD"`
+@@ -74,12 +74,12 @@ DIST_DATE=`date '+%B %e, %Y' --date="@$LAST_MOD"`
  sed -i -e "s/^DB_RELEASE_DATE=.*$/DB_RELEASE_DATE=\"$DIST_DATE\"/" RELEASE
  ./s_config
  CFLAGS="%{optflags} -fno-strict-aliasing"

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/nss.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/nss.spec.patch
index befddd8..c3362b6 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patch/nss.spec.patch
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/nss.spec.patch
@@ -2,10 +2,11 @@ diff --git a/packaging/nss.spec b/nss/packaging/nss.spec
 index 6f263b7..7a62e9f 100644
 --- a/packaging/nss.spec
 +++ b/packaging/nss.spec
-@@ -22,7 +22,7 @@ Source6:        setup-nsssysinit.sh
+@@ -22,8 +22,8 @@ Source6:        setup-nsssysinit.sh
  Source7:        cert9.db
  Source8:        key4.db
  Source9:        pkcs11.txt
+ Source1001:   nss.manifest
 -%define nspr_ver %(rpm -q --queryformat '%{VERSION}' nspr)
 +%define nspr_ver 4.9.2
  Requires(pre):  nspr >= %nspr_ver

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/db4/packaging/db4.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/db4/packaging/db4.spec
index b98960f..973d581 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/db4/packaging/db4.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/db4/packaging/db4.spec
@@ -62,8 +62,8 @@ This package contains the header files and libraries.
 %prep
 %setup -q -n %{generic_name}-%{version}
 cp %{SOURCE1001} .
-cd ..
-tar -jcf %{generic_name}-%{version}.tar.bz2 %{generic_name}-%{version}
+#cd ..
+#tar -jcf %{generic_name}-%{version}.tar.bz2 %{generic_name}-%{version}
 
 %build
 cd dist

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/dbus-python/packaging/dbus-python.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/dbus-python/packaging/dbus-python.spec
index 16b0897..98eccf5 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/dbus-python/packaging/dbus-python.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/dbus-python/packaging/dbus-python.spec
@@ -6,6 +6,7 @@ License:        MIT
 Group:          Development/Libraries/Python
 Url:            http://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
+Source1001:    dbus-python.manifest
 BuildRequires:  fdupes
 BuildRequires:  python-devel
 BuildRequires:  pkgconfig(dbus-1)
@@ -30,6 +31,7 @@ Developer files for Python bindings for D-Bus.
 
 %prep
 %setup -q 
+cp %{SOURCE1001} .
 
 %build
 export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing -fPIC"
@@ -46,12 +48,14 @@ make DESTDIR=%{buildroot} install
 %fdupes -s %{buildroot}
 
 %files
+%manifest %{name}.manifest
 %license COPYING
 %defattr(-,root,root,-)
 %{python_sitelib}/*
 %{python_sitearch}/*
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/dbus-1.0/dbus/dbus-python.h
 %{_libdir}/pkgconfig/dbus-python.pc

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/default-fonts-fc-sdk/packaging/default-fonts-fc-sdk.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/default-fonts-fc-sdk/packaging/default-fonts-fc-sdk.spec
index d65e10c..907b5ad 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/default-fonts-fc-sdk/packaging/default-fonts-fc-sdk.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/default-fonts-fc-sdk/packaging/default-fonts-fc-sdk.spec
@@ -6,7 +6,7 @@ Release:    1
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz
-Source1001: packaging/default-fonts-fc-sdk.manifest
+Source1001: default-fonts-fc-sdk.manifest
 
 %description
 Font configuration package for SDK
@@ -31,7 +31,7 @@ chown :5000 ${D}/opt/etc/fonts/conf.avail/99-slp.conf
 chmod 664 ${D}/opt/etc/fonts/conf.avail/99-slp.conf
 
 %files
-%manifest default-fonts-fc-sdk.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 /opt/etc/fonts/conf.avail/99-slp.conf
 %{_prefix}/etc/fonts/conf.d/99-slp.conf

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/dnsmasq/packaging/dnsmasq.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/dnsmasq/packaging/dnsmasq.spec
index 5355024..a5fce9b 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/dnsmasq/packaging/dnsmasq.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/dnsmasq/packaging/dnsmasq.spec
@@ -5,6 +5,7 @@ Release:    5
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz
+Source1001:    dnsmasq.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(dbus-1)
 
@@ -13,6 +14,7 @@ Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
@@ -26,7 +28,7 @@ rm -rf %{buildroot}
 %make_install
 
 %files
-%manifest dnsmasq.manifest
+%manifest %{name}.manifest
 %{_bindir}/dnsmasq
 
 %changelog

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/ed/packaging/ed.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/ed/packaging/ed.spec
index 349940c..3679313 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/ed/packaging/ed.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/ed/packaging/ed.spec
@@ -6,6 +6,7 @@ Summary:        Standard UNIX Line Editor
 Url:            http://www.gnu.org/software/ed/
 Group:          Productivity/Editors/Other
 Source:         %{name}-%{version}.tar.gz
+Source1001:    ed.manifest
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -13,6 +14,7 @@ The standard, old Unix line editor.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 sed -i \
     -e "s/CFLAGS='.*/CFLAGS='%{optflags}'/" \
     -e "s/CXXFLAGS='.*/CXXFLAGS='%{optflags}'/" \
@@ -29,6 +31,7 @@ make check
 %{makeinstall}
 
 %files
+%manifest %{name}.manifest
 %license COPYING
 %defattr(-,root,root)
 %{_bindir}/%{name}

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/fdupes/packaging/fdupes.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/fdupes/packaging/fdupes.spec
index a15e4eb..617efb8 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/fdupes/packaging/fdupes.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/fdupes/packaging/fdupes.spec
@@ -7,6 +7,7 @@ Url:            http://premium.caribe.net/~adrian2/fdupes.html
 Group:          Productivity/Archiving/Compression
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        macros.fdupes
+Source1001:    fdupes.manifest
 
 %description
 FDUPES is a program for identifying or deleting duplicate files
@@ -14,6 +15,7 @@ residing within specified directories
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 make
@@ -24,6 +26,7 @@ install -D -m644 fdupes.1 %{buildroot}/%{_datadir}/man/man1/fdupes.1
 install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.fdupes
 
 %files
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %doc CHANGES
 %{_bindir}/fdupes

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/groff/packaging/groff.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/groff/packaging/groff.spec
index fa60cb1..26ec04f 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/groff/packaging/groff.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/groff/packaging/groff.spec
@@ -6,6 +6,7 @@ Summary:        A document formatting system
 Url:            http://groff.ffii.org
 Group:          Applications/Publishing
 Source:         %{name}-%{version}.tar.gz
+Source1001:    groff.manifest
 BuildRequires:  bison
 BuildRequires:  zlib-devel
 Requires:       /usr/bin/mktemp
@@ -37,6 +38,7 @@ troff-to-ps print filter.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %configure --enable-multibyte
@@ -94,10 +96,12 @@ mv %{buildroot}%{_libdir}/groff/groffer/* %{buildroot}/%{_datadir}/groff/%{versi
 %remove_docs
 
 %files -f groff-files
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_datadir}/groff
 
 %files perl
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/grog
 %{_bindir}/mmroff

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/libcap/packaging/libcap.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/libcap/packaging/libcap.spec
index 089885e..3877526 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/libcap/packaging/libcap.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/libcap/packaging/libcap.spec
@@ -7,6 +7,7 @@ Url:            https://sites.google.com/site/fullycapable/
 Group:          Base/Libraries
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
+Source1001:    libcap.manifest
 BuildRequires:  fdupes
 BuildRequires:  libattr-devel
 %define debug_package_requires libcap2 = %{version}-%{release}
@@ -47,6 +48,7 @@ libcap.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 # lib=%{_lib} make %{?_smp_mflags} COPTFLAG="%{optflags}"
@@ -69,17 +71,20 @@ ln -s /%{_lib}/libcap.so.2 %{buildroot}%{_libdir}/libcap.so
 %postun -p /sbin/ldconfig
 
 %files
+%manifest %{name}.manifest
 %defattr(-,root,root)
 %license License
 %attr(755,root,root) /%{_lib}/libcap.so.*
 
 %files progs
+%manifest %{name}.manifest
 %defattr(-,root,root)
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 /sbin/*
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root)
 %doc License README CHANGELOG
 %{_includedir}/sys/capability.h

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/libprivilege-control/packaging/libprivilege-control.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/libprivilege-control/packaging/libprivilege-control.spec
index 689cb5b..8969cad 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/libprivilege-control/packaging/libprivilege-control.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/libprivilege-control/packaging/libprivilege-control.spec
@@ -1,14 +1,12 @@
-#%define udev_libdir /usr/lib/udev
-
 Name:       libprivilege-control
 Summary:    Library to control privilege of application
 Version:    0.0.26.TIZEN
 Release:    1
-Group:      System/Security
-License:    Apache 2.0
+Group:      Security/Access Control
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:    %{name}-conf.manifest
 Source2:    smack-default-labeling.service
+Source1001:    %{name}.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(dlog)
@@ -18,7 +16,6 @@ development package of library to control privilege of in-house application
 
 %package devel
 Summary:    Control privilege of application (devel)
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -26,9 +23,7 @@ Library to control privilege of application (devel)
 
 %package conf
 Summary:    Control privilege of application files
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires:   /usr/bin/chsmack
 
 %description conf
 Library to control privilege of application files
@@ -36,6 +31,7 @@ Library to control privilege of application files
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
@@ -44,68 +40,34 @@ export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
 %make_install
-
-mkdir -p %{buildroot}/etc
-mv %{buildroot}/opt/etc/passwd %{buildroot}/etc/passwd
-mv %{buildroot}/opt/etc/group %{buildroot}/etc/group
-
-cp -a %{SOURCE1} %{buildroot}%{_datadir}/
-install -D -d %{buildroot}/etc/rc.d/rc3.d/
-install -D -d %{buildroot}/etc/rc.d/rc4.d/
-ln -sf ../init.d/smack_default_labeling %{buildroot}/etc/rc.d/rc3.d/S45smack_default_labeling
-ln -sf ../init.d/smack_default_labeling %{buildroot}/etc/rc.d/rc4.d/S45smack_default_labeling
-ln -sf ../init.d/smack_rules %{buildroot}/etc/rc.d/rc3.d/S02smack_rules
-ln -sf ../init.d/smack_rules %{buildroot}/etc/rc.d/rc4.d/S02smack_rules
-
 mkdir -p %{buildroot}/usr/lib/systemd/system/basic.target.wants
 install -m 644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/
 ln -s ../smack-default-labeling.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/
+mkdir -p %{buildroot}/usr/share/privilege-control/
 
-%post
-if [ ! -e "${D}/home/app" ]
-then
-        mkdir -p ${D}/home/app
-fi
-
-if [ ! -e "${D}/home/developer" ]
-then
-        mkdir -p /${D}home/developer
-fi
-
-chown 5000:5000 ${D}/home/app
-chmod 755 ${D}/home/app
-chown 5100:5100 ${D}/home/developer
-chmod 755 ${D}/home/developer
+%post -p /sbin/ldconfig
 
-if [ ! -e "${D}/usr/share/privilege-control" ]
-then
-        mkdir -p ${D}/usr/share/privilege-control/
-fi
+%postun -p /sbin/ldconfig
 
 
 %files
+%manifest %{name}.manifest
+%license LICENSE
 %{_libdir}/*.so.*
 %{_bindir}/slp-su
+%dir %{_datarootdir}/privilege-control
 %{_datarootdir}/privilege-control/*
-#%{udev_libdir}/rules.d/*
-#%attr(755,root,root) %{udev_libdir}/uname_env
-%{_datadir}/license/%{name}
 
 %files conf
-/etc/group
-/etc/passwd
+%manifest %{name}.manifest
 /opt/etc/smack/*
-%attr(755,root,root) /etc/rc.d/*
 /usr/lib/systemd/system/smack-default-labeling.service
 /usr/lib/systemd/system/basic.target.wants/smack-default-labeling.service
-%manifest %{_datadir}/%{name}-conf.manifest
 /opt/dbspace/.privilege_control*.db
 
 %files devel
+%manifest %{name}.manifest
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec
index 1519156..8f5eb57 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec
@@ -5,6 +5,7 @@ Release:    1
 Group:      System/Libraries
 License:    Apache
 Source0:    libtcore-%{version}.tar.gz
+Source1001:    libtcore.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
@@ -24,6 +25,7 @@ Telephony-core library (Development)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %cmake . -DVERSION=%{version}
@@ -38,12 +40,13 @@ ldconfig -r ${D}
 %make_install
 
 %files
-%manifest libtcore.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libtcore*
 /usr/share/license/libtcore
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/pkgconfig/tcore.pc

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec.orig b/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec.orig
index 22c627d..b831a1b 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec.orig
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/libtcore/packaging/libtcore.spec.orig
@@ -5,6 +5,7 @@ Release:    1
 Group:      System/Libraries
 License:    Apache
 Source0:    libtcore-%{version}.tar.gz
+Source1001:    libtcore.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
@@ -24,6 +25,7 @@ Telephony-core library (Development)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %cmake . -DVERSION=%{version}
@@ -38,12 +40,13 @@ make %{?jobs:-j%jobs}
 %make_install
 
 %files
-%manifest libtcore.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libtcore*
 /usr/share/license/libtcore
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/pkgconfig/tcore.pc

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/nss/packaging/nss.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/nss/packaging/nss.spec
index 7a62e9f..aad514d 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/nss/packaging/nss.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/nss/packaging/nss.spec
@@ -22,6 +22,7 @@ Source6:        setup-nsssysinit.sh
 Source7:        cert9.db
 Source8:        key4.db
 Source9:        pkcs11.txt
+Source1001:    nss.manifest
 %define nspr_ver 4.9.2
 Requires(pre):  nspr >= %nspr_ver
 Requires(pre):  libfreebl3 >= %{nss_softokn_fips_version}
@@ -117,6 +118,7 @@ Mozilla project.
 
 %prep
 %setup -n nss-%{version} -q
+cp %{SOURCE1001} .
 cd mozilla
 
 %build
@@ -279,6 +281,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libnss3.so
 %{_libdir}/libnssutil3.so
@@ -286,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libssl3.so
 
 %files devel
+%manifest %{name}.manifest
 %defattr(644, root, root, 755)
 %{_includedir}/nss3/
 %{_libdir}/*.a
@@ -293,6 +297,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nss-config
 
 %files tools
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_bindir}/*
 %exclude %{_sbindir}/setup-nsssysinit.sh
@@ -300,6 +305,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/nss-config
 
 %files sysinit
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %dir %{_sysconfdir}/pki
 %dir %{_sysconfdir}/pki/nssdb
@@ -308,11 +314,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/setup-nsssysinit.sh
 
 %files -n libfreebl3
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
 %files -n libsoftokn3
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libsoftokn3.chk
@@ -320,6 +328,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnssdbm3.chk
 
 %files certs
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libnssckbi.so
 

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patched/zlib/packaging/zlib.spec b/proto-meta-Tizen_ivi_3.0/specfile-patched/zlib/packaging/zlib.spec
index 743bc30..6d8c9e1 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patched/zlib/packaging/zlib.spec
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patched/zlib/packaging/zlib.spec
@@ -12,6 +12,7 @@ Url:            http://www.zlib.net/
 Source:         http://zlib.net/zlib-%{version}.tar.bz2
 Source1:        LICENSE
 Source2:        baselibs.conf
+Source1001:    zlib.manifest
 BuildRequires:  pkgconfig
 
 %description
@@ -62,6 +63,7 @@ developing applications which use minizip.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
@@ -112,11 +114,13 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
+%manifest %{name}.manifest
 %defattr(-,root,root)
 /%{_lib}/libz.so.1.2.*
 /%{_lib}/libz.so.1
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root)
 %doc README 
 %{_mandir}/man3/zlib.3.gz
@@ -127,13 +131,16 @@ popd
 %{_libdir}/pkgconfig/zlib.pc
 
 %files devel-static
+%manifest %{name}.manifest
 %defattr(-,root,root)
 %{_libdir}/libz.a
 
 %files -n minizip
+%manifest %{name}.manifest
 %{_libdir}/libminizip.so.*
 
 %files -n minizip-devel
+%manifest %{name}.manifest
 %dir %{_includedir}/minizip
 %{_includedir}/minizip/*.h
 %{_libdir}/libminizip.so

diff --git a/tools/gitCloneAll.sh b/tools/gitCloneAll.sh
index cc939b2..a2a890d 100755 (executable)
--- a/tools/gitCloneAll.sh
+++ b/tools/gitCloneAll.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /home/ronanguirec/yoctoTizen/prometa-Tizen_ivi_3.0
+cd /home/ronanguirec/yoctoTizen/proto-meta-Tizen_ivi_3.0
 
 mkdir -p git_package
 mkdir -p specfile-initial

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index e368830..9fab147 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -2426,6 +2426,10 @@ class spec2yoctoCommandline( cmdln.Cmdln ):
 
         dump_group(project,group_dico)
 
+    @cmdln.option( "--debug",
+                  action = "store",
+                  default = None,
+                  help = "run the in debug mode.[yes/no]" )
     @cmdln.option( "--project",
                   action = "store",
                   default = None,
@@ -2440,6 +2444,12 @@ class spec2yoctoCommandline( cmdln.Cmdln ):
         ${cmd_usage}--
         ${cmd_option_list}
         """
+        global DEBUG_RUN
+        if opts.debug == "no":
+            DEBUG_RUN = False
+        elif opts.debug == "yes":
+            DEBUG_RUN = True
+
         if opts.project is None:
             project = SPEC2YOCTO_CONFIG.get_current_project()
         else:
@@ -2482,6 +2492,10 @@ class spec2yoctoCommandline( cmdln.Cmdln ):
         if res != 1:
             print res
 
+    @cmdln.option( "--debug",
+                  action = "store",
+                  default = None,
+                  help = "run the in debug mode.[yes/no]" )
     @cmdln.option( "--project",
                   action = "store",
                   default = None,
@@ -2496,6 +2510,12 @@ class spec2yoctoCommandline( cmdln.Cmdln ):
         ${cmd_usage}--
         ${cmd_option_list}
         """
+        global DEBUG_RUN
+        if opts.debug == "no":
+            DEBUG_RUN = False
+        elif opts.debug == "yes":
+            DEBUG_RUN = True
+
         if opts.project is None:
             project = SPEC2YOCTO_CONFIG.get_current_project()
         else: