rpms/fluxbox/devel fluxbox-menu.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fluxbox.spec, 1.15, 1.16 sources, 1.5, 1.6 FluxBox, 1.1, NONE Xclients.fluxbox, 1.3, NONE

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	.cvsignore fluxbox.spec sources 
Added Files:
	fluxbox-menu.patch 
Removed Files:
	FluxBox Xclients.fluxbox 
Log Message:
- fix gdm detection
- fix menu generation


fluxbox-menu.patch:

--- NEW FILE fluxbox-menu.patch ---
--- util/startfluxbox.in.orig	2006-03-02 16:10:01.000000000 +0100
+++ util/startfluxbox.in	2006-03-02 16:11:29.000000000 +0100
@@ -76,6 +76,10 @@
 # wmsmixer -w &
 # idesk &
 
+if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then
+ /usr/bin/fluxbox-generate_menu --with-icons &
+fi
+
 # And last but not least we start fluxbox.
 # Because it is the last app you have to run it with ''exec'' before it.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
+++ .cvsignore	2 Mar 2006 22:57:50 -0000	1.6
@@ -1,2 +1 @@
 fluxbox-0.9.14.tar.bz2
-artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fluxbox.spec	2 Mar 2006 00:31:36 -0000	1.15
+++ fluxbox.spec	2 Mar 2006 22:57:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -9,11 +9,10 @@
 URL:            http://fluxbox.sourceforge.net
 
 Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
-Source1:        Xclients.%{name}
-Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-gcc41.patch
+Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -29,7 +28,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  fontconfig-devel
 
-Requires(post): python
+Requires:       pyxdg
 Requires:       artwiz-aleczapka-fonts
 
 %description
@@ -45,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,23 +63,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# make gdm users happy
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
-install -m 0755 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions
-install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/
-
 # this is for Fedora Core
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
-install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
-%post
-# New menu-system
-%{_bindir}/fluxbox-xdg-menu --with-icons
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,20 +77,23 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/%{name}
-%{_datadir}/apps/switchdesk/Xclients.fluxbox
-
-%{_sysconfdir}/X11/gdm/Sessions/FluxBox
-%{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
+%{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
 * Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.14-3
+- fix Requires
+- patch startfluxbox to generate user menu
+- fix gdm detection
+
+* Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.14-2
 - fix build on gcc41
 
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - enable nls and imlib2
 - require artwizaleczepka instead of providing it...
-- add menu script from Rudolf Kastel
+- add menu script from Rudolf Kastl
 
 * Thu Sep 15 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.14-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Sep 2005 07:38:59 -0000	1.5
+++ sources	2 Mar 2006 22:57:50 -0000	1.6
@@ -1,2 +1 @@
 7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
-3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2


--- FluxBox DELETED ---


--- Xclients.fluxbox DELETED ---