- change macro for yocto build.

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/macros
index 6c83d39..539d115 100644 (file)
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/macros
+++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/macros
@@ -24,9 +24,10 @@
 #==============================================================================
 # ---- filesystem macros.
 #
-%_usr                  /usr
+%_usr                  \${prefix}
 %_usrsrc               %{_usr}/src
-%_var                  /var
+%_var                  \${localstatedir}
+
 
 #==============================================================================
 # ---- Generally useful path macros.
@@ -68,6 +69,8 @@
 %__tar                 /bin/tar
 %__unzip               /usr/bin/unzip
 
+#Add for yocto
+%fdupes /usr/bin/fdupes
 #==============================================================================
 # ---- Build system path macros.
 #
@@ -148,7 +151,7 @@
 #      (e.g. per-platform, per-system, per-packager, per-package) macros.
 #
 #      The directory where rpm's configuration and scripts live
-%_rpmconfigdir         %{getconfdir}
+%_rpmconfigdir         /usr/share/spec2yocto/macro
 
 #      The directory where sources/patches will be unpacked and built.
 %_builddir             %{_topdir}/BUILD
@@ -848,13 +851,13 @@ print (t)\
 # ---- configure macros.
 #      Macro(s) slavishly copied from autoconf's config.status.
 #
-%_prefix               /usr
+%_prefix               \${base_prefix}/usr
 %_exec_prefix          %{_prefix}
 %_bindir               %{_exec_prefix}/bin
 %_sbindir              %{_exec_prefix}/sbin
 %_libexecdir           %{_exec_prefix}/libexec
 %_datadir              %{_prefix}/share
-%_sysconfdir           /etc
+%_sysconfdir           \${base_prefix}/etc
 %_sharedstatedir       %{_prefix}/com
 %_localstatedir                %{_prefix}/var
 %_lib                  lib
@@ -895,50 +898,15 @@ print (t)\
 # The configure macro should be invoked as %configure (rather than %{configure})
 # because the rest of the arguments will be expanded using %*.
 #
-%_configure ./configure
+%_configure autotools_do_configure2
+%{_configure}
 %configure \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %{_configure} --host=%{_host} --build=%{_build} \\\
-       --program-prefix=%{?_program_prefix} \\\
-       --prefix=%{_prefix} \\\
-       --exec-prefix=%{_exec_prefix} \\\
-       --bindir=%{_bindir} \\\
-       --sbindir=%{_sbindir} \\\
-       --sysconfdir=%{_sysconfdir} \\\
-       --datadir=%{_datadir} \\\
-       --includedir=%{_includedir} \\\
-       --libdir=%{_libdir} \\\
-       --libexecdir=%{_libexecdir} \\\
-       --localstatedir=%{_localstatedir} \\\
-       --sharedstatedir=%{_sharedstatedir} \\\
-       --mandir=%{_mandir} \\\
-       --infodir=%{_infodir}
+  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+  %{_configure} 
 
-#------------------------------------------------------------------------------
-# The make install analogue of %configure for modern autotools:
-%make_install %{__make} install DESTDIR=%{?buildroot}
 
