diff --git a/python-libcloud.spec b/python-libcloud.spec
new file mode 100644
index 0000000..fef08c8
--- /dev/null
+++ b/python-libcloud.spec
@@ -0,0 +1,66 @@
+%if 0%{?fedora} < 13 || 0%{?rhel} < 6
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+
+%global tarball_name apache-libcloud
+
+Name:           python-libcloud
+Version:        0.11.4
+Release:        3%{?dist}
+Summary:        A Python library to address multiple cloud provider APIs
+
+Group:          Development/Languages
+License:        ASL 2.0
+URL:            http://libcloud.apache.org/
+Source0:        http://pypi.python.org/packages/source/a/apache-libcloud/%{tarball_name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  python-devel python-setuptools
+
+%description
+libcloud is a client library for interacting with many of the popular cloud 
+server providers.  It was created to make it easy for developers to build 
+products that work between any of the services that it supports.
+
+%prep
+%setup -qn %{tarball_name}-%{version}
+
+
+%build
+%{__python} setup.py build
+
+
+%install
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+ 
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE README
+%{python_sitelib}/*
+
+
+%changelog
+* Tue Nov 20 2012 Daniel Bruno dbruno@fedoraproject.org - 0.11.4-3
+- Update to the upstream release 0.11.4
+
+* Fri Jun 15 2012 Daniel Bruno dbruno@fedoraproject.org - 0.9.1-2
+- Update to upstream version 0.10.1
+
+* Mon Apr 16 2012 Daniel Bruno dbruno@fedoraproject.org - 0.9.1-1
+- update to 0.9.1
+
+* Mon Mar 26 2012 Daniel Bruno dbruno@fedoraproject.org - 0.8.0-4
+- Updating release to 0.8.0
+
+* Fri Dec 30 2011 Daniel Bruno dbruno@fedoraproject.org - 0.6.2-3
+- Standardizing the description
+
+* Tue Nov 22 2011 Daniel Bruno dbruno@fedoraproject.org - 0.6.2-2
+- First build package build
diff --git a/sources b/sources
index 0e2c816..ca83f00 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 94b4bebbe500cf4747623e9503213a4a  apache-libcloud-0.11.4.tar.bz2
-=======
-5b63d45f226d2d2fdfa317c576e7bfa6  apache-libcloud-0.11.3.tar.bz2
->>>>>>> 250ecdf29f7522dcf82f41ea8b3da5a1c09e110f