Author: qboosh Date: Thu Dec 2 19:27:30 2010 GMT Module: packages Tag: HEAD ---- Log message: - added pyc patch (fixes .pyc plugins loading) - use py_postclean
---- Files affected: packages/cjc: cjc.spec (1.36 -> 1.37) , cjc-pyc.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cjc/cjc.spec diff -u packages/cjc/cjc.spec:1.36 packages/cjc/cjc.spec:1.37 --- packages/cjc/cjc.spec:1.36 Thu Nov 11 18:43:25 2010 +++ packages/cjc/cjc.spec Thu Dec 2 20:27:25 2010 @@ -5,14 +5,16 @@ Version: 1.2.0 Release: 2 Epoch: 1 -License: GPL +License: GPL v2 Group: Applications/Communications Source0: http://cjc.jajcus.net/downloads/%{name}-%{version}.tar.gz # Source0-md5: ffec1743b44618d5efa3b211de90e63a +Patch0: %{name}-pyc.patch URL: http://cjc.jajcus.net/ -BuildRequires: python -BuildRequires: python-modules +BuildRequires: python >= 1:2.6 +BuildRequires: python-modules >= 1:2.6 BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.234 Requires: python-pyxmpp >= 1.1.0 Suggests: ca-certificates Suggests: python-modules-sqlite @@ -29,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %build %{__make} \ @@ -41,27 +44,27 @@ prefix=%{_prefix} \ DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc +%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/share/doc -%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name} -%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins +%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name} -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}{,/ui}/*.py +%py_postclean %{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README TODO ChangeLog doc/manual.html -%attr(755,root,root) %{_bindir}/* +%doc ChangeLog README TODO doc/manual.html +%attr(755,root,root) %{_bindir}/cjc %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/%{name} +%{_datadir}/%{name}/%{name}/*.py[co] %dir %{_datadir}/%{name}/%{name}/ui +%{_datadir}/%{name}/%{name}/ui/*.py[co] %dir %{_datadir}/%{name}/plugins -%{_datadir}/%{name}/%{name}/*.pyc -%{_datadir}/%{name}/%{name}/ui/*.pyc -%{_datadir}/%{name}/plugins/* +%{_datadir}/%{name}/plugins/*.py[co] %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -69,6 +72,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2010/12/02 19:27:25 qboosh +- added pyc patch (fixes .pyc plugins loading) +- use py_postclean + Revision 1.36 2010/11/11 17:43:25 megabajt - release 2 ================================================================ Index: packages/cjc/cjc-pyc.patch diff -u /dev/null packages/cjc/cjc-pyc.patch:1.1 --- /dev/null Thu Dec 2 20:27:30 2010 +++ packages/cjc/cjc-pyc.patch Thu Dec 2 20:27:25 2010 @@ -0,0 +1,11 @@ +--- cjc-1.2.0/cjc/plugins.py.orig 2010-04-26 19:06:55.000000000 +0200 ++++ cjc-1.2.0/cjc/plugins.py 2010-12-02 20:07:13.038114393 +0100 +@@ -238,7 +238,7 @@ + for path in self._plugin_dirs: + sys.path = [path] + sys_path + for suffix in (".py", ".pyc", ".pyo"): +- filename = os.path.join(path, name + ".py") ++ filename = os.path.join(path, name + suffix) + if os.path.exists(filename): + break + filename = None ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cjc/cjc.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
