Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7d73d4d004898b50817ae867d2d99c7b56c2a76

commit c7d73d4d004898b50817ae867d2d99c7b56c2a76
Author: crazy <cr...@frugalware.org>
Date:   Wed Mar 31 08:49:04 2010 +0200

openbox-3.4.11.1-1-x86_64
* Version bump

diff --git a/source/xlib/openbox/FixConflictOpenbabel.diff 
b/source/xlib/openbox/FixConflictOpenbabel.diff
deleted file mode 100644
index 991315c..0000000
--- a/source/xlib/openbox/FixConflictOpenbabel.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Dana Jansens <dan...@orodu.net>
-Date: Mon, 21 Dec 2009 14:59:28 +0000 (-0500)
-Subject: Rename obprop to obxprop (Fixes bug #4419)
-X-Git-Url: 
http://git.icculus.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3;hp=1fb198410e9d3ca660d91d1049249db0f2f47732
-
-Rename obprop to obxprop (Fixes bug #4419)
-
-Avoids collision with openbabel.
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 4b3e0b5..60c2232 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,7 +33,7 @@ bin_PROGRAMS = \
-       openbox/openbox \
-       tools/gdm-control/gdm-control \
-       tools/gnome-panel-control/gnome-panel-control \
--      tools/obprop/obprop
-+      tools/obxprop/obxprop
-
- dist_secretbin_SCRIPTS = \
-       tools/xdg-autostart/xdg-autostart
-@@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
- tools_gnome_panel_control_gnome_panel_control_SOURCES = \
-       tools/gnome-panel-control/gnome-panel-control.c
-
--## obprop ##
-+## obxprop ##
-
--tools_obprop_obprop_CPPFLAGS = \
-+tools_obxprop_obxprop_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(X_CFLAGS)
--tools_obprop_obprop_LDADD = \
-+tools_obxprop_obxprop_LDADD = \
-       $(GLIB_LIBS) \
-       $(X_LIBS)
--tools_obprop_obprop_SOURCES = \
--      tools/obprop/obprop.c
-+tools_obxprop_obxprop_SOURCES = \
-+      tools/obxprop/obxprop.c
-
- ## gdm-control ##
-
-diff --git a/data/rc.xml b/data/rc.xml
-index d7a31bd..eaf3df7 100644
---- a/data/rc.xml
-+++ b/data/rc.xml
-@@ -646,10 +646,10 @@
-   # this is an example with comments through out. use these to make your
-   # own rules, but without the comments of course.
-
--  <application name="the window's _OB_NAME property (see obprop)"
--              class="the window's _OB_CLASS property (see obprop)"
--               role="the window's _OB_ROLE property (see obprop)"
--               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
-+  <application name="the window's _OB_NAME property (see obxprop)"
-+              class="the window's _OB_CLASS property (see obxprop)"
-+               role="the window's _OB_ROLE property (see obxprop)"
-+               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
-                       (if unspecified, then it is 'dialog' for child 
windows)">
-   # the name or the class can be set, or both. this is used to match
-   # windows when they appear. role can optionally be set as well, to
-diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile
-similarity index 100%
-rename from tools/obprop/Makefile
-rename to tools/obxprop/Makefile
-diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c
-similarity index 99%
-rename from tools/obprop/obprop.c
-rename to tools/obxprop/obxprop.c
-index e288d7c..2685154 100644
---- a/tools/obprop/obprop.c
-+++ b/tools/obxprop/obxprop.c
-@@ -12,7 +12,7 @@ gint fail(const gchar *s) {
-     else
-         fprintf
-             (stderr,
--             "Usage: obprop [OPTIONS]\n\n"
-+             "Usage: obxprop [OPTIONS]\n\n"
-              "Options:\n"
-              "    --help              Display this help and exit\n"
-              "    --display DISPLAY   Connect to this X display\n"
-
diff --git a/source/xlib/openbox/FrugalBuild b/source/xlib/openbox/FrugalBuild
index 6618269..4f54999 100644
--- a/source/xlib/openbox/FrugalBuild
+++ b/source/xlib/openbox/FrugalBuild
@@ -3,8 +3,8 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=openbox
-pkgver=3.4.9
-pkgrel=3
+pkgver=3.4.11.1
+pkgrel=1
pkgdesc="A standards compliant, fast, light-weight, extensible window manager."
pkgdesc_localized=('hu_HU Egy szabványoknak megfelelõ, gyors, pehelysúlyú, 
kiterjeszthetõ ablakkezelõ.' \
'de_DE Ein standardkonformer, schneller, leichtgewichtiger, erweiterbarer 
Windowmanager.')
@@ -15,10 +15,9 @@ groups=('xlib')
archs=('i686' 'x86_64' 'ppc')
backup=(etc/xdg/openbox/{menu.xml,rc.xml})
options=('scriptlet')
-up2date="lynx -dump 
'http://icculus.org/openbox/index.php/Openbox:Download'|grep -v pkg|grep -m1 
'openbox-\(.*\).tar.gz$'|Flasttar"
-source=($url/releases/$pkgname-$pkgver.tar.gz FixConflictOpenbabel.diff)
-sha1sums=('afb7efc8140c327ce8ddc355b39748683469b675' \
-          'f471341c9e78c6ce0c76e1e92c51934400baae93')
+up2date="Flasttar $url/releases/"
+source=($url/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('f3806cb5544ed5738eab3788cde78110da400bf0')

build () {
Fbuild
@@ -26,7 +25,6 @@ build () {
Fln /usr/share/xsessions/openbox-gnome.desktop 
/etc/X11/sessions/openbox-gnome.desktop
Fln /usr/share/xsessions/openbox-kde.desktop 
/etc/X11/sessions/openbox-kde.desktop
Fln /usr/share/xsessions/openbox.desktop /etc/X11/sessions/openbox.desktop
-       Fmv usr/bin/obprop usr/bin/obxprop
}

# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to