SPECS (AC-branch): xscreensaver.spec - AC-branch

[glen]

Author: glen                         Date: Fri May 18 08:20:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC-branch

---- Files affected:
SPECS:
   xscreensaver.spec (1.156 -> 1.156.2.1) 

---- Diffs:

================================================================
Index: SPECS/xscreensaver.spec
diff -u SPECS/xscreensaver.spec:1.156 SPECS/xscreensaver.spec:1.156.2.1
--- SPECS/xscreensaver.spec:1.156	Fri May 18 07:26:34 2007
+++ SPECS/xscreensaver.spec	Fri May 18 10:20:32 2007
@@ -43,17 +43,16 @@
 BuildRequires:	pam-devel >= 0.77.3
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
-Requires:	%{name}-savers = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.77.3
 Requires:	perl-perldoc
-Requires:	xorg-lib-libXt >= 1.0.0
+Requires:	%{name}-savers = %{epoch}:%{version}-%{release}
 Obsoletes:	xscreensaver-gnome
 Obsoletes:	xscreensaver-gnome1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1 libGLcore.so.1
 %define		_sysconfdir	/etc/X11
-%define		_appdefsdir	/usr/share/X11/app-defaults
+%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
 
 %description
 Screen savers of every sort are included in this package, guaranteeing
@@ -213,7 +212,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	install_prefix=$RPM_BUILD_ROOT \
-	AD_DIR=%{_appdefsdir} \
 	PAM_DIR=/etc/pam.d
 
 install -d $RPM_BUILD_ROOT{/etc/pam.d,%{_desktopdir}}
@@ -339,6 +337,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156.2.1  2007/05/18 08:20:32  glen
+- AC-branch
+
 Revision 1.156  2007/05/18 05:26:34  qboosh
 - recent CVE reference
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xscreensaver.spec?r1=1.156&r2=1.156.2.1&f=u