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

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	blackbox.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178651 & #178652)



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blackbox.spec	3 Nov 2005 15:11:47 -0000	1.10
+++ blackbox.spec	24 Jan 2006 10:22:10 -0000	1.11
@@ -1,14 +1,20 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
 Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-devel, gcc-c++
+BuildRequires: gcc-c++, pkgconfig
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libXext-devel
+%endif
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -76,34 +82,37 @@
 
 
 %changelog
-* Thu Nov  3 2005 Mattthias Saou <http://freshrpms.net/> 0.70.1-1
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-2
+- Add conditional to build with/without modular X depending on FC version.
+
+* Thu Nov  3 2005 Matthias Saou <http://freshrpms.net/> 0.70.1-1
 - Update to 0.70.1.
 
-* Sat Mar 12 2005 Mattthias Saou <http://freshrpms.net/> 0.70.0-1
+* Sat Mar 12 2005 Matthias Saou <http://freshrpms.net/> 0.70.0-1
 - Update to 0.70.0.
 - Use bz2 source instead of gz.
 - Add devel sub-package for the libbt stuff.
 
-* Tue Nov 16 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-10
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-10
 - Bump release to provide Extras upgrade path.
 
-* Mon Nov 15 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-9
+* Mon Nov 15 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-9
 - Added gcc 3.4 patch from Arch Linux.
 
-* Thu May  6 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Thu May  6 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed switchdesk file, it doesn't work because of hardcoded stuff.
 
-* Wed Mar 24 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Wed Mar 24 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed explicit XFree86 dependency.
 
-* Mon Feb 23 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-7
+* Mon Feb 23 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-7
 - Added blackbox.desktop file for xsessions based on the GNOME one.
 
 * Tue Feb 10 2004 Scott R. Godin <nospam at webdragon.net> 0.65.0-6
 - Patch for #include <cassert> in Window.cc
 - Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
-* Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
+* Fri Nov 14 2003 Matthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.
 
 * Wed May 14 2003 Matthias Saou <http://freshrpms.net/>