Author: glen Date: Sun Jan 9 17:48:59 2011 GMT Module: packages Tag: HEAD ---- Log message: - relocate code to python dir - works so rel 1
---- Files affected: packages/rpmlint: rpmlint.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: packages/rpmlint/rpmlint.spec diff -u packages/rpmlint/rpmlint.spec:1.28 packages/rpmlint/rpmlint.spec:1.29 --- packages/rpmlint/rpmlint.spec:1.28 Sun Jan 9 17:59:32 2011 +++ packages/rpmlint/rpmlint.spec Sun Jan 9 18:48:54 2011 @@ -2,7 +2,7 @@ Summary: Tool for checking common errors in RPM packages Name: rpmlint Version: 1.0 -Release: 0.3 +Release: 1 License: GPL v2 Group: Development/Building Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 @@ -11,6 +11,7 @@ Patch1: %{name}-config.patch Patch2: %{name}-licenses.patch Patch3: rpm-compat.patch +Patch4: pythonpath.patch URL: http://rpmlint.zarb.org/ BuildRequires: python >= 1.5.2 Requires: /bin/bash @@ -54,6 +55,13 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 + +cat <<'EOF' > rpmlint +#!/bin/sh +exec python -tt -u -O %{py_sitescriptdir}/%{name}/rpmlint.pyc "$@" +EOF +touch __init__.py %build # Create GROUPS for -groups.patch @@ -67,15 +75,16 @@ %{__make} install \ ETCDIR=%{_sysconfdir} \ MANDIR=%{_mandir} \ - LIBDIR=%{_datadir}/%{name} \ + LIBDIR=%{py_sitescriptdir}/%{name} \ BINDIR=%{_bindir} \ DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a GROUPS $RPM_BUILD_ROOT%{_datadir}/%{name} -# perhaps install to python dir for simplicity of spec -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/__*__.py -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/[A-Z]*.py +%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} +%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} +%py_postclean %clean rm -rf $RPM_BUILD_ROOT @@ -83,15 +92,15 @@ %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README* +%dir %{_sysconfdir}/rpmlint +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpmlint/config %attr(755,root,root) %{_bindir}/rpmdiff %attr(755,root,root) %{_bindir}/rpmlint %{_mandir}/man1/rpmlint.1* %dir %{_datadir}/rpmlint -%{_datadir}/rpmlint/*.py[co] -%{_datadir}/rpmlint/rpmlint.py %{_datadir}/rpmlint/GROUPS -%dir %{_sysconfdir}/rpmlint -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpmlint/config +%dir %{py_sitescriptdir}/rpmlint +%{py_sitescriptdir}/rpmlint/*.py[co] %files -n bash-completion-%{name} %defattr(644,root,root,755) @@ -103,6 +112,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2011/01/09 17:48:54 glen +- relocate code to python dir +- works so rel 1 + Revision 1.28 2011/01/09 16:59:32 glen - jbj rpm compat patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpmlint/rpmlint.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
