Author: glen Date: Fri Feb 15 23:50:50 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - merged KDE 3.5.9 from AC-branch
---- Files affected: SPECS: kdeartwork.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/kdeartwork.spec diff -u SPECS/kdeartwork.spec:1.121 SPECS/kdeartwork.spec:1.122 --- SPECS/kdeartwork.spec:1.121 Sat Dec 29 01:29:36 2007 +++ SPECS/kdeartwork.spec Sat Feb 16 00:50:45 2008 @@ -13,13 +13,13 @@ Summary(pl.UTF-8): K Desktop Environment - grafiki itp. Summary(pt_BR.UTF-8): K Desktop Environment - Plugins e Scripts para aplicações KDE Name: kdeartwork -Version: 3.5.8 +Version: 3.5.9 Release: 2 Epoch: 8 License: LGPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 03becf82a233e6007e9372ffa5756d0b +# Source0-md5: ec526eba38421fd3b143682b8d683c86 Patch0: kde-common-PLD.patch Patch1: %{name}-screensavers.patch Patch2: %{name}-xscreensaver-dir.patch @@ -394,19 +394,26 @@ %{__make} %install -rm -rf $RPM_BUILD_ROOT - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} - -# Makefile installs these basing on XSCREENSAVER_DIR/* files - -# let's do it manually to avoid BR: xscreensaver{,-GL,-GLE} -install kscreensaver/kxsconfig/ScreenSavers/*.desktop $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver -rm -f $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver/pixmaps.desktop +if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then + rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*/*/*.la + %{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + kde_htmldir=%{_kdedocdir} + + touch makeinstall.stamp +fi + +if [ ! -f installed.stamp ]; then + # Makefile installs these basing on XSCREENSAVER_DIR/* files - + # let's do it manually to avoid BR: xscreensaver{,-GL,-GLE} + install kscreensaver/kxsconfig/ScreenSavers/*.desktop $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver + rm -f $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver/pixmaps.desktop + + rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*/*/*.la + touch installed.stamp +fi %clean rm -rf $RPM_BUILD_ROOT @@ -532,6 +539,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.122 2008-02-15 23:50:45 glen +- merged KDE 3.5.9 from AC-branch + Revision 1.121 2007-12-29 00:29:36 glen - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeartwork.spec?r1=1.121&r2=1.122&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
