rpms/diradmin/devel diradmin.spec,1.10,1.11

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/diradmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465

Modified Files:
	diradmin.spec 
Log Message:
Rework modular X build requirements.



Index: diradmin.spec
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- diradmin.spec	8 Feb 2006 15:10:20 -0000	1.10
+++ diradmin.spec	14 Mar 2006 10:41:18 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: User control management tool for LDAP directories
 Name: diradmin
 Version: 1.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://diradmin.open-it.org/
@@ -10,9 +10,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils
 BuildRequires: openssl-devel
-# Workaround for modular X and gtk+-devel < 1.2.10-48
-BuildRequires: libX11-devel, libXext-devel, libXi-devel
-BuildRequires: libXpm-devel, libSM-devel
+# Required until libSM-devel gets required by gnome-libs-devel (#184125)
+# Use modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libSM-devel, libXpm-devel
+%endif
+
 Obsoletes: directory_administrator <= 1.5.1-4
 
 %description
@@ -88,6 +91,10 @@
 
 
 %changelog
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.7.1-4
+- Remove nearly all modular X build requirements (still libSM-devel #184125).
+- Add libXpm-devel build requirement, it's an optional configure check.
+
 * Wed Feb  8 2006 Matthias Saou <http://freshrpms.net/> 1.7.1-3
 - Rebuild for new gcc/glibc.
 - Still no fix for #171557 though, sorry.