Merge branch 'upstream' into tizen

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..bc478e6
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1 @@
+libXres

diff --git a/packaging/libXres.changes b/packaging/libXres.changes
new file mode 100644 (file)
index 0000000..6962e46
--- /dev/null
+++ b/packaging/libXres.changes
@@ -0,0 +1,6 @@
+* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130221.150404@3b28597
+- Fixed package groups
+
+* Thu Feb 21 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.0.6@f334a82
+- Add baselibs.conf to support multilib
+

diff --git a/packaging/libXres.manifest b/packaging/libXres.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/libXres.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/libXres.spec b/packaging/libXres.spec
new file mode 100644 (file)
index 0000000..8db6a32
--- /dev/null
+++ b/packaging/libXres.spec
@@ -0,0 +1,62 @@
+%bcond_with x
+
+Name:           libXres
+Version:        1.0.6
+Release:        1
+License:        MIT
+Summary:        X-Resource extension client library
+Url:            http://www.x.org
+Group:          Graphics/X Window System
+Source0:        %{name}-%{version}.tar.bz2
+Source1001:    libXres.manifest
+BuildRequires:  pkgconfig(resourceproto)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xorg-macros)
+BuildRequires:  pkgconfig(xproto)
+
+%if !%{with x}
+ExclusiveArch:
+%endif
+
+%description
+X-Resource is an extension that allows a client to query
+the X server about its usage of various resources.
+
+%package devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+
+%description devel
+X.Org X11 libXres development package
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+
+%install
+%make_install
+
+%remove_docs
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license COPYING
+%{_libdir}/libXRes.so.1
+%{_libdir}/libXRes.so.1.0.0
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_includedir}/X11/extensions/XRes.h
+%{_libdir}/libXRes.so
+%{_libdir}/pkgconfig/xres.pc