diff --git a/joshthecoder-tweepy-1.7.1-0-gc454e06.tar.gz b/joshthecoder-tweepy-1.7.1-0-gc454e06.tar.gz
deleted file mode 100644
index b816893..0000000
--- a/joshthecoder-tweepy-1.7.1-0-gc454e06.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2f8037b9b007e053130cc2ceb564526d013e3539c515bd70476ad1391ea18a0
-size 41344
diff --git a/python-tweepy.changes b/python-tweepy.changes
index 780c589..a2e21b0 100644
--- a/python-tweepy.changes
+++ b/python-tweepy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 31 13:24:54 UTC 2011 - saschpe@suse.de
+
+- Re-generated with py2pack
+
 -------------------------------------------------------------------
 Wed Sep 15 19:02:32 UTC 2010 - pascal.bleser@opensuse.org
 
diff --git a/python-tweepy.spec b/python-tweepy.spec
index 2cc94b6..ad0a12a 100644
--- a/python-tweepy.spec
+++ b/python-tweepy.spec
@@ -1,81 +1,62 @@
-# vim: set sw=4 ts=4 et nu:
-# norootforbuild
+#
+# spec file for package python-tweepy
+#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-%{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-Name:               python-tweepy
-Version:            1.7.1
-%define pkg_version %{version}-0-gc454e06
-Release:            0
-Summary:            Twitter Library for Python
-Source:             http://download.github.com/joshthecoder-tweepy-%{pkg_version}.tar.gz
-URL:                http://github.com/joshthecoder/tweepy
-Group:              Development/Libraries/Python
-License:            MIT License
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      python python-devel
-BuildRequires:      python-setuptools
-BuildRequires:      gcc make glibc-devel pkgconfig
-%if 0%{?suse_version} >= 1120
-BuildArch:			noarch
-%endif
+Name:           python-tweepy
+Version:        1.7.1
+Release:        0
+Url:            http://github.com/joshthecoder/tweepy
+Summary:        Twitter library for python
+License:        MIT
+Group:          Development/Languages/Python
+Source:         tweepy-1.7.1.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python-devel
+BuildRequires:  python-distribute
+BuildRequires:  python-simplejson
+Requires:       python-simplejson
+%if 0%{?suse_version}
 %py_requires
-BuildRequires:      IPython
-BuildRequires:      python-mako
-BuildRequires:      python-simplejson
-Requires:           python-simplejson
+%if 0%{?suse_version} > 1110
+BuildArch:      noarch
+%endif
+%endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %description
-Twitter library for Python, also works with identi.ca/laconi.ca.
-
-Features:
-+ OAuth support (including xAuth)
-+ Covers the entire Twitter API
-+ Actively under development
-+ Streaming API support
-+ Cache system (memory, file)
-
-%package -n tweepyshell
-Summary:            Twitter Command-Line Shell
-Requires:           %{name} = %{version}
-Requires:           IPython
-Requires:           python-mako
-Group:              Productivity/Networking/Instant Messenger
-
-%description -n tweepyshell
-Twitter shell, also works with identi.ca/laconi.ca.
-
-Features:
-+ OAuth support (including xAuth)
-+ Covers the entire Twitter API
-+ Actively under development
-+ Streaming API support
-+ Cache system (memory, file)
+A library for accessing the Twitter.com API. Supports OAuth, covers the entire
+API, and streaming API.
 
 %prep
-%setup -q -n "joshthecoder-tweepy-c9a870b"
+%setup -q -n tweepy-%{version}
 
 %build
-%__python ./setup.py build
+export CFLAGS="%{optflags}"
+python setup.py build
 
 %install
-%__python ./setup.py install \
-    --prefix="%{_prefix}" \
-    --root="%{buildroot}" \
-    --record-rpm=files.lst
-
-%__install -D -m0755 tweepyshell "%{buildroot}%{_bindir}/tweepyshell"
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 %clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+rm -rf %{buildroot}
 
-%files -f files.lst
-%defattr(-,root,root)
-%doc CHANGELOG CONTRIBUTORS LICENSE README
-%doc doc/*.rst
-
-%files -n tweepyshell
-%defattr(-,root,root)
-%{_bindir}/tweepyshell
+%files
+%defattr(-,root,root,-)
+%doc README
+%{python_sitelib}/*
 
+%changelog
diff --git a/tweepy-1.7.1.tar.gz b/tweepy-1.7.1.tar.gz
new file mode 100644
index 0000000..6bdb7ea
--- /dev/null
+++ b/tweepy-1.7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39f0b39be41bf00c00e2dae3c1e621908c3fada7a93b6a5012c28a4db1928c86
+size 19958