SPECS: xlockmore.spec - up to 5.23; champagne drank; happy new yea...

[arekm]

Author: arekm                        Date: Sun Dec 31 23:33:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 5.23; champagne drank; happy new year 2007

---- Files affected:
SPECS:
   xlockmore.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/xlockmore.spec
diff -u SPECS/xlockmore.spec:1.55 SPECS/xlockmore.spec:1.56
--- SPECS/xlockmore.spec:1.55	Mon Dec 19 23:08:41 2005
+++ SPECS/xlockmore.spec	Mon Jan  1 00:33:04 2007
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: kill /usr/X11R6 prefix (only _appdefsdir should stay now)
 #
 # Conditional build:
 %bcond_with	sound	# with sound support
@@ -16,22 +15,26 @@
 Summary(tr):	X terminal kilitleme programý
 Summary(uk):	đŇĎÇŇÁÍÁ ĚĎËŐ×ÁÎÎŃ X ÔĹŇÍŚÎÁĚŐ Ú ×ĹĚÉËĎŔ ËŚĚŘËŚÓÔŔ ÚÂĹŇŚÇÁŢŚ× ĹËŇÁÎŐ
 Name:		xlockmore
-Version:	5.12
-Release:	3
+Version:	5.23
+Release:	1
 License:	MIT
 Group:		X11/Amusements
-Source0:	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/%{name}-%{version}.tar.bz2
-# Source0-md5:	f58758fa3757984edee42e141c7a80dc
+Source0:	http://www.tux.org/~bagleyd/latest/%{name}-%{version}.tar.bz2
+# Source0-md5:	bd962b1dfa55ede6137c100bde834ee1
 Source1:	xlock.pamd
 Source2:	%{name}.desktop
 Patch0:		%{name}-sounds_path.patch
 Patch1:		%{name}-vtlock.patch
 URL:		http://www.tux.org/~bagleyd/xlockmore.html
 %{?with_opengl:BuildRequires:	OpenGL-devel}
-BuildRequires:	XFree86-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	autoconf
 %{?with_sound:BuildRequires:	esound-devel}
-%{?with_freetype:BuildRequires:	freetype1-devel}
+%{?with_freetype:BuildRequires:	freetype-devel}
 BuildRequires:	gcc-c++
 BuildRequires:	libtool
 BuildRequires:	pam-devel
@@ -41,10 +44,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define 	_noautoreqdep	libGL.so.1 libGLU.so.1
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
+
 %define		_soundsdir	/usr/share/sounds
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_appdefsdir	%{_datadir}/X11/app-defaults
 %define		__cxx		%{__cc}
 
 %description
@@ -130,6 +132,7 @@
 %{__make} install \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
+	datadir=$RPM_BUILD_ROOT%{_datadir} \
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
 	xapploaddir=$RPM_BUILD_ROOT%{_appdefsdir} \
 	INSTPGMFLAGS="-m 755"
@@ -147,9 +150,10 @@
 %defattr(644,root,root,755)
 %doc README docs/TODO docs/Revisions
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xlock
-%attr(755,root,root) %{_bindir}/xlock
+%attr(755,root,root) %{_bindir}/x*lock
 %{_mandir}/man1/*
 %{_appdefsdir}/XLock
+%{_datadir}/xlock
 %{_desktopdir}/xlockmore.desktop
 %{?with_sound:%{_soundsdir}/%{name}}
 
@@ -159,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2006/12/31 23:33:04  arekm
+- up to 5.23; champagne drank; happy new year 2007
+
 Revision 1.55  2005/12/19 22:08:41  qboosh
 - new-style bcond, no need to specify default attr
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xlockmore.spec?r1=1.55&r2=1.56&f=u