rpms
/
openbox
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 3.4.7.2

Browse Source 
- Use gnome menus by default (Luke Macken) (#443548)
- Force setting number of desktops (#444135)
epel9
Miroslav Lichvar 17 years ago
parent 394bf5b713
commit 3f61e81242
6 changed files with 124 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
.cvsignore
Unescape View File

@ -1,2 +1,2 @@
setlayout.c
openbox-3.4.7.1.tar.gz
openbox-3.4.7.2.tar.gz

68
menu.xml
Unescape View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<openbox_menu xmlns="http://openbox.org/3.4/menu">
<menu id="applications-menu" label="Applications" execute="_XDGMENU_ applications"/>
<menu id="preferences-menu" label="Preferences" execute="_XDGMENU_ preferences"/>
<menu id="administration-menu" label="Administration" execute="_XDGMENU_ system-settings"/>
<menu id="apps-term-menu" label="Terminals">
<item label="Rxvt Unicode">
<action name="Execute">
<command>urxvt</command>
</action>
</item>
<item label="Gnome Terminal">
<action name="Execute">
<command>gnome-terminal</command>
<startupnotify>
<enabled>yes</enabled>
</startupnotify>
</action>
</item>
<item label="Xfce Terminal">
<action name="Execute">
<command>xfce4-terminal</command>
<startupnotify>
<enabled>yes</enabled>
</startupnotify>
</action>
</item>
<item label="Konsole">
<action name="Execute">
<command>konsole</command>
<startupnotify>
<enabled>yes</enabled>
</startupnotify>
</action>
</item>
<item label="Xterm">
<action name="Execute"><command>xterm</command></action>
</item>
</menu>
<menu id="root-menu" label="Openbox 3">
<separator label="Openbox"/>
<menu id="applications-menu"/>
<menu id="preferences-menu"/>
<menu id="administration-menu"/>
<separator/>
<menu id="apps-term-menu"/>
<separator/>
<item label="Reconfigure">
<action name="Reconfigure" />
</item>
<item label="Exit">
<action name="Exit">
<prompt>yes</prompt>
</action>
</item>
<separator/>
<item label="Log Out">
<action name="SessionLogout">
<prompt>yes</prompt>
</action>
</item>
</menu>
</openbox_menu>

12
openbox-3.4.7.2-numdesks.patch
Unescape View File

@ -0,0 +1,12 @@
diff -up openbox-3.4.7.2/openbox/screen.c.numdesks openbox-3.4.7.2/openbox/screen.c
--- openbox-3.4.7.2/openbox/screen.c.numdesks 2008-04-14 01:22:12.000000000 +0200
+++ openbox-3.4.7.2/openbox/screen.c 2008-05-14 15:53:39.000000000 +0200
@@ -401,7 +401,7 @@ void screen_startup(gboolean reconfig)
this will also set the default names from the config file up for
desktops that don't have names yet */
screen_num_desktops = 0;
- if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ if (0 && PROP_GET32(RootWindow(ob_display, ob_screen),
net_number_of_desktops, cardinal, &d))
{
if (d != config_desktops_num) {

18
openbox.spec
Unescape View File

@ -1,5 +1,5 @@
Name: openbox
Version: 3.4.7.1
Version: 3.4.7.2
Release: 1%{?dist}
Summary: A highly configurable and standards-compliant X11 window manager
@ -8,8 +8,11 @@ License: GPLv2+
URL: http://icculus.org/openbox
Source0: http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
Source1: http://icculus.org/openbox/tools/setlayout.c
Source2: xdg-menu
Source3: menu.xml
Patch0: openbox-3.4.7.1-autostartdir.patch
Patch1: openbox-3.4.7.2-numdesks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -63,6 +66,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
%prep
%setup -q
%patch0 -p1 -b .autostartdir
%patch1 -p1 -b .numdesks
%build
@ -78,7 +82,11 @@ gcc %{optflags} -o setlayout %{SOURCE1} -lX11
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install setlayout %{buildroot}%{_bindir}
install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu
sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \
> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
%find_lang %{name}
rm -f %{buildroot}%{_libdir}/*.la
@ -92,7 +100,7 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG COMPLIANCE COPYING README
%doc data/*.xsd doc/rc-mouse-focus.xml
%doc data/*.xsd data/menu.xml doc/rc-mouse-focus.xml
%dir %{_sysconfdir}/xdg/%{name}/
%config(noreplace) %{_sysconfdir}/xdg/%{name}/*
%{_bindir}/gnome-panel-control
@ -101,6 +109,7 @@ rm -rf %{buildroot}
%{_bindir}/setlayout
%dir %{_datadir}/openbox
%{_datadir}/openbox/xdg-autostart
%{_datadir}/openbox/xdg-menu
%{_datadir}/themes/*/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/gnome/wm-properties/
@ -125,6 +134,11 @@ rm -rf %{buildroot}
%changelog
* Wed May 14 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.2-1
- Update to 3.4.7.2
- Use gnome menus by default (Luke Macken) (#443548)
- Force setting number of desktops (#444135)
* Thu Apr 17 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.1-1
- Update to 3.4.7.1
- Don't require /usr/share/themes

2
sources
Unescape View File

@ -1,2 +1,2 @@
76f263e1550532ae54fd53c3a49b2c71 setlayout.c
7012f5690264556890a7b812f892beef openbox-3.4.7.1.tar.gz
9e7589e90519bc6ac2f4656ea6869439 openbox-3.4.7.2.tar.gz

26
xdg-menu
Unescape View File

@ -0,0 +1,26 @@
#!/usr/bin/env python
import gmenu, sys
from xml.sax.saxutils import escape
def walk_menu(entry):
if entry.get_type() == gmenu.TYPE_DIRECTORY:
print '<menu id="%s" label="%s">' \
% (escape(entry.menu_id), escape(entry.get_name()))
map(walk_menu, entry.get_contents())
print '</menu>'
elif entry.get_type() == gmenu.TYPE_ENTRY and not entry.is_excluded:
print """
<item label="%s">
<action name="Execute"><command>%s</command></action>
</item> """ % (escape(entry.get_name()), escape(entry.get_exec()))
if len(sys.argv) > 1:
menu = sys.argv[1] + '.menu'
else:
menu = 'applications.menu'
print '<?xml version="1.0" encoding="UTF-8"?>'
print '<openbox_pipe_menu>'
map(walk_menu, gmenu.lookup_tree(menu).root.get_contents())
print '</openbox_pipe_menu>'
Write Preview
Loading…
Cancel
Save