-#------------------------------------------------------------------------------
-# Former make install analogue, kept for compatibility and for old/broken
-#  packages that don't support DESTDIR properly.
-%makeinstall \
-  %{__make} \\\
-       prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
-       exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
-       bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
-       sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
-       sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
-       datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
-       includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
-       libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
-       libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
-       localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
-       sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
-       mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
-       infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
-  install
 
 #------------------------------------------------------------------------------
 # The GNUconfigure macro does the following:

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/athlon-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/athlon-linux/macros
deleted file mode 100644 (file)
index 8671ebc..0000000
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/athlon-linux/macros
+++ /dev/null
@@ -1,91 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               tizen
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -g -march=athlon
-
-%__isa_name            x86
-%__isa_bits            32
-%__isa                 %{__isa_name}-%{__isa_bits}
-
-#==============================================================================
-# ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#      Expanded at end of %install scriptlet.
-#
-
-%__arch_install_post   %{nil}
-
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-%{nil}
-
-%__spec_install_post\
-    %{?__debug_package:%{__debug_install_post}}\
-    %{__arch_install_post}\
-    %{__os_install_post}\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#      Expanded at end of %prep
-#
-%__id_u                @__ID_U@
-%__chown_Rhf   @__CHOWN_RHF@
-%__chgrp_Rhf   @__CHGRP_RHF@
-%_fixperms     %{__chmod} -Rf a+rX,u+w,g-w,o-w
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-    %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}\
-%{nil}
-#---------------------------------------------------------------------
-#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-#
-#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-#%defattr(-,root,root,-)\
-#%{nil}
-
-
-

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/geode-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/geode-linux/macros
deleted file mode 100644 (file)
index 8db9ec6..0000000
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/geode-linux/macros
+++ /dev/null
@@ -1,91 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 geode
-%_vendor               tizen
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -Os -g -m32 -march=geode
-
-%__isa_name            x86
-%__isa_bits            32
-%__isa                 %{__isa_name}-%{__isa_bits}
-
-#==============================================================================
-# ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#      Expanded at end of %install scriptlet.
-#
-
-%__arch_install_post   %{nil}
-
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-%{nil}
-
-%__spec_install_post\
-    %{?__debug_package:%{__debug_install_post}}\
-    %{__arch_install_post}\
-    %{__os_install_post}\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#      Expanded at end of %prep
-#
-%__id_u                @__ID_U@
-%__chown_Rhf   @__CHOWN_RHF@
-%__chgrp_Rhf   @__CHGRP_RHF@
-%_fixperms     %{__chmod} -Rf a+rX,u+w,g-w,o-w
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-    %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}\
-%{nil}
-#---------------------------------------------------------------------
-#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-#
-#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-#%defattr(-,root,root,-)\
-#%{nil}
-
-
-

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i386-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i386-linux/macros
deleted file mode 100644 (file)
index 02fb80e..0000000
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i386-linux/macros
+++ /dev/null
@@ -1,91 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               tizen
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags               -g
-
-%__isa_name            x86
-%__isa_bits            32
-%__isa                 %{__isa_name}-%{__isa_bits}
-
-#==============================================================================
-# ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#      Expanded at end of %install scriptlet.
-#
-
-%__arch_install_post   %{nil}
-
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-%{nil}
-
-%__spec_install_post\
-    %{?__debug_package:%{__debug_install_post}}\
-    %{__arch_install_post}\
-    %{__os_install_post}\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#      Expanded at end of %prep
-#
-%__id_u                @__ID_U@
-%__chown_Rhf   @__CHOWN_RHF@
-%__chgrp_Rhf   @__CHGRP_RHF@
-%_fixperms     %{__chmod} -Rf a+rX,u+w,g-w,o-w
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-    %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}\
-%{nil}
-#---------------------------------------------------------------------
-#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-#
-#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-#%defattr(-,root,root,-)\
-#%{nil}
-
-
-

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i486-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i486-linux/macros
deleted file mode 100644 (file)
index 02fb80e..0000000
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i486-linux/macros
+++ /dev/null
@@ -1,91 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               tizen
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags               -g
-
-%__isa_name            x86
-%__isa_bits            32
-%__isa                 %{__isa_name}-%{__isa_bits}
-
-#==============================================================================
-# ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#      Expanded at end of %install scriptlet.
-#
-
-%__arch_install_post   %{nil}
-
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-%{nil}
-
-%__spec_install_post\
-    %{?__debug_package:%{__debug_install_post}}\
-    %{__arch_install_post}\
-    %{__os_install_post}\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#      Expanded at end of %prep
-#
-%__id_u                @__ID_U@
-%__chown_Rhf   @__CHOWN_RHF@
-%__chgrp_Rhf   @__CHGRP_RHF@
-%_fixperms     %{__chmod} -Rf a+rX,u+w,g-w,o-w
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-    %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}\
-%{nil}
-#---------------------------------------------------------------------
-#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-#
-#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-#%defattr(-,root,root,-)\
-#%{nil}
-
-
-

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i586-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i586-linux/macros
index 02fb80e..43572c2 100644 (file)
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i586-linux/macros
+++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i586-linux/macros
@@ -17,20 +17,17 @@
 #==============================================================================
 # ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
+
 %_libdir               %{_prefix}/lib
 %_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
+
 %_infodir              %{_datarootdir}/info
 %_mandir               %{_datarootdir}/man
 %_initddir             %{_sysconfdir}/rc.d/init.d

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i686-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i686-linux/macros
index 02fb80e..4ff4ed1 100644 (file)
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i686-linux/macros
+++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i686-linux/macros
@@ -24,13 +24,10 @@
 %_libexecdir           %{_exec_prefix}/libexec
 %_datarootdir          %{_prefix}/share
 %_datadir              %{_datarootdir}
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
+
 %_libdir               %{_prefix}/lib
 %_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
+
 %_infodir              %{_datarootdir}/info
 %_mandir               %{_datarootdir}/man
 %_initddir             %{_sysconfdir}/rc.d/init.d

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/noarch-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/noarch-linux/macros
index 2e07f02..371d913 100644 (file)
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/noarch-linux/macros
+++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/noarch-linux/macros
@@ -13,20 +13,17 @@
 #==============================================================================
 # ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
+
 %_libdir               %{_prefix}/lib
 %_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
