+++ /dev/null
-commit 36029e1faf0761607e3192fb4968f3228d84af9f
-Author: Mason Larobina <mason.larobina@gmail.com>
-Date: Sat Jan 9 13:47:54 2010 +0800
-
- Comment out anything in the config that used @jsh or the Uzbl object.
-
-commit c6756f9373b837aa3ff499f1e6bd7477d0eec361
-Author: Mason Larobina <mason.larobina@gmail.com>
-Date: Mon Jan 11 20:05:32 2010 +0800
-
- Fix yank bind now that the Uzbl object is gone.
-
-diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
-index 3edb36c..e53dd1a 100644
---- a/examples/config/uzbl/config
-+++ b/examples/config/uzbl/config
-@@ -35,7 +35,7 @@ set shell_cmd = sh -c
- set scripts_dir = $XDG_DATA_HOME/uzbl:@prefix/share/uzbl/examples/data/uzbl:scripts
-
- # Javascipt helpers.
--set jsh = js var run=Uzbl.run; function get(k){return run("print \\\@"+k)}; function set(k, v) {run("set "+k+" = "+v)};
-+#set jsh = js var run=Uzbl.run; function get(k){return run("print \\\@"+k)}; function set(k, v) {run("set "+k+" = "+v)};
-
- # === Handlers ===============================================================
-
-@@ -71,7 +71,7 @@ set new_window = sh 'uzbl-browser -u $8'
-
- # Generate a FORM_ACTIVE event if an editable
- # element on the loaded site has initial focus
--@on_event LOAD_FINISH js if(document.activeElement.type == 'text') {Uzbl.run("event FORM_ACTIVE");}
-+#@on_event LOAD_FINISH js if(document.activeElement.type == 'text') {Uzbl.run("event FORM_ACTIVE");}
-
- # Switch to insert mode if a (editable) html form is clicked
- @on_event FORM_ACTIVE @set_mode insert
-@@ -192,9 +192,9 @@ set ebind = @mode_bind global,-insert
- # Middle click
- # if clicked on a link open the link in a new uzbl window
- # otherwise open the selection in the current window
--set load_from_xclip = sh 'echo "uri $(xclip -o)" > $4'
--set open_new_window = sh 'uzbl-browser -u \@SELECTED_URI'
--@bind <Button2> = @jsh if(get("SELECTED_URI")) { run("\@open_new_window"); } else { run("\\\@load_from_xclip"); }
-+#set load_from_xclip = sh 'echo "uri $(xclip -o)" > $4'
-+#set open_new_window = sh 'uzbl-browser -u \@SELECTED_URI'
-+#@bind <Button2> = @jsh if(get("SELECTED_URI")) { run("\@open_new_window"); } else { run("\\\@load_from_xclip"); }
-
-
- # === Keyboard bindings ======================================================
-@@ -276,7 +276,7 @@ set toggle_cmd_ins = @toggle_modes command insert
- @cbind gh = uri http://www.uzbl.org
-
- # --- Yanking & pasting binds ---
--@cbind y<Yank (t)itle or (u)rl:>* = @jsh if('%s' == 'u') { run("sh 'echo -n $6 | xclip'"); } else if('%s' == 't') { run("sh 'echo -n $7 | xclip'"); }; run('event SET_KEYCMD');
-+#@cbind y<Yank (t)itle or (u)rl:>* = @jsh if('%s' == 'u') { run("sh 'echo -n $6 | xclip'"); } else if('%s' == 't') { run("sh 'echo -n $7 | xclip'"); }; run('event SET_KEYCMD');
-
- # Go the page from primary selection
- @cbind p = sh 'echo "uri `xclip -selection primary -o`" > $4'
-diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
-index e53dd1a..2832505 100644
---- a/examples/config/uzbl/config
-+++ b/examples/config/uzbl/config
-@@ -276,7 +276,8 @@ set toggle_cmd_ins = @toggle_modes command insert
- @cbind gh = uri http://www.uzbl.org
-
- # --- Yanking & pasting binds ---
--#@cbind y<Yank (t)itle or (u)rl:>* = @jsh if('%s' == 'u') { run("sh 'echo -n $6 | xclip'"); } else if('%s' == 't') { run("sh 'echo -n $7 | xclip'"); }; run('event SET_KEYCMD');
-+@cbind yu = sh 'echo -n $6 | xclip'
-+@cbind yt = sh 'echo -n $7 | xclip'
-
- # Go the page from primary selection
- @cbind p = sh 'echo "uri `xclip -selection primary -o`" > $4'
+++ /dev/null
-diff --git a/examples/data/scripts/load_url_from_bookmarks.sh b/examples/data/scripts/load_url_from_bookmarks.sh
-index 1e9f9e7..ca49c2b 100755
---- a/examples/data/scripts/load_url_from_bookmarks.sh
-+++ b/examples/data/scripts/load_url_from_bookmarks.sh
-@@ -5,16 +5,10 @@
- file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/bookmarks
- [ -r "$file" ] || exit
- COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
--if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
--then
-- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
-- # show tags as well
-- goto=`$DMENU $COLORS < $file | awk '{print $1}'`
--else
-- DMENU="dmenu -i"
-- # because they are all after each other, just show the url, not their tags.
-- goto=`awk '{print $1}' $file | $DMENU $COLORS`
--fi
-+
-+DMENU="dmenu -i -l 10" # vertical patch
-+# show tags as well
-+goto=`$DMENU $COLORS < $file | awk '{print $1}'`
-
- #[ -n "$goto" ] && echo "uri $goto" > $4
- [ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
-diff --git a/examples/data/scripts/load_url_from_history.sh b/examples/data/scripts/load_url_from_history.sh
-index 62e02ac..756c962 100755
---- a/examples/data/scripts/load_url_from_history.sh
-+++ b/examples/data/scripts/load_url_from_history.sh
-@@ -6,19 +6,10 @@ history_file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history
- # choose from all entries, sorted and uniqued
- # goto=`awk '{print $3}' $history_file | sort -u | dmenu -i`
- COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
--if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]';
--then
-- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
-- # choose an item in reverse order, showing also the date and page titles
-- # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
-- goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3 | awk '{print $NF}'`
--else
-- DMENU="dmenu -i"
-- # choose from all entries (no date or title), the first one being current url, and after that all others, sorted and uniqued, in ascending order
-- current=`tail -n 1 $history_file | awk '{print $3}'`;
-- goto=`(echo $current; awk '{print $3}' $history_file | grep -v "^$current\$" \
-- | sort -u) | $DMENU $COLORS`
--fi
-+DMENU="dmenu -i -l 10" # vertical patch
-+# choose an item in reverse order, showing also the date and page titles
-+# pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
-+goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3 | awk '{print $NF}'`
-
- [ -n "$goto" ] && echo "uri $goto" > $4
- #[ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
---- Dieterbe-uzbl-4994115/examples/data/scripts/instance-select-wmii.sh~ 2009-12-22 18:07:54.000000000 +0100
-+++ Dieterbe-uzbl-4994115/examples/data/scripts/instance-select-wmii.sh 2010-01-04 08:43:45.000000000 +0100
-@@ -13,12 +13,7 @@
-
- COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
-
--if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
--then
-- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
--else
-- DMENU="dmenu -i"
--fi
-+DMENU="dmenu -i -l 10" # vertical patch
-
- if [ "$1" == 'list' ]
- then
Summary(hu.UTF-8): Egy billentyűzettel irányítható (vim-szerű vagy módosító kódok) böngésző Webkit alapokon
Summary(pl.UTF-8): Minimalistyczna przeglądarka w całości obsługiwana przy użyciu klawiatury
Name: uzbl
-Version: 2010.08.05
+Version: 2011.11.28
Release: 1
License: GPL v3
Group: X11/Applications/Networking
# git://github.com/Dieterbe/uzbl.git
Source0: http://github.com/Dieterbe/uzbl/tarball/%{version}
-# Source0-md5: b6e3323337d2093e55c7d85648bab3aa
-Patch0: %{name}-dmenu.patch
+# Source0-md5: 6e55474050b5df43d8bdd403248b1da6
URL: http://www.uzbl.org/
BuildRequires: gtk+2-devel
BuildRequires: gtk-webkit-devel >= 1.2.0-4
Summary(pl.UTF-8): Jądro Uzbl
Group: X11/Applications/Networking
Requires: gtk-webkit >= 1.2.0-4
-Suggests: %{name}-cookie-daemon = %{epoch}:%{version}-%{release}
Suggests: %{name}-event-manager = %{epoch}:%{version}-%{release}
Obsoletes: uzbl-examples
Obsoletes: uzbl-scripts
%description event-manager -l pl.UTF-8
Zarządca zdarzeń dla uzbl.
-%package cookie-daemon
-Summary: Uzbl cookie daemon
-Summary(pl.UTF-8): Serwer ciasteczek dla uzbl
-Group: X11/Applications/Networking
-
-%description cookie-daemon
-uzbl-cookie-daemon provides http cookies for uzbl.
-
-%description cookie-daemon -l pl.UTF-8
-Obsługa ciasteczek http (coockies) dla przeglądarki uzbl.
-
%package tabbed
Summary: Tabs for uzbl
Summary(hu.UTF-8): Tabok uzbl-hez
%setup -qc
mv Dieterbe-%{name}-*/* .
-%patch0 -p1
-
%build
%{__make}
%attr(755,root,root) %{_datadir}/uzbl/examples/data/plugins/*
%{_datadir}/uzbl/examples/data/dforms
%{_datadir}/uzbl/examples/data/bookmarks
-%{_datadir}/uzbl/examples/data/style.css
+%{_datadir}/uzbl/examples/data/per-site-settings
%{_datadir}/uzbl/examples/data/uzbl.png
%files event-manager
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/uzbl-event-manager
-%files cookie-daemon
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/uzbl-cookie-daemon
-
%files tabbed
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/uzbl-tabbed