Author: glen Date: Sun Sep 28 19:55:51 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - extract icon using original source - the icon is .png not .xpm - cosmetics
---- Files affected: SPECS: ftpcube.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/ftpcube.spec diff -u SPECS/ftpcube.spec:1.12 SPECS/ftpcube.spec:1.13 --- SPECS/ftpcube.spec:1.12 Sun Sep 28 21:37:28 2008 +++ SPECS/ftpcube.spec Sun Sep 28 21:55:46 2008 @@ -9,11 +9,12 @@ Source0: http://dl.sourceforge.net/ftpcube/%{name}-%{version}.tar.gz # Source0-md5: 3eb93ae44fa552ec50a24b7882198dd1 Source1: %{name}.desktop -Patch0: %{name}-prog-icon.patch URL: http://ftpcube.sourceforge.net/ BuildRequires: python %pyrequires_eq python-libs +BuildRequires: python-wxPython Requires: python-wxPython +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -42,25 +43,23 @@ %prep %setup -q -%patch0 -p1 %build -python setup.py build # Extracting program icon from .py -python libftpcube/icons/%{name}2.py > %{name}.xpm -rm -f libftpcube/icons/%{name}2.py +%{__python} -c "import libftpcube.icons.ftpcube; print libftpcube.icons.ftpcube.getData()" > %{name}.png +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT - -python setup.py install \ +install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} +%{__python} setup.py install \ --optimize=2 \ --prefix=%{_prefix} \ --install-scripts=%{_bindir} \ --root=$RPM_BUILD_ROOT -install -D %{name}.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm -install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir} +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} %clean rm -rf $RPM_BUILD_ROOT @@ -79,6 +78,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2008/09/28 19:55:46 glen +- extract icon using original source +- the icon is .png not .xpm +- cosmetics + Revision 1.12 2008/09/28 19:37:28 duddits - rel. 2 - patch for the program icon added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ftpcube.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