+
 %_infodir              %{_datarootdir}/info
 %_mandir               %{_datarootdir}/man
 %_initddir             %{_sysconfdir}/rc.d/init.d

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/pentium4-linux/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/pentium4-linux/macros
deleted file mode 100644 (file)
index 5ea2cdb..0000000
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/pentium4-linux/macros
+++ /dev/null
@@ -1,91 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               tizen
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -g -march=pentium4
-
-%__isa_name            x86
-%__isa_bits            32
-%__isa                 %{__isa_name}-%{__isa_bits}
-
-#==============================================================================
-# ---- 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       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-%_oldincludedir                /usr/include
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#      Expanded at end of %install scriptlet.
-#
-
-%__arch_install_post   %{nil}
-
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-%{nil}
-
-%__spec_install_post\
-    %{?__debug_package:%{__debug_install_post}}\
-    %{__arch_install_post}\
-    %{__os_install_post}\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#      Expanded at end of %prep
-#
-%__id_u                @__ID_U@
-%__chown_Rhf   @__CHOWN_RHF@
-%__chgrp_Rhf   @__CHGRP_RHF@
-%_fixperms     %{__chmod} -Rf a+rX,u+w,g-w,o-w
-%__os_install_post    \
-    %{_rpmconfigdir}/brp-compress \
-    %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
-    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
-    %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}\
-%{nil}
-#---------------------------------------------------------------------
-#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-#
-#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-#%defattr(-,root,root,-)\
-#%{nil}
-
-
-

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros
index 5233f98..298b81b 100644 (file)
--- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros
+++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros
@@ -20,46 +20,16 @@
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-  ./configure --build=%{_build} --host=%{_host} \\\
-       --target=%{_target_platform} \\\
-       --program-prefix=%{?_program_prefix} \\\
-       --prefix=%{_prefix} \\\
-       --exec-prefix=%{_exec_prefix} \\\
-       --bindir=%{_bindir} \\\
-       --sbindir=%{_sbindir} \\\
-       --sysconfdir=%{_sysconfdir} \\\
-       --datadir=%{_datadir} \\\
-       --includedir=%{_includedir} \\\
-       --libdir=%{_libdir} \\\
-       --libexecdir=%{_libexecdir} \\\
-       --localstatedir=%{_localstatedir} \\\
-       --sharedstatedir=%{_sharedstatedir} \\\
-       --mandir=%{_mandir} \\\
-       --infodir=%{_infodir}
+  autotools_do_configure2 
 
 
 %reconfigure \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-  autoreconf -v --install --force || exit 1 \
-  ./configure --build=%{_build} --host=%{_host} \\\
-       --target=%{_target_platform} \\\
-       --program-prefix=%{?_program_prefix} \\\
-       --prefix=%{_prefix} \\\
-       --exec-prefix=%{_exec_prefix} \\\
-       --bindir=%{_bindir} \\\
-       --sbindir=%{_sbindir} \\\
-       --sysconfdir=%{_sysconfdir} \\\
-       --datadir=%{_datadir} \\\
-       --includedir=%{_includedir} \\\
-       --libdir=%{_libdir} \\\
-       --libexecdir=%{_libexecdir} \\\
-       --localstatedir=%{_localstatedir} \\\
-       --sharedstatedir=%{_sharedstatedir} \\\
-       --mandir=%{_mandir} \\\
-       --infodir=%{_infodir}
+  autotools_do_configure2
 
+#TO DO
 %autogen \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
@@ -81,9 +51,10 @@
        --mandir=%{_mandir} \\\
        --infodir=%{_infodir}
 
-
+#TO Check
 %makeinstall \
   %{__make} \\\
+       BINDIR=%{?buildroot:%{buildroot}} \\\
        prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
        exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
        bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
@@ -99,10 +70,12 @@
        infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
   install
 
+#TO Check
 %make_install \
   %{__make} \\\
        DESTDIR=%{?buildroot:%{buildroot}} \\\
        INSTALL_ROOT=%{?buildroot:%{buildroot}} \\\
+       BINDIR=%{?buildroot:%{buildroot}} \\\
   install \
   rm -f %{?buildroot:%{buildroot}}%{_infodir}/dir \
   find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f -- \
@@ -219,8 +192,8 @@ unset DISPLAY\
 rm -rf %{?buildroot:%{buildroot}} \
 %{nil}
 
-%find_lang      /usr/lib/rpm/find-lang.sh %{buildroot}
-%find_docs      /usr/lib/rpm/tizen/find-docs.sh %{buildroot}
+%find_lang      %{_rpmconfigdir}/find-lang.sh %{buildroot}
+%find_docs      %{_rpmconfigdir}/tizen/find-docs.sh %{buildroot}
 
 #
 # use internal dep generator?