Hello community,
here is the log from the commit of package xlockmore
checked in at Sun Aug 6 22:20:36 CEST 2006.
--------
--- xlockmore/xlockmore.changes 2006-07-20 22:55:53.000000000 +0200
+++ xlockmore/xlockmore.changes 2006-08-03 17:12:30.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 2 16:07:32 CEST 2006 - lmichnovic@suse.cz
+
+- distinguishing prefix in X.org instead of suse_version
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xlockmore.spec ++++++
--- /var/tmp/diff_new_pack.MCqOst/_old 2006-08-06 22:20:31.000000000 +0200
+++ /var/tmp/diff_new_pack.MCqOst/_new 2006-08-06 22:20:31.000000000 +0200
@@ -11,14 +11,14 @@
# norootforbuild
Name: xlockmore
-BuildRequires: bc esound-devel freeglut-devel freetype freetype2-devel ftgl gcc-c++ libdrm-devel libgcc libstdc++ pkgconfig
+BuildRequires: bc esound-devel freeglut-devel freetype freetype2-devel ftgl gcc-c++ libdrm-devel libstdc++ pkgconfig
License: Other License(s), see package
Group: System/X11/Utilities
Provides: xlock
Obsoletes: xlock
Autoreqprov: on
Version: 5.22
-Release: 3
+Release: 4
Summary: Screen Saver and Locker for the X Window System
URL: http://www.tux.org/~bagleyd/xlockmore.html
Source: %{name}-%{version}.tar.bz2
@@ -39,30 +39,30 @@
David Albert Bagley
Patrick J. Naughton
-%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
+%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
%define _xorg7libs %_lib
%define _xorg7libs32 lib
%define _xorg7bin bin
-%define _xorg7mandir %_mandir
+%define _xorg7_mandir %_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
+%define _xorg7_xkb /usr/share/X11/xkb
+%define _xorg7_termcap /usr/lib/X11/etc
+%define _xorg7_serverincl /usr/include/xorg
+%define _xorg7_fonts /usr/share/fonts
+%define _xorg7_prefix /usr
+%else
+%define _xorg7libs X11R6/%_lib
+%define _xorg7libs32 X11R6/lib
+%define _xorg7bin X11R6/bin
+%define _xorg7_mandir /usr/X11R6/man
+%define _xorg7pixmaps X11R6/include
+%define _xorg7libshare X11R6/lib/
+%define _xorg7_xkb /etc/X11/xkb
+%define _xorg7_termcap /usr/X11R6/lib/X11/etc
+%define _xorg7_serverincl /usr/X11R6/lib/Server/include
+%define _xorg7_fonts /usr/X11R6/lib/X11/fonts
+%define _xorg7_prefix /usr/X11R6
%endif
%prep
%setup -q
@@ -81,7 +81,7 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS"
./configure \
- --prefix=%{_xorg7prefix} \
+ --prefix=%{_xorg7_prefix} \
--with-libraries=%{_libdir} \
--without-motif \
-without-gtk \
@@ -91,7 +91,7 @@
--enable-vtlock \
--disable-gtk \
--enable-use-mb
-make
+make %{?jobs:-j%jobs}
%install
install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d
@@ -99,13 +99,13 @@
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%{_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%{_xorg7mandir}/man1/xlock.1x
+install -m 644 xlock/xlock.man $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/xlock.1x
install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/pam.d/xlock
install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
@@ -114,17 +114,18 @@
%files
%defattr(-, root, root)
-%doc %{_xorg7mandir}/man1/xlock.1x.gz
+%doc %{_xorg7_mandir}/man1/xlock.1x.gz
%doc README docs/Revisions docs/TODO
%config /etc/pam.d/xlock
%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
+/usr/%{_xorg7pixmaps}/X11/bitmaps/*
+/usr/%{_xorg7pixmaps}/X11/pixmaps/*
%changelog -n xlockmore
+* Wed Aug 02 2006 - lmichnovic@suse.cz
+- distinguishing prefix in X.org instead of suse_version
* Thu Jul 20 2006 - lmichnovic@suse.cz
- fixed build for new X.org 7.x
* Tue Jun 06 2006 - lmichnovic@suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...