rpms/blackbox/devel blackbox.spec,1.17,1.18

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	blackbox.spec 
Log Message:
Minor cleanups.



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blackbox.spec	29 Mar 2007 11:39:33 -0000	1.17
+++ blackbox.spec	19 Jun 2007 18:41:23 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
@@ -9,12 +9,7 @@
 Source1: blackbox.desktop
 Source2: blackbox.session
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 5
 BuildRequires: libXt-devel, libXext-devel, libXft-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
 # Required for autoreconf
 BuildRequires: automake, autoconf, libtool
 
@@ -31,12 +26,7 @@
 Summary: Blackbox Toolbox library for writing small applications
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}, pkgconfig
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 5
 Requires: libXft-devel
-%else
-Requires: xorg-x11-devel
-%endif
 
 %description devel
 This package contains the Blackbox Toolbox files, headers and static library
@@ -58,7 +48,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 
 # Install the desktop entry
 %{__install} -D -p -m 0644 %{SOURCE1} \
@@ -102,6 +92,10 @@
 
 
 %changelog
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 0.70.1-7
+- Switch to using the DESTDIR install method.
+- Remove old X build requirements conditionals.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-6
 - Switch to shared libbt library, so have devel require main and call ldconfig.
 - Make the GDM session file be a separate source.