Author: glen Date: Wed Mar 5 07:25:19 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - re-entrant install, cleanups, skip duplicate docs, add .desktop file
---- Files affected: SPECS: tuxpaint-config.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/tuxpaint-config.spec diff -u SPECS/tuxpaint-config.spec:1.1 SPECS/tuxpaint-config.spec:1.2 --- SPECS/tuxpaint-config.spec:1.1 Wed Mar 5 01:42:33 2008 +++ SPECS/tuxpaint-config.spec Wed Mar 5 08:25:13 2008 @@ -10,33 +10,35 @@ Source0: http://dl.sourceforge.net/tuxpaint/%{name}-%{version}.tar.gz # Source0-md5: 11e705f18176882ec9f2c1a1ee353c9c URL: http://www.tuxpaint.org/ -BuildRequires: fltk-devel BuildRequires: SDL_Pango-devel BuildRequires: SDL_image-devel >= 1.2.2 BuildRequires: SDL_mixer-devel >= 1.2.4 BuildRequires: SDL_ttf-devel >= 2.0.5 +BuildRequires: fltk-devel BuildRequires: gettext-devel BuildRequires: libpaper-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -The add-on for "Tux Paint" program, a graphical tool can be used -to change Tux Paint's settings. +The add-on for "Tux Paint" program, a graphical tool can be used to +change Tux Paint's settings. %prep %setup -q +find docs -type d -name CVS | xargs rm -rf + %build %{__make} \ CC="%{__cc}" \ - PREFIX="%{_prefix}" \ - CONFDIR="%{_sysconfdir}" \ - DATA_PREFIX="%{_datadir}/tuxpaint" \ - DOC_PREFIX="%{_datadir}/doc" \ - ICON_PREFIX="%{_pixmapsdir}" \ - X11_ICON_PREFIX="%{_pixmapsdir}" \ - LOCALE_PREFIX="%{_datadir}/locale" \ - KDE_ICON_PREFIX="%{_datadir}/icons" \ + PREFIX=%{_prefix} \ + CONFDIR=%{_sysconfdir} \ + DATA_PREFIX=%{_datadir}/tuxpaint \ + DOC_PREFIX=%{_docdir} \ + ICON_PREFIX=%{_pixmapsdir}/ \ + X11_ICON_PREFIX=%{_pixmapsdir}/ \ + LOCALE_PREFIX=%{_datadir}/locale \ + KDE_ICON_PREFIX=%{_datadir}/icons \ OPTFLAGS="%{rpmcflags}" %install @@ -44,43 +46,42 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{48x48,32x32,16x16}/apps - %{__make} install \ - BINDIR=$RPM_BUILD_ROOT%{_bindir}/ \ - PREFIX=$RPM_BUILD_ROOT%{_prefix}/ \ - CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir}/ \ - MAN_PREFIX=$RPM_BUILD_ROOT%{_mandir}/ \ - GNOME_PREFIX=$RPM_BUILD_ROOT%{_prefix}/ \ - KDE_PREFIX=$RPM_BUILD_ROOT%{_desktopdir}/ \ - KDE_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/icons/ \ + BINDIR=$RPM_BUILD_ROOT%{_bindir} \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \ + MAN_PREFIX=$RPM_BUILD_ROOT%{_mandir} \ + GNOME_PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + KDE_PREFIX=$RPM_BUILD_ROOT%{_desktopdir} \ + KDE_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/icons \ X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_pixmapsdir}/ \ ICON_PREFIX="$RPM_BUILD_ROOT%{_pixmapsdir}/" -#rm a lot of unwanted files and directories: -find docs/ -type d|grep CVS|xargs rm -rf -find docs/ -name "[KC]OP*" -exec rm -f "{}" ";" -find docs/ -name "INS*" -exec rm -f "{}" ";" -find docs/ -name "AUT*" -exec rm -f "{}" ";" -find docs/ -size -50c -type f -exec rm -f "{}" ";" -find docs/ -empty |xargs rm -rf +mv $RPM_BUILD_ROOT{%{_datadir}/applications/Preferences,%{_desktopdir}}/tuxpaint-config.desktop + +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} +rm -rf _docs +cp -a docs _docs +# rm a lot of unwanted files and directories: +find _docs -name "[KC]OP*" | xargs rm -f +find _docs -name "INS*" | xargs rm -f +find _docs -size -50c -type f | xargs rm -f +find _docs -empty | xargs -r rmdir %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc docs/* -%dir %{_docdir}/%{name} -%dir %{_docdir}/%{name}/html -%doc %{_docdir}/%{name}/*.txt -%doc %{_docdir}/%{name}/html/*.html +%doc _docs/* %attr(755,root,root) %{_bindir}/* %{_mandir}/man?/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_iconsdir}/hicolor/*/apps/*.png -#%{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%{_desktopdir}/*.desktop +%{_pixmapsdir}/*.png +%{_pixmapsdir}/*.xpm %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -88,6 +89,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2008-03-05 07:25:13 glen +- re-entrant install, cleanups, skip duplicate docs, add .desktop file + Revision 1.1 2008-03-05 00:42:33 wolvverine - init - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tuxpaint-config.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
