- switch back to setup.py build method

Changed files:
    clive.spec -> 1.19

diff --git a/clive.spec b/clive.spec
index 655487e99ce048be29d554d6779c5d8ab4e95e40..e96c9f07f4b4fec5ad110db8f4fed96d529b8a7a 100644 (file)
--- a/clive.spec
+++ b/clive.spec
@@ -2,17 +2,16 @@ Summary:      Video extraction utility for YouTube and Google Video
 Summary(pl.UTF-8):     Narzędzie do wydobywania filmów z YouTube i Google Video
 Name:          clive
 Version:       0.4.10
-Release:       0.12
+Release:       0.14
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/clive/%{name}-%{version}.tar.bz2
 # Source0-md5: f6aec28af6b7794e2c4c833d80c8284a
+Source1:       %{name}-setup.py
 Patch0:                %{name}-setup.patch
 Patch1:                %{name}-delfi.patch
 Patch2:                %{name}-spz.patch
 URL:           http://home.gna.org/clive/
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: python-devel >= 1:2.4
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
@@ -42,30 +41,26 @@ ffmpegiem) do przekodowywania wyciągniętych filmów do innych formatów
 #%patch1 -p1
 #%patch2 -p1
 
-#rm -rf src/clive/{urlgrabber,feedparser,newt}
 
-%{__sed} -i -e 's,\(SUBDIRS = \)urlgrabber feedparser newt,\1,' src/clive/Makefile.am
+# switch back to python install. we don't need autofoo as we don't build newt
+cp %{SOURCE1} setup.py
 rm -f configure aclocal.m4
+
+# get rid of bundled packages
+rm -rf src/clive/{urlgrabber,feedparser,newt}
+# fix imports to use system pkgs
 %{__sed} -i -e 's,\(from\|import\) clive.\(newt\|urlgrabber\),\1 \2,' src/clive/*.py
 %{__sed} -i -e 's,from clive\.feedparser ,,' src/clive/*.py
 %{__sed} -i -e 's,\(import\) clive\.feedparser\.,\1 ,' src/clive/*.py
 
-
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --host=%{_arch}-pld-linux \
-       --build=%{_arch}-pld-linux \
-       --without-newt
-%{__make}
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+python setup.py install \
+       --optimize=2 \
+       --root=$RPM_BUILD_ROOT
 
 %py_postclean
 
@@ -76,10 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/clive
+%{_mandir}/man1/clive.1*
 %dir %{py_sitescriptdir}/%{name}
 %{py_sitescriptdir}/%{name}/*.py[co]
 
 %if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/clive-*.egg-info
 %endif
-%{_mandir}/man1/clive.1*