diff --git a/xlockmore.changes b/xlockmore.changes index 8fa62f8..c1328ea 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 28 14:22:04 CET 2008 - sbrabec@suse.cz + +- Do not install compile time pixmaps (bnc#450061). + ------------------------------------------------------------------- Wed Sep 3 14:24:03 CEST 2008 - sbrabec@suse.cz diff --git a/xlockmore.spec b/xlockmore.spec index aa192d4..1aef86c 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -26,7 +26,7 @@ Provides: xlock Obsoletes: xlock AutoReqProv: on Version: 5.26.1 -Release: 1 +Release: 9 Summary: Screen Saver and Locker for the X Window System Url: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 @@ -121,14 +121,10 @@ make %{?jobs:-j%jobs} %install install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d -install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/bitmaps/ -install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7bin}/ install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/ install -d -m 755 $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/ install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock -install -m 644 bitmaps/*.xbm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/bitmaps/ -install -m 644 pixmaps/*.xpm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ install -m 755 xlock/xlock $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock/xlock install -m 644 xlock/XLock.ad $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/XLock install -m 644 xlock/xlock.man $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/xlock.1x @@ -151,14 +147,10 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_xorg7libshare}/X11/app-defaults/XLock /usr/%{_xorg7bin}/xlock /usr/%{_xorg7libs32}/xlock -/usr/%{_xorg7pixmaps}/X11/bitmaps/* -/usr/%{_xorg7pixmaps}/X11/pixmaps/* -%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr/X11R6" -%dir /usr/X11R6/include/X11/bitmaps -%dir /usr/X11R6/include/X11/pixmaps -%endif %changelog +* Fri Nov 28 2008 sbrabec@suse.cz +- Do not install compile time pixmaps (bnc#450061). * Wed Sep 03 2008 sbrabec@suse.cz - Updated to version 5.26.1: * PAM_putText() would set pointer resp->resp to buffer. @@ -231,7 +223,7 @@ rm -rf $RPM_BUILD_ROOT - fixed paths in xlock wrapper script * Wed Aug 02 2006 lmichnovic@suse.cz - distinguishing prefix in X.org instead of suse_version -* Fri Jul 21 2006 lmichnovic@suse.cz +* Thu Jul 20 2006 lmichnovic@suse.cz - fixed build for new X.org 7.x * Tue Jun 06 2006 lmichnovic@suse.cz - Update to version 5.22 @@ -321,7 +313,7 @@ rm -rf $RPM_BUILD_ROOT -erasemode all-circle_wipe * and many bug fixes - helper-bug.dif merged in helper.dif -* Tue Nov 19 2002 ro@suse.de +* Mon Nov 18 2002 ro@suse.de - removed duplication of AC_CONFIG_HEADER(config.h) * Thu Sep 19 2002 pmladek@suse.cz - previous change fixes the bugs #18790, #14329 and not the bug #18774 @@ -408,7 +400,7 @@ rm -rf $RPM_BUILD_ROOT - make xlock sgid "shadow" and not suid "root" * Sun Apr 27 1997 bs@suse.de - update to new version 4.02 (security fix) -* Mon Apr 14 1997 florian@suse.de +* Sun Apr 13 1997 florian@suse.de - update to new version 4.01 - do not enable automatic logout button * Sun Feb 02 1997 florian@suse.de