From 38f85dd3c9c1c8a6c3401cda756cb3b260e49fe3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Thu, 25 Mar 2010 20:59:31 +0000
Subject: [PATCH 01/10] Initialize branch F-13 for uzbl

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 3438fcc59a132c021d3c3e61e32744922583d4a6 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Fri, 26 Mar 2010 02:30:51 +0000
Subject: [PATCH 02/10] Import uzbl.

---
 .cvsignore   |   1 +
 import.log   |   1 +
 sources      |   1 +
 uzbl.desktop |   9 +++++
 uzbl.patch   |  66 +++++++++++++++++++++++++++++++
 uzbl.spec    | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 185 insertions(+)
 create mode 100644 import.log
 create mode 100644 uzbl.desktop
 create mode 100644 uzbl.patch
 create mode 100644 uzbl.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..c8f4cdc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+uzbl-abbffe5c3.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..3506b00
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269570600
diff --git a/sources b/sources
index e69de29..0513904 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0faa2940b9331461ff0b88a0cc8ee2ac  uzbl-abbffe5c3.tar.gz
diff --git a/uzbl.desktop b/uzbl.desktop
new file mode 100644
index 0000000..b1cc8af
--- /dev/null
+++ b/uzbl.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Uzbl
+GenericName=Uzbl Web Browser
+Comment=Browse the Web
+Exec=uzbl-browser
+Icon=uzbl
+Terminal=false
+Type=Application
+Categories=Network;WebBrowser;
diff --git a/uzbl.patch b/uzbl.patch
new file mode 100644
index 0000000..2916ace
--- /dev/null
+++ b/uzbl.patch
@@ -0,0 +1,66 @@
+diff -ru uzbl-abbffe5c3.orig/Makefile uzbl-abbffe5c3/Makefile
+--- uzbl-abbffe5c3.orig/Makefile	2010-02-19 05:51:18.000000000 +0900
++++ uzbl-abbffe5c3/Makefile	2010-03-13 18:17:35.103876347 +0900
+@@ -1,15 +1,14 @@
+ # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
+ 
+-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ${RPM_OPT_FLAGS}
+ CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+ 
+-LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
++LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0 x11) -pthread $(LDFLAGS)
+ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+ 
+ SRC = $(wildcard src/*.c)
+ HEAD = $(wildcard src/*.h)
+-TOBJ = $(SRC:.c=.o)
+-OBJ = $(foreach obj, $(TOBJ), $(notdir $(obj)))
++OBJ = $(SRC:.c=.o)
+ 
+ all: uzbl-browser options
+ 
+@@ -23,17 +22,12 @@
+ 
+ 
+ .c.o:
+-	@echo COMPILING $<
+-	@${CC} -c ${CFLAGS} $<
+-	@echo ... done.
++	${CC} -o $@ -c ${CFLAGS} $<
+ 
+ ${OBJ}: ${HEAD}
+ 
+-uzbl-core: ${TOBJ} # why doesn't ${OBJ} work?
+-	@echo
+-	@echo LINKING object files
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+-	@echo ... done.
++uzbl-core: ${OBJ}
++	${CC} -o $@ ${OBJ} ${LDFLAGS}
+ 
+ 
+ uzbl-browser: uzbl-core
+@@ -100,14 +94,9 @@
+ 
+ install-uzbl-core: all
+ 	install -d $(INSTALLDIR)/bin
+-	install -d $(INSTALLDIR)/share/uzbl/docs
+ 	install -d $(INSTALLDIR)/share/uzbl/examples
+-	cp -rp docs         $(INSTALLDIR)/share/uzbl/
+-	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
+ 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
+ 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
+-	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
+-	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+ 
+ install-uzbl-browser:
+@@ -117,6 +106,7 @@
+ 	install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ 	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
+ 	sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
++	cp -r icons $(INSTALLDIR)/share
+ 
+ install-uzbl-tabbed:
+ 	install -d $(INSTALLDIR)/bin
diff --git a/uzbl.spec b/uzbl.spec
new file mode 100644
index 0000000..95ca11d
--- /dev/null
+++ b/uzbl.spec
@@ -0,0 +1,107 @@
+%global		uzblcommit	abbffe5c3
+Name:		uzbl
+Version:	0
+Release:	0.8.20100221git%{uzblcommit}
+License:	GPLv3
+URL:		http://www.uzbl.org
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+#  git clone git://github.com/Dieterbe/uzbl.git
+#  cd uzbl
+#  export uzblcommit=abbffe5c3
+#  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
+#      gzip -c > ../uzbl-${uzblcommit}.tar.gz
+Source0:	%{name}-%{uzblcommit}.tar.gz
+Source1:	%{name}.desktop
+Patch0:		%{name}.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	webkitgtk-devel, desktop-file-utils
+Requires: perl, bash
+
+Summary:	Lightweight WebKit browser following the UNIX philosophy
+Group:		Applications/Internet
+
+%description
+Uzbl is a lightweight web browser based on WebKit/Gtk+.  Uzbl follows
+the UNIX philosophy - "Write programs that do one thing and do it
+well. Write programs to work together. Write programs to handle text
+streams, because that is a universal interface."
+
+%prep
+%setup -q -n %{name}-%{uzblcommit}
+%patch0 -p1
+mkdir -p icons/hicolor/32x32/apps
+mv examples/data/uzbl.png icons/hicolor/32x32/apps
+
+%build
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install
+cp -pr icons ${RPM_BUILD_ROOT}%{_datadir}
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+%{SOURCE1}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS LICENSE README docs/* src/config.h
+%{_bindir}/*
+%{_datadir}/%{name}/
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+
+%changelog
+* Fri Mar 19 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.8.20100221gitabbffe5c3
+- use the macro "global" instead of "define".
+
+* Thu Mar 18 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.7.20100221gitabbffe5c3
+- copy files under /usr/share/uzbl/ only once.
+
+* Tue Mar 16 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.6.20100221gitabbffe5c3
+- preserve timestamp of installed files.
+- include scriptlets for icon cache.
+- claim ownership of the directory "uzbl" under datadir.
+
+* Sat Mar 13 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.5.20100221gitabbffe5c3
+- install 32x32 icon under the standard icon path.
+- fix the executable name in uzbl.desktop.
+- prevent re-compilation on "make install".
+- install examples/* under /usr/share/uzbl/examples, since the path is
+  hard-coded in bundled scripts.
+
+* Mon Mar  8 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.4.20100221gitabbffe5c3
+- make sure support scripts are not executable.
+
+* Sun Mar  7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.3.20100221gitabbffe5c3
+- use LDFLAGS from x11.pc to follow the F-13 DSO linking change.
+
+* Sun Mar  7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.2.20100221gitabbffe5c3
+- don't use Epoch.
+- make the build log more verbose.
+- don't use the makeinstall macro and use _prefix macro.
+- include uzbl.desktop.
+- install all document files under /usr/share/doc/uzbl-0.
+
+* Sun Feb 21 2010 Daiki Ueno <ueno@unixuser.org> - 1:0-0.1.20100221gitabbffe5c3
+- initial packaging for fedora.

From f03c3243b15830e6cb16219209506ff9e7f4af92 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Fri, 26 Mar 2010 02:49:29 +0000
Subject: [PATCH 03/10] Add dist number to Release.

---
 uzbl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uzbl.spec b/uzbl.spec
index 95ca11d..9b104be 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -1,7 +1,7 @@
 %global		uzblcommit	abbffe5c3
 Name:		uzbl
 Version:	0
-Release:	0.8.20100221git%{uzblcommit}
+Release:	0.9.20100221git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -72,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Fri Mar 26 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.9.20100221gitabbffe5c3
+- add dist number to Release.
+
 * Fri Mar 19 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.8.20100221gitabbffe5c3
 - use the macro "global" instead of "define".
 

From c921b2434af7314ca81a194367682a504eff6510 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Mon, 5 Apr 2010 01:28:09 +0000
Subject: [PATCH 04/10] - split out uzbl-tabbed as a seperate package to avoid
 dependency on pygtk2     (partially merged a patch from Ben Boeckel
 <mathstuf@gmail.com>). - new upstream snapshot.

---
 .cvsignore |  2 +-
 import.log |  1 +
 sources    |  2 +-
 uzbl.patch | 67 +++++++++++++++++-------------------------------------
 uzbl.spec  | 35 ++++++++++++++++++++++++----
 5 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c8f4cdc..8039892 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-uzbl-abbffe5c3.tar.gz
+uzbl-ae15d257a.tar.gz
diff --git a/import.log b/import.log
index 3506b00..4e3d0e8 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269570600
+uzbl-0-0_10_20100405gitae15d257a_fc13:F-13:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430801
diff --git a/sources b/sources
index 0513904..8fdca18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0faa2940b9331461ff0b88a0cc8ee2ac  uzbl-abbffe5c3.tar.gz
+0afc4198b9392d62b5ac3c3b022105fb  uzbl-ae15d257a.tar.gz
diff --git a/uzbl.patch b/uzbl.patch
index 2916ace..48d8362 100644
--- a/uzbl.patch
+++ b/uzbl.patch
@@ -1,11 +1,11 @@
-diff -ru uzbl-abbffe5c3.orig/Makefile uzbl-abbffe5c3/Makefile
---- uzbl-abbffe5c3.orig/Makefile	2010-02-19 05:51:18.000000000 +0900
-+++ uzbl-abbffe5c3/Makefile	2010-03-13 18:17:35.103876347 +0900
-@@ -1,15 +1,14 @@
+diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
+--- uzbl-ae15d257a.orig/Makefile	2010-04-04 04:42:03.000000000 +0900
++++ uzbl-ae15d257a/Makefile	2010-04-05 09:48:30.887543437 +0900
+@@ -1,9 +1,9 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
 -CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ${RPM_OPT_FLAGS}
++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ${RPM_OPT_FLAGS}
  CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
  
 -LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
@@ -13,54 +13,29 @@ diff -ru uzbl-abbffe5c3.orig/Makefile uzbl-abbffe5c3/Makefile
  LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
  
  SRC = $(wildcard src/*.c)
- HEAD = $(wildcard src/*.h)
--TOBJ = $(SRC:.c=.o)
--OBJ = $(foreach obj, $(TOBJ), $(notdir $(obj)))
-+OBJ = $(SRC:.c=.o)
- 
- all: uzbl-browser options
- 
-@@ -23,17 +22,12 @@
- 
- 
- .c.o:
--	@echo COMPILING $<
--	@${CC} -c ${CFLAGS} $<
--	@echo ... done.
-+	${CC} -o $@ -c ${CFLAGS} $<
- 
- ${OBJ}: ${HEAD}
- 
--uzbl-core: ${TOBJ} # why doesn't ${OBJ} work?
--	@echo
--	@echo LINKING object files
--	@${CC} -o $@ ${OBJ} ${LDFLAGS}
--	@echo ... done.
-+uzbl-core: ${OBJ}
-+	${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- 
- uzbl-browser: uzbl-core
-@@ -100,14 +94,9 @@
+@@ -89,15 +89,11 @@
  
  install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs         $(INSTALLDIR)/share/uzbl/
--	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
- 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
+ 	install -d $(INSTALLDIR)/share/uzbl/
+-	install -d $(DOCDIR)
+-	install -m644 docs/* $(DOCDIR)/
+-	install -m644 src/config.h $(DOCDIR)/
+-	install -m644 README $(DOCDIR)/
+-	install -m644 AUTHORS $(DOCDIR)/
+ 	cp -r examples $(INSTALLDIR)/share/uzbl/
+ 	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
++	chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js
  	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+-	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
++	install -s -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
  
  install-uzbl-browser:
-@@ -117,6 +106,7 @@
- 	install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ 	install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+@@ -105,6 +101,7 @@
+ 	install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
  	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
  	sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
 +	cp -r icons $(INSTALLDIR)/share
  
  install-uzbl-tabbed:
- 	install -d $(INSTALLDIR)/bin
+ 	install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
diff --git a/uzbl.spec b/uzbl.spec
index 9b104be..18bfa20 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -1,14 +1,14 @@
-%global		uzblcommit	abbffe5c3
+%global		uzblcommit	ae15d257a
 Name:		uzbl
 Version:	0
-Release:	0.9.20100221git%{uzblcommit}%{?dist}
+Release:	0.10.20100405git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  git clone git://github.com/Dieterbe/uzbl.git
 #  cd uzbl
-#  export uzblcommit=abbffe5c3
+#  export uzblcommit=ae15d257a
 #  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
 #      gzip -c > ../uzbl-${uzblcommit}.tar.gz
 Source0:	%{name}-%{uzblcommit}.tar.gz
@@ -27,6 +27,18 @@ the UNIX philosophy - "Write programs that do one thing and do it
 well. Write programs to work together. Write programs to handle text
 streams, because that is a universal interface."
 
+%package tabbed
+Summary:	Tabbed interface to Uzbl
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	pygtk2
+
+%description tabbed
+Uzbl-tabbed wraps around uzbl-browser and multiplexes it. It spawns
+one window containing multiple tabs, each tab containing a full
+embedded uzbl-browser Ideal as a quick and simple solution to manage
+multiple uzbl-browser instances without getting lost.
+
 %prep
 %setup -q -n %{name}-%{uzblcommit}
 %patch0 -p1
@@ -66,12 +78,25 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS LICENSE README docs/* src/config.h
-%{_bindir}/*
-%{_datadir}/%{name}/
+%{_bindir}/uzbl-core
+%{_bindir}/uzbl-browser
+%{_bindir}/uzbl-cookie-daemon
+%{_bindir}/uzbl-event-manager
 %{_datadir}/icons/*/*/apps/%{name}.*
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/examples/config/
+%{_datadir}/%{name}/examples/data/
+
+%files tabbed
+%defattr(-, root, root, -)
+%{_bindir}/uzbl-tabbed
 
 %changelog
+* Mon Apr  5 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.10.20100405gitae15d257a
+- split out uzbl-tabbed as a seperate package to avoid dependency on
+  pygtk2 (partially merged a patch from Ben Boeckel <mathstuf@gmail.com>).
+- new upstream snapshot.
+
 * Fri Mar 26 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.9.20100221gitabbffe5c3
 - add dist number to Release.
 

From 1001acd71d10587a5586f3baca92b08a2b906dfb Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Thu, 8 Apr 2010 08:27:48 +0000
Subject: [PATCH 05/10] don't strip uzbl-core with the install command (closes
 #580250).

---
 import.log | 1 +
 uzbl.patch | 9 +++------
 uzbl.spec  | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/import.log b/import.log
index 4e3d0e8..6b712bd 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269570600
 uzbl-0-0_10_20100405gitae15d257a_fc13:F-13:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430801
+uzbl-0-0_11_20100405gitae15d257a_fc13:F-13:uzbl-0-0.11.20100405gitae15d257a.fc13.src.rpm:1270715136
diff --git a/uzbl.patch b/uzbl.patch
index 48d8362..ccfe290 100644
--- a/uzbl.patch
+++ b/uzbl.patch
@@ -1,6 +1,6 @@
 diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
 --- uzbl-ae15d257a.orig/Makefile	2010-04-04 04:42:03.000000000 +0900
-+++ uzbl-ae15d257a/Makefile	2010-04-05 09:48:30.887543437 +0900
++++ uzbl-ae15d257a/Makefile	2010-04-08 12:37:53.163411664 +0900
 @@ -1,9 +1,9 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
@@ -13,7 +13,7 @@ diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
  LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
  
  SRC = $(wildcard src/*.c)
-@@ -89,15 +89,11 @@
+@@ -89,13 +89,9 @@
  
  install-uzbl-core: all
  	install -d $(INSTALLDIR)/share/uzbl/
@@ -26,11 +26,8 @@ diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
  	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
 +	chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js
  	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
--	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-+	install -s -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+ 	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
  
- install-uzbl-browser:
- 	install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
 @@ -105,6 +101,7 @@
  	install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
  	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
diff --git a/uzbl.spec b/uzbl.spec
index 18bfa20..2aa63e8 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -1,7 +1,7 @@
 %global		uzblcommit	ae15d257a
 Name:		uzbl
 Version:	0
-Release:	0.10.20100405git%{uzblcommit}%{?dist}
+Release:	0.11.20100405git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/uzbl-tabbed
 
 %changelog
+* Thu Apr  8 2010 Daiki Ueno <dueno@redhat.com> - 0-0.11.20100405gitae15d257a
+- don't strip uzbl-core with the install command (closes #580250).
+
 * Mon Apr  5 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.10.20100405gitae15d257a
 - split out uzbl-tabbed as a seperate package to avoid dependency on
   pygtk2 (partially merged a patch from Ben Boeckel <mathstuf@gmail.com>).

From 6a6c114e135824ed53434c92f422d68571b5a147 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Mon, 31 May 2010 00:57:48 +0000
Subject: [PATCH 06/10] new upstream snapshot

---
 .cvsignore |  2 +-
 import.log |  1 +
 sources    |  2 +-
 uzbl.patch |  6 ++--
 uzbl.spec  | 88 +++++++++++++++++++++++++++++++++++++++++++-----------
 5 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8039892..508ee16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-uzbl-ae15d257a.tar.gz
+uzbl-ec473e124.tar.gz
diff --git a/import.log b/import.log
index 6b712bd..1114c56 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269570600
 uzbl-0-0_10_20100405gitae15d257a_fc13:F-13:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430801
 uzbl-0-0_11_20100405gitae15d257a_fc13:F-13:uzbl-0-0.11.20100405gitae15d257a.fc13.src.rpm:1270715136
+uzbl-0-0_13_20100410gitec473e124_fc13:F-13:uzbl-0-0.13.20100410gitec473e124.fc13.src.rpm:1275267527
diff --git a/sources b/sources
index 8fdca18..5f2160f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0afc4198b9392d62b5ac3c3b022105fb  uzbl-ae15d257a.tar.gz
+5bbd08c1ad7aa8a7eac37c7f04e0081e  uzbl-ec473e124.tar.gz
diff --git a/uzbl.patch b/uzbl.patch
index ccfe290..2f313d6 100644
--- a/uzbl.patch
+++ b/uzbl.patch
@@ -1,11 +1,11 @@
-diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
+diff -urN uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
 --- uzbl-ae15d257a.orig/Makefile	2010-04-04 04:42:03.000000000 +0900
-+++ uzbl-ae15d257a/Makefile	2010-04-08 12:37:53.163411664 +0900
++++ uzbl-ae15d257a/Makefile	2010-04-23 11:16:11.222727272 +0900
 @@ -1,9 +1,9 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
 -CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ${RPM_OPT_FLAGS}
++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -O0
  CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
  
 -LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
diff --git a/uzbl.spec b/uzbl.spec
index 2aa63e8..2d4fd44 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -1,25 +1,42 @@
-%global		uzblcommit	ae15d257a
+%global		uzblcommit	ec473e124
+
 Name:		uzbl
+Summary:	Lightweight WebKit browser following the UNIX philosophy
+Group:		Applications/Internet
 Version:	0
-Release:	0.11.20100405git%{uzblcommit}%{?dist}
+Release:	0.13.20100410git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  git clone git://github.com/Dieterbe/uzbl.git
 #  cd uzbl
-#  export uzblcommit=ae15d257a
+#  export uzblcommit=ec473e124
 #  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
 #      gzip -c > ../uzbl-${uzblcommit}.tar.gz
 Source0:	%{name}-%{uzblcommit}.tar.gz
 Source1:	%{name}.desktop
 Patch0:		%{name}.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	webkitgtk-devel, desktop-file-utils
-Requires: perl, bash
 
-Summary:	Lightweight WebKit browser following the UNIX philosophy
-Group:		Applications/Internet
+BuildRequires:	webkitgtk-devel
+BuildRequires:	desktop-file-utils
+
+# New users probably want a tabbed browser
+Requires:	uzbl-tabbed = %{version}-%{release}
+
+# XXX: Be aware that script dependencies need enumerated here
+# Dialog for bookmarks
+Requires:	zenity
+# Communication
+Requires:	socat
+# scripts/formfiller.sh (dmenu also used by loading history/bookmarks)
+Requires:	dmenu
+Requires:	xterm
+# scripts/auth.py
+Requires:	pygtk2
+# scripts/download.sh
+Requires:	wget
 
 %description
 Uzbl is a lightweight web browser based on WebKit/Gtk+.  Uzbl follows
@@ -27,10 +44,26 @@ the UNIX philosophy - "Write programs that do one thing and do it
 well. Write programs to work together. Write programs to handle text
 streams, because that is a universal interface."
 
+%package core
+Summary:	Core component of Uzbl
+Group:		Applications/Internet
+
+%description core
+The core component to Uzbl. This part does little on its own. For a more
+complete browsing experience, see the uzbl package.
+
+%package browser
+Summary:	A complete browser using Uzbl
+Group:		Applications/Internet
+Requires:	%{name}-core = %{version}-%{release}
+
+%description browser
+A complete browsing experience based on Uzbl's core component.
+
 %package tabbed
 Summary:	Tabbed interface to Uzbl
 Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-browser = %{version}-%{release}
 Requires:	pygtk2
 
 %description tabbed
@@ -39,25 +72,30 @@ one window containing multiple tabs, each tab containing a full
 embedded uzbl-browser Ideal as a quick and simple solution to manage
 multiple uzbl-browser instances without getting lost.
 
+
 %prep
 %setup -q -n %{name}-%{uzblcommit}
 %patch0 -p1
+
 mkdir -p icons/hicolor/32x32/apps
 mv examples/data/uzbl.png icons/hicolor/32x32/apps
 
+
 %build
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install
-cp -pr icons ${RPM_BUILD_ROOT}%{_datadir}
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+
+cp -pr icons %{buildroot}%{_datadir}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
 %{SOURCE1}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -77,21 +115,35 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS LICENSE README docs/* src/config.h
-%{_bindir}/uzbl-core
-%{_bindir}/uzbl-browser
-%{_bindir}/uzbl-cookie-daemon
-%{_bindir}/uzbl-event-manager
 %{_datadir}/icons/*/*/apps/%{name}.*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/examples/config/
 %{_datadir}/%{name}/examples/data/
 
+%files core
+%defattr(-, root, root, -)
+%doc AUTHORS LICENSE README docs/* src/config.h
+%{_bindir}/uzbl-core
+
+%files browser
+%defattr(-, root, root, -)
+%{_bindir}/uzbl-browser
+%{_bindir}/uzbl-cookie-daemon
+%{_bindir}/uzbl-event-manager
+
 %files tabbed
 %defattr(-, root, root, -)
 %{_bindir}/uzbl-tabbed
 
 %changelog
+* Mon May 31 2010 Daiki Ueno <dueno@redhat.com> - 0-0.13.20100410gitec473e124
+- new upstream snapshot.
+
+* Wed Apr 14 2010 Ben Boeckel <MathStuf@gmail.com> - 0-0.12.20100405gitae15d257a
+- Split out core and browser subpackages
+- Enumerate dependencies of the default scripts
+- Minor reorganization
+
 * Thu Apr  8 2010 Daiki Ueno <dueno@redhat.com> - 0-0.11.20100405gitae15d257a
 - don't strip uzbl-core with the install command (closes #580250).
 

From 13f616bc97e464a682f92aa6e33cf67523ba18aa Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@fedoraproject.org>
Date: Wed, 30 Jun 2010 07:29:18 +0000
Subject: [PATCH 07/10] new upstream snapshot.

---
 .cvsignore | 2 +-
 import.log | 1 +
 sources    | 2 +-
 uzbl.spec  | 9 ++++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 508ee16..cfe8052 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-uzbl-ec473e124.tar.gz
+uzbl-afc0f873e.tar.gz
diff --git a/import.log b/import.log
index 1114c56..3028950 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:126
 uzbl-0-0_10_20100405gitae15d257a_fc13:F-13:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430801
 uzbl-0-0_11_20100405gitae15d257a_fc13:F-13:uzbl-0-0.11.20100405gitae15d257a.fc13.src.rpm:1270715136
 uzbl-0-0_13_20100410gitec473e124_fc13:F-13:uzbl-0-0.13.20100410gitec473e124.fc13.src.rpm:1275267527
+uzbl-0-0_14_20100626gitafc0f873e_fc13:F-13:uzbl-0-0.14.20100626gitafc0f873e.fc13.src.rpm:1277883097
diff --git a/sources b/sources
index 5f2160f..c7374c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bbd08c1ad7aa8a7eac37c7f04e0081e  uzbl-ec473e124.tar.gz
+34e114e3a1954ba7497fa94d12996870  uzbl-afc0f873e.tar.gz
diff --git a/uzbl.spec b/uzbl.spec
index 2d4fd44..c096727 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -1,17 +1,17 @@
-%global		uzblcommit	ec473e124
+%global		uzblcommit	afc0f873e
 
 Name:		uzbl
 Summary:	Lightweight WebKit browser following the UNIX philosophy
 Group:		Applications/Internet
 Version:	0
-Release:	0.13.20100410git%{uzblcommit}%{?dist}
+Release:	0.14.20100626git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  git clone git://github.com/Dieterbe/uzbl.git
 #  cd uzbl
-#  export uzblcommit=ec473e124
+#  export uzblcommit=afc0f873e
 #  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
 #      gzip -c > ../uzbl-${uzblcommit}.tar.gz
 Source0:	%{name}-%{uzblcommit}.tar.gz
@@ -136,6 +136,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/uzbl-tabbed
 
 %changelog
+* Wed Jun 30 2010 Daiki Ueno <dueno@redhat.com> - 0-0.14.20100626gitafc0f873e
+- new upstream snapshot.
+
 * Mon May 31 2010 Daiki Ueno <dueno@redhat.com> - 0-0.13.20100410gitec473e124
 - new upstream snapshot.
 

From fdc760148efa0fc0d440bf1ddd98ed2ae81d02df Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:51:52 +0000
Subject: [PATCH 08/10] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  5 -----
 4 files changed, 27 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9a73808..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: uzbl
-# $Id$
-NAME := uzbl
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13
diff --git a/import.log b/import.log
deleted file mode 100644
index 3028950..0000000
--- a/import.log
+++ /dev/null
@@ -1,5 +0,0 @@
-uzbl-0-0_8_20100221gitabbffe5c3:F-13:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269570600
-uzbl-0-0_10_20100405gitae15d257a_fc13:F-13:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430801
-uzbl-0-0_11_20100405gitae15d257a_fc13:F-13:uzbl-0-0.11.20100405gitae15d257a.fc13.src.rpm:1270715136
-uzbl-0-0_13_20100410gitec473e124_fc13:F-13:uzbl-0-0.13.20100410gitec473e124.fc13.src.rpm:1275267527
-uzbl-0-0_14_20100626gitafc0f873e_fc13:F-13:uzbl-0-0.14.20100626gitafc0f873e.fc13.src.rpm:1277883097

From 5d676cd939016876f5bb2a28ffb3a5d12d13a592 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 6 Sep 2010 10:23:20 +0900
Subject: [PATCH 09/10] Update to -0.18.

---
 .gitignore                                    |  1 +
 ...h-on-Open-Image-in-New-Window-FS-231.patch | 42 +++++++++++++++++++
 uzbl.spec                                     |  7 +++-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch

diff --git a/.gitignore b/.gitignore
index cfe8052..ed164c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 uzbl-afc0f873e.tar.gz
+/uzbl-afc0f873e.tar.gz
diff --git a/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch b/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
new file mode 100644
index 0000000..5a667da
--- /dev/null
+++ b/0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
@@ -0,0 +1,42 @@
+From c202a6b79eb3658c12ba2077cb175a2fe5ae30a1 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Thu, 2 Sep 2010 12:35:41 +0900
+Subject: [PATCH] Fix crash on "Open Image in New Window" (FS#231).
+
+- create_web_view_js2_cb(): don't destroy web_view if uri is not a
+  "javascript:" URI.
+- create_web_view_js_cb(): fix g_object_connect() call which must terminate
+  with a NULL signal name.
+---
+ src/callbacks.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/callbacks.c b/src/callbacks.c
+index d2352b2..37f392a 100644
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -703,11 +703,10 @@ create_web_view_js2_cb (WebKitWebView* web_view, GParamSpec param_spec) {
+ 
+     if (strncmp(uri, "javascript:", strlen("javascript:")) == 0) {
+         eval_js(uzbl.gui.web_view, (gchar*) uri + strlen("javascript:"), NULL, "javascript:");
++        gtk_widget_destroy(GTK_WIDGET(web_view));
+     }
+     else
+         send_event(NEW_WINDOW, uri, NULL);
+-
+-    gtk_widget_destroy(GTK_WIDGET(web_view));
+ }
+ 
+ 
+@@ -717,7 +716,7 @@ create_web_view_js_cb (WebKitWebView* web_view, gpointer user_data) {
+     (void) user_data;
+ 
+     g_object_connect (web_view, "signal::notify::uri",
+-                            G_CALLBACK(create_web_view_js2_cb), NULL);
++                            G_CALLBACK(create_web_view_js2_cb), NULL, NULL);
+     return TRUE;
+ }
+ 
+-- 
+1.7.2.2
+
diff --git a/uzbl.spec b/uzbl.spec
index 54033f0..bd61054 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -4,7 +4,7 @@ Name:		uzbl
 Summary:	Lightweight WebKit browser following the UNIX philosophy
 Group:		Applications/Internet
 Version:	0
-Release:	0.17.20100626git%{uzblcommit}%{?dist}
+Release:	0.18.20100626git%{uzblcommit}%{?dist}
 License:	GPLv3
 URL:		http://www.uzbl.org
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -19,6 +19,7 @@ Source1:	%{name}.desktop
 Patch0:		%{name}-makefile.patch
 # Security bug (RHBZ#621965)
 Patch1:		0001-Don-t-shell-interpret-SELECTED_URI-fixes-FS-240.patch
+Patch2:		0001-Fix-crash-on-Open-Image-in-New-Window-FS-231.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	webkitgtk-devel
@@ -81,6 +82,7 @@ multiple uzbl-browser instances without getting lost.
 %setup -q -n %{name}-%{uzblcommit}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mkdir -p icons/hicolor/32x32/apps
 mv examples/data/uzbl.png icons/hicolor/32x32/apps
@@ -141,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/uzbl-tabbed
 
 %changelog
+* Mon Sep  6 2010 Daiki Ueno <dueno@redhat.com> - 0-0.18.20100626gitafc0f873e
+- add patch to avoid crash on "Open Image in New Window" (#584733)
+
 * Fri Aug 20 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.17.20100626gitafc0f873e
 - Add Requires: on xclip
 

From a074ce32b96a5030cce311cad07408bed461ca55 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Tue, 12 Apr 2011 15:39:37 -0400
Subject: [PATCH 10/10] Remove reference to patch2

---
 uzbl.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uzbl.spec b/uzbl.spec
index 2ca2bd1..c1dc739 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -98,7 +98,6 @@ Highlighting files for uzbl's configuration.
 %setup -q -n %{name}-%{uzblcommit}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 mkdir -p icons/hicolor/32x32/apps
 mv examples/data/uzbl.png icons/hicolor/32x32/apps