Merge branch 'upstream' into tizen

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

diff --git a/packaging/libXxf86vm.changes b/packaging/libXxf86vm.changes
new file mode 100644 (file)
index 0000000..29581cb
--- /dev/null
+++ b/packaging/libXxf86vm.changes
@@ -0,0 +1,6 @@
+* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130204.203738@2550c40
+- Fixed package groups
+
+* Mon Feb 04 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.1.2@dbd54fc
+- Add multi-lib support
+

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

diff --git a/packaging/libXxf86vm.spec b/packaging/libXxf86vm.spec
new file mode 100644 (file)
index 0000000..e11ec2e
--- /dev/null
+++ b/packaging/libXxf86vm.spec
@@ -0,0 +1,61 @@
+%bcond_with x
+
+Name:           libXxf86vm
+Version:        1.1.2
+Release:        1
+License:        MIT
+Summary:        X.org libXxf86vm library
+Url:            http://www.x.org
+Group:          Graphics/X Window System
+Source:         %{name}-%{version}.tar.bz2
+Source1001:    libXxf86vm.manifest
+
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xf86vidmodeproto)
+BuildRequires:  pkgconfig(xorg-macros)
+
+%if !%{with x}
+ExclusiveArch:
+%endif
+
+%description
+X.Org X11 libXxf86vm runtime library
+
+%package devel
+Summary:        X.org libXxf86vm library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+
+%description devel
+X.Org X11 libXxf86vm development package
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%reconfigure --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}/libXxf86vm.so.1
+%{_libdir}/libXxf86vm.so.1.0.0
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libXxf86vm.so
+%{_libdir}/pkgconfig/xxf86vm.pc
+%{_includedir}/X11/extensions/xf86vmode.h