rpms/hackedbox/devel hackedbox-0.8.5-noblackbox.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hackedbox.spec, 1.8, 1.9 sources, 1.3, 1.4 blackbox-0.65.0-gcc34.patch, 1.1, NONE

Author: thias

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

Modified Files:
	.cvsignore hackedbox.spec sources 
Added Files:
	hackedbox-0.8.5-noblackbox.patch 
Removed Files:
	blackbox-0.65.0-gcc34.patch 
Log Message:
Update to 0.8.5 and make hackedbox parallel installable to blackbox.


hackedbox-0.8.5-noblackbox.patch:

--- NEW FILE hackedbox-0.8.5-noblackbox.patch ---
diff -Naupr hackedbox-0.8.5.orig/configure.in hackedbox-0.8.5/configure.in
--- hackedbox-0.8.5.orig/configure.in	2007-01-20 06:55:21.000000000 +0100
+++ hackedbox-0.8.5/configure.in	2007-02-02 14:56:01.000000000 +0100
@@ -103,10 +103,10 @@ AC_SUBST(SHAPE)
 LIBS="$LIBS $Xext_lib"
 
 dnl Check for enable utils.
-AC_MSG_CHECKING([whether to build utils bsetroot and bsetbg])
+AC_MSG_CHECKING([whether to build utils hsetroot and hsetbg])
 AC_ARG_ENABLE(
-  bg-utils, 
-  [  --enable-bg-utils        enable build utils bsetroot and bsetbg [default=no]],
+  hg-utils, 
+  [  --enable-hg-utils        enable build utils hsetroot and hsetbg [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     UTILS="util"
@@ -242,7 +242,7 @@ src/Makefile
 src/inithack
 src/blackbox.cc
 util/Makefile
-util/bgmenu.mk
+util/hgmenu.mk
 data/Makefile
 data/menu
 data/styles/Makefile
diff -Naupr hackedbox-0.8.5.orig/doc/hackedbox.1 hackedbox-0.8.5/doc/hackedbox.1
--- hackedbox-0.8.5.orig/doc/hackedbox.1	2007-01-20 07:05:38.000000000 +0100
+++ hackedbox-0.8.5/doc/hackedbox.1	2007-02-02 14:46:09.000000000 +0100
@@ -565,7 +565,7 @@ frameWidth:	a number of pixels >= 0
 
 ! This command is executed whenever this style is selected.
 ! Typically it sets the root window to a nice picture.
-rootCommand:	Shell command, e.g. \fIbsetroot \-mod 4 4 \-fg rgb:	5/6/6 \-bg grey20\fR
+rootCommand:	Shell command, e.g. \fIhsetroot \-mod 4 4 \-fg rgb:	5/6/6 \-bg grey20\fR
 
 ! Some of the bbtools read these old 0.51 resources.
 menuFont:	Font
diff -Naupr hackedbox-0.8.5.orig/doc/hackedbox.1.in hackedbox-0.8.5/doc/hackedbox.1.in
--- hackedbox-0.8.5.orig/doc/hackedbox.1.in	2003-04-28 14:25:15.000000000 +0200
+++ hackedbox-0.8.5/doc/hackedbox.1.in	2007-02-02 14:46:02.000000000 +0100
@@ -565,7 +565,7 @@ frameWidth:	a number of pixels >= 0
 
 ! This command is executed whenever this style is selected.
 ! Typically it sets the root window to a nice picture.
-rootCommand:	Shell command, e.g. \fIbsetroot \-mod 4 4 \-fg rgb:	5/6/6 \-bg grey20\fR
+rootCommand:	Shell command, e.g. \fIhsetroot \-mod 4 4 \-fg rgb:	5/6/6 \-bg grey20\fR
 
 ! Some of the bbtools read these old 0.51 resources.
 menuFont:	Font
diff -Naupr hackedbox-0.8.5.orig/doc/Makefile.am hackedbox-0.8.5/doc/Makefile.am
--- hackedbox-0.8.5.orig/doc/Makefile.am	2004-05-06 05:46:44.000000000 +0200
+++ hackedbox-0.8.5/doc/Makefile.am	2007-02-02 14:45:37.000000000 +0100
@@ -3,7 +3,6 @@
 CLEANFILES = hackedbox.1
 MAINTAINERCLEANFILES = Makefile.in
 man_MANS = hackedbox.1
-SUBDIRS = fr_FR ja_JP nl_NL sl_SI
 
 DEFAULT_MENU=$(pkgdatadir)/menu
 
diff -Naupr hackedbox-0.8.5.orig/util/Makefile.am hackedbox-0.8.5/util/Makefile.am
--- hackedbox-0.8.5.orig/util/Makefile.am	2004-05-06 04:27:22.000000000 +0200
+++ hackedbox-0.8.5/util/Makefile.am	2007-02-02 14:54:04.000000000 +0100
@@ -2,23 +2,23 @@
 
 AM_CPPFLAGS= @DEBUG@ @NLS@ @TIMEDCACHE@ @ORDEREDPSEUDO@
 
-bin_SCRIPTS = 		bsetbg 
-bin_PROGRAMS =		bsetroot
+bin_SCRIPTS = 		hsetbg 
+bin_PROGRAMS =		hsetroot
 
-bgmenudir = $(pkgdatadir)
-bgmenu_DATA = bgmenu.mk
+hgmenudir = $(pkgdatadir)
+hgmenu_DATA = hgmenu.mk
 
-bsetroot_SOURCES =	bsetroot.cc
-bsetroot_LDADD =	../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o
../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
+hsetroot_SOURCES =	bsetroot.cc
+hsetroot_LDADD =	../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o
../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
 
 MAINTAINERCLEANFILES =	Makefile.in
 
 distclean-local:
-	rm -f *\~ .\#* bgmenu.mk
+	rm -f *\~ .\#* hgmenu.mk
 
 # local dependencies
 
-bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \
+hsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \
  ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \
  ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \
  bsetroot.hh ../src/Image.hh


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hackedbox/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Nov 2004 02:46:57 -0000	1.3
+++ .cvsignore	2 Feb 2007 14:13:11 -0000	1.4
@@ -1 +1 @@
-hackedbox-0.8.4.tar.gz
+hackedbox-0.8.5.tar.gz


Index: hackedbox.spec
===================================================================
RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hackedbox.spec	28 Aug 2006 10:03:02 -0000	1.8
+++ hackedbox.spec	2 Feb 2007 14:13:11 -0000	1.9
@@ -1,16 +1,13 @@
-# $Id$
-# Authority: matthias
-
 Summary: The bastard son of Blackbox, a small and fast Window Manager
 Name: hackedbox
-Version: 0.8.4
-Release: 7%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://scrudgeware.org/projects/Hackedbox
 Source: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz
 Source1: hackedbox.desktop
-Patch: blackbox-0.65.0-gcc34.patch
+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
@@ -18,6 +15,8 @@
 %else
 BuildRequires: xorg-x11-devel
 %endif
+# We heavily patch *.in files...
+BuildRequires: autoconf, automake, libtool
 
 %description
 Hackedbox is a stripped down version of Blackbox - The X11 Window Manager.
@@ -28,10 +27,17 @@
 
 %prep
 %setup
-%patch -p1 -b .gcc34
+%patch0 -p1 -b .noblackbox
+# Remove included binary files! and *.mk supposed to be built from *.mk.in
+%{__rm} -f util/bsetroot util/bsetroot.o
+%{__rm} -f util/bgmenu.mk
+# Rename files, completes the noblackbox patch (avoids bloating the patch)
+%{__mv} util/bsetbg util/hsetbg
+%{__mv} util/bgmenu.mk.in util/hgmenu.mk.in
 
 
 %build
+sh bootstrap
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -44,15 +50,15 @@
 %{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions
 %{__cat} > %{buildroot}/etc/X11/gdm/Sessions/Hackedbox << EOF
 #!/bin/sh
-exec /etc/X11/xdm/Xsession %{name}
+exec /etc/X11/xdm/Xsession hackedbox
 EOF
 
 # Replace the /usr/local stuff
-%{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/%{name}/menu
+%{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/hackedbox/menu
 
 # Install the desktop entry
 %{__install} -D -p -m 644 %{SOURCE1} \
-    %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+    %{buildroot}%{_datadir}/xsessions/hackedbox.desktop
 
 
 %clean
@@ -63,22 +69,27 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog README TODO
 %attr(755, root, root) /etc/X11/gdm/Sessions/Hackedbox
-%{_bindir}/*
-%dir %{_datadir}/%{name}/
-%config(noreplace) %{_datadir}/%{name}/bgmenu.mk
-%config(noreplace) %{_datadir}/%{name}/menu
-%{_datadir}/%{name}/backgrounds
-%{_datadir}/%{name}/nls
-%{_datadir}/%{name}/styles
-%{_datadir}/xsessions/%{name}.desktop
+%{_bindir}/hackedbox
+%{_bindir}/hsetbg
+%{_bindir}/hsetroot
+%{_bindir}/inithack
+%dir %{_datadir}/hackedbox/
+%config(noreplace) %{_datadir}/hackedbox/hgmenu.mk
+%config(noreplace) %{_datadir}/hackedbox/menu
+%{_datadir}/hackedbox/backgrounds
+%{_datadir}/hackedbox/nls
+%{_datadir}/hackedbox/styles
+%{_datadir}/xsessions/hackedbox.desktop
 %{_mandir}/man1/*
-%lang(fr_FR) %{_mandir}/fr_FR/man1/*
-%lang(ja JP) %{_mandir}/ja_JP/man1/*
-%lang(nl_NL) %{_mandir}/nl_NL/man1/*
-%lang(sl_SI) %{_mandir}/sl_SI/man1/*
 
 
 %changelog
+* 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
+  parallel installable (#212318).
+- Remove non-english man pages, they're from blackbox...
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.8.4-7
 - FC6 rebuild.
 - Remove gcc-c++ and perl buil requirements, they are defaults.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hackedbox/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Nov 2004 02:46:57 -0000	1.3
+++ sources	2 Feb 2007 14:13:11 -0000	1.4
@@ -1 +1 @@
-ed15699fb4a7565e71b2fbb002ad8795  hackedbox-0.8.4.tar.gz
+7de3d0c76598f2e3d7e59cceb058c201  hackedbox-0.8.5.tar.gz


--- blackbox-0.65.0-gcc34.patch DELETED ---