SPECS: clive.spec - switch back to setup.py build method

glen glen at pld-linux.org
Fri Apr 25 22:50:46 CEST 2008


Author: glen                         Date: Fri Apr 25 20:50:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switch back to setup.py build method

---- Files affected:
SPECS:
   clive.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/clive.spec
diff -u SPECS/clive.spec:1.18 SPECS/clive.spec:1.19
--- SPECS/clive.spec:1.18	Fri Apr 25 22:40:33 2008
+++ SPECS/clive.spec	Fri Apr 25 22:50:41 2008
@@ -3,17 +3,16 @@
 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
@@ -43,30 +42,26 @@
 #%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
 
@@ -77,13 +72,13 @@
 %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*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -91,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2008-04-25 20:50:41  glen
+- switch back to setup.py build method
+
 Revision 1.18  2008-04-25 20:40:33  glen
 - update to 0.4.10
 - they put automake just to build bundled newt, and we don't use it sigh
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/clive.spec?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list