rpms/hackedbox/devel hackedbox.spec,1.9,1.10

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	hackedbox.spec 
Log Message:
Update License field.



Index: hackedbox.spec
===================================================================
RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hackedbox.spec	2 Feb 2007 14:13:11 -0000	1.9
+++ hackedbox.spec	6 Aug 2007 12:24:06 -0000	1.10
@@ -1,20 +1,17 @@
 Summary: The bastard son of Blackbox, a small and fast Window Manager
 Name: hackedbox
 Version: 0.8.5
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+# Most of the sources are MIT-licensed from blackbox, but a (very) small
+# portion is GPLv2+, so that is the resulting license
+License: GPLv2+
 Group: User Interface/Desktops
 URL: http://scrudgeware.org/projects/Hackedbox
-Source: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz
+Source0: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz
 Source1: hackedbox.desktop
 Patch0: hackedbox-0.8.5-noblackbox.patch
 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
-%else
-BuildRequires: xorg-x11-devel
-%endif
 # We heavily patch *.in files...
 BuildRequires: autoconf, automake, libtool
 
@@ -26,7 +23,7 @@
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .noblackbox
 # Remove included binary files! and *.mk supposed to be built from *.mk.in
 %{__rm} -f util/bsetroot util/bsetroot.o
@@ -44,7 +41,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 
 # Install GDM session file
 %{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions
@@ -66,9 +63,9 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
-%attr(755, root, root) /etc/X11/gdm/Sessions/Hackedbox
+%attr(0755,root,root) /etc/X11/gdm/Sessions/Hackedbox
 %{_bindir}/hackedbox
 %{_bindir}/hsetbg
 %{_bindir}/hsetroot
@@ -84,6 +81,10 @@
 
 
 %changelog
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 0.8.5-2
+- Update License field.
+- Switch to using DESTDIR install method.
+
 * Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 0.8.5-1
 - Update to 0.8.5.
 - Heavily patch to rename b* files (blackbox) to h* (hackedbox), to make both