Hello community, here is the log from the commit of package xlockmore checked in at Tue Aug 1 17:30:04 CEST 2006. -------- --- xlockmore/xlockmore.changes 2006-06-06 21:28:21.000000000 +0200 +++ xlockmore/xlockmore.changes 2006-07-20 22:55:53.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 20 22:55:19 CEST 2006 - lmichnovic@suse.cz + +- fixed build for new X.org 7.x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xlockmore.spec ++++++ --- /var/tmp/diff_new_pack.WUFVTd/_old 2006-08-01 17:28:13.000000000 +0200 +++ /var/tmp/diff_new_pack.WUFVTd/_new 2006-08-01 17:28:13.000000000 +0200 @@ -11,14 +11,14 @@ # norootforbuild Name: xlockmore -BuildRequires: bc esound-devel freeglut-devel freetype freetype2-devel ftgl gcc-c++ libdrm-devel pkgconfig +BuildRequires: bc esound-devel freeglut-devel freetype freetype2-devel ftgl gcc-c++ libdrm-devel libgcc libstdc++ pkgconfig License: Other License(s), see package Group: System/X11/Utilities Provides: xlock Obsoletes: xlock Autoreqprov: on Version: 5.22 -Release: 1 +Release: 3 Summary: Screen Saver and Locker for the X Window System URL: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 @@ -39,6 +39,31 @@ David Albert Bagley <bagleyd@bigfoot.com> Patrick J. Naughton <naughton@eng.sun.com> +%if 0%{?suse_version} <= 1010 +%define _xorg7libs X11R6/%_lib +%define _xorg7libs32 X11R6/lib +%define _xorg7bin X11R6/bin +%define _xorg7mandir /usr/X11R6/man +%define _xorg7pixmaps X11R6/include +%define _xorg7libshare X11R6/lib/ +%define _xorg7xkb /etc/X11/xkb +%define _xorg7termcap /usr/X11R6/lib/X11/etc +%define _xorg7include +%define _xorg7fonts /usr/X11R6/lib/X11/fonts +%define _xorg7prefix /usr/X11R6 +%else +%define _xorg7libs %_lib +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7mandir %_mandir +%define _xorg7pixmaps include +%define _xorg7libshare share +%define _xorg7xkb /usr/share/X11/xkb +%define _xorg7termcap /usr/lib/X11/etc +%define _xorg7include /usr/include/xorg +%define _xorg7fonts /usr/share/fonts +%define _xorg7prefix /usr +%endif %prep %setup -q %patch @@ -56,7 +81,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ - --prefix=/usr/X11R6 \ + --prefix=%{_xorg7prefix} \ --with-libraries=%{_libdir} \ --without-motif \ -without-gtk \ @@ -70,35 +95,38 @@ %install install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/include/X11/bitmaps/ -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/ -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/bin/ -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/ -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/man/man1/ -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/xlock -install -m 644 bitmaps/*.xbm $RPM_BUILD_ROOT/usr/X11R6/include/X11/bitmaps/ -install -m 644 pixmaps/*.xpm $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/ -install -m 755 xlock/xlock $RPM_BUILD_ROOT/usr/X11R6/lib/xlock/xlock -install -m 644 xlock/XLock.ad $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/XLock -install -m 644 xlock/xlock.man $RPM_BUILD_ROOT/usr/X11R6/man/man1/xlock.1x +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%{_xorg7mandir}/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%{_xorg7mandir}/man1/xlock.1x install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/pam.d/xlock -install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/X11R6/bin/xlock +install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc /usr/X11R6/man/man1/xlock.1x.gz +%doc %{_xorg7mandir}/man1/xlock.1x.gz %doc README docs/Revisions docs/TODO %config /etc/pam.d/xlock -%config /usr/X11R6/lib/X11/app-defaults/XLock -/usr/X11R6/bin/xlock -/usr/X11R6/lib/xlock -/usr/X11R6/include/X11/bitmaps -/usr/X11R6/include/X11/pixmaps +%config /usr/%{_xorg7libshare}/X11/app-defaults/XLock +%dir /usr/%{_xorg7libshare}/X11/app-defaults +/usr/%{_xorg7bin}/xlock +/usr/%{_xorg7libs32}/xlock +/usr/%{_xorg7pixmaps}/X11/bitmaps +/usr/%{_xorg7pixmaps}/X11/pixmaps %changelog -n xlockmore +* 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 - fiberlamp fix for array bounds read and leak fix for deluxe ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de