From: jk7744.park <jk7744.park@samsung.com>
Date: Tue, 8 Sep 2015 17:18:00 +0000 (+0900)
Subject: tizen 2.3.1 release
X-Git-Tag: submit/tizen_2.3.1/20150915.095009^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_2.3.1;p=toolchains%2Fbuild.git

tizen 2.3.1 release
---

diff --git a/packaging/build-pkg-config.patch b/packaging/build-pkg-config.patch
new file mode 100644
index 0000000..b9d19e8
--- /dev/null
+++ b/packaging/build-pkg-config.patch
@@ -0,0 +1,22 @@
+diff -urNp build-2011.01.10a.orig/baselibs_global.conf build-2011.01.10a/baselibs_global.conf
+--- build-2011.01.10a.orig/baselibs_global.conf	2011-01-12 03:51:01.000000000 +0900
++++ build-2011.01.10a/baselibs_global.conf	2012-07-09 15:56:10.376000273 +0900
+@@ -28,6 +28,7 @@ targettype x86   -/lib64/
+ 
+ config    +.*bin.*-config$
+ config    -/kde-config$
++config    -/pkg-config$
+ 
+ targettype x86 requires "ia32el"
+ targettype x86 prereq "glibc-x86"
+diff -urNp build-2011.01.10a.orig/baselibs_global-deb.conf build-2011.01.10a/baselibs_global-deb.conf
+--- build-2011.01.10a.orig/baselibs_global-deb.conf	2011-01-12 03:51:01.000000000 +0900
++++ build-2011.01.10a/baselibs_global-deb.conf	2012-07-09 15:56:30.616001735 +0900
+@@ -22,6 +22,7 @@ targettype x86   -/lib64/
+ 
+ config    +.*bin.*-config$
+ config    -/kde-config$
++config    -/pkg-config$
+ 
+ targettype x86 requires "ia32el"
+ targettype x86 prereq "glibc-x86"
diff --git a/packaging/build.changes b/packaging/build.changes
index 322616f..2db3f65 100644
--- a/packaging/build.changes
+++ b/packaging/build.changes
@@ -1,3 +1,6 @@
+* Mon Jul 09 2012 UkJung Kim <ujkim@samsung.com> - 2011.01.10a
+- Ignore pkg-config from config file lists
+
 * Wed Jan 19 2011 Jian-feng Ding <jian-feng.ding@intel.com> - 2011.01.10a
 - Update to 2011.01.10 snapshot, with three extra commits
   git HEAD: 585759875f7d225b6fc8f3e76cdffe955825dab4
diff --git a/packaging/build.manifest b/packaging/build.manifest
deleted file mode 100644
index 017d22d..0000000
--- a/packaging/build.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>
diff --git a/packaging/build.spec b/packaging/build.spec
index b9e0f11..a9544b2 100644
--- a/packaging/build.spec
+++ b/packaging/build.spec
@@ -39,7 +39,7 @@ Release:        1
 # osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory
 Source:         build-%{version}.tar.gz
 Source1:        tizen-1.0.conf
-Source1001: packaging/build.manifest 
+Patch100:       build-pkg-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 # Manual requires to avoid hard require to bash-static
@@ -57,9 +57,9 @@ chroot environment.
 
 %prep
 %setup -q
+%patch100 -p1
 
 %build
-cp %{SOURCE1001} .
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -68,7 +68,6 @@ cd %{buildroot}%{_prefix}/lib/build/configs/
 ln -s tizen-1.0.conf default.conf
 
 %files
-%manifest build.manifest
 %defattr(-,root,root)
 %doc README
 %{_bindir}/build
diff --git a/packaging/tizen-1.0.conf b/packaging/tizen-1.0.conf
index 0d8fd21..ce91b1e 100644
--- a/packaging/tizen-1.0.conf
+++ b/packaging/tizen-1.0.conf
@@ -185,7 +185,7 @@ Macros:
 %moblin 2.2
 %tizen 1.0 
 %opensuse_bs 1
-%vendor TIZEN
+%vendor Tizen
 %_vendor tizen
 %_default_patch_fuzz   2