.gitignore

@@ -0,0 +1 @@
+/uzbl-228bc38cbd.tar.gz

0001-Fedora-specific-error-messages-on-no-configs.patch

@@ -0,0 +1,37 @@
+From 496e9af495db28e19781b60f05a52efe7bcc47eb Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <MathStuf@gmail.com>
+Date: Tue, 25 Oct 2011 12:28:51 -0400
+Subject: [PATCH] Fedora-specific error messages on no configs
+
+---
+ bin/uzbl-browser |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/bin/uzbl-browser b/bin/uzbl-browser
+index fb9a368..8d2f9e3 100755
+--- a/bin/uzbl-browser
++++ b/bin/uzbl-browser
+@@ -39,7 +39,19 @@ if [ ! -f "$XDG_CONFIG_HOME"/uzbl/config ]
+ then
+ 	if [ ! -r "$EXAMPLES"/config/config ]
+ 	then
+-		echo "Error: Global config not found; please check if your distribution ships them separately"
++		text="Global config not found; please install the uzbl-defaults package"
++		if [ -x zenity ]
++		then
++			zenity --error --text="$text"
++		elif [ -x kdialog ]
++		then
++			kdialog --error "$text"
++		elif [ -x Xdialog ]
++		then
++			Xdialog --msgbox "Error: $text"
++		else
++			echo "Error: $text"
++		fi
+ 		exit 3
+ 	fi
+ 	if ! cp "$EXAMPLES"/config/* "$XDG_CONFIG_HOME"/uzbl/
+-- 
+1.7.6
+

dead.package

@@ -1 +0,0 @@
-requires webkit1 which has been retired

sources

@@ -0,0 +1 @@
+ce3fe2aa60ce8044fa94520e11fa251a  uzbl-228bc38cbd.tar.gz

uzbl-makefile.patch

@@ -0,0 +1,31 @@
+diff -u -r -U5 uzbl-9576f59f05/Makefile uzbl-9576f59f05.makefile/Makefile
+--- uzbl-9576f59f05/Makefile	2011-10-25 15:04:48.995533888 -0400
++++ uzbl-9576f59f05.makefile/Makefile	2011-10-25 15:08:10.280520126 -0400
+@@ -113,15 +113,10 @@
+ install-dirs:
+ 	[ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin
+ 
+ install-uzbl-core: all install-dirs
+ 	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)/
+ 	install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+ 
+ install-event-manager: install-dirs
+ 	sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < bin/uzbl-event-manager > $(INSTALLDIR)/bin/uzbl-event-manager
+ 	chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager
+@@ -129,10 +124,11 @@
+ install-uzbl-browser: install-dirs install-uzbl-core install-event-manager
+ 	sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < bin/uzbl-browser > $(INSTALLDIR)/bin/uzbl-browser
+ 	chmod 755 $(INSTALLDIR)/bin/uzbl-browser
+ 	cp -r examples $(INSTALLDIR)/share/uzbl/
+ 	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
++	chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js
+ 
+ install-uzbl-tabbed: install-dirs
+ 	install -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+ 
+ # you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors

uzbl-null-window.patch

@@ -0,0 +1,16 @@
+diff -u -r -U5 uzbl-228bc38cbd/src/variables.c uzbl-228bc38cbd.null-window/src/variables.c
+--- uzbl-228bc38cbd/src/variables.c	2012-04-28 14:27:17.000000000 -0400
++++ uzbl-228bc38cbd.null-window/src/variables.c	2013-06-20 02:05:26.904083524 -0400
+@@ -251,11 +251,11 @@
+     return G_OBJECT(webkit_web_view_get_settings(uzbl.gui.web_view));
+ }
+ 
+ void
+ set_window_property(const gchar* prop, const gchar* value) {
+-    if(GTK_IS_WIDGET(uzbl.gui.main_window)) {
++    if(uzbl.gui.main_window && GTK_IS_WIDGET(uzbl.gui.main_window)) {
+         gdk_property_change(
+             gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)),
+             gdk_atom_intern_static_string(prop),
+             gdk_atom_intern_static_string("STRING"),
+             8,

uzbl-tab-index.patch

@@ -0,0 +1,19 @@
+diff -u -r -U5 uzbl-228bc38cbd/bin/uzbl-tabbed uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed
+--- uzbl-228bc38cbd/bin/uzbl-tabbed	2012-04-28 14:27:17.000000000 -0400
++++ uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed	2013-06-20 02:15:17.813822801 -0400
+@@ -398,11 +398,14 @@
+         method = getattr(self, message_type.lower(), None)
+ 
+         if method is None:
+             return False
+ 
+-        method(*args)
++        try:
++            method(*args)
++        except:
++            print_exc()
+         return True
+ 
+ class GlobalEventDispatcher(EventDispatcher):
+     def __init__(self, uzbl_tabbed):
+         self.uzbl_tabbed = uzbl_tabbed

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;

uzbl.spec

@@ -0,0 +1,316 @@
+%global         uzblcommit      228bc38cbd
+
+%bcond_without gtk3
+%bcond_with    webkit2
+
+Name:           uzbl
+Summary:        Lightweight WebKit browser following the UNIX philosophy
+Group:          Applications/Internet
+Version:        0
+Release:        0.33.20120514git%{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=228bc38cbd
+#  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
+#      gzip -c > ../uzbl-${uzblcommit}.tar.gz
+Source0:        %{name}-%{uzblcommit}.tar.gz
+Source1:        %{name}.desktop
+# RPM handles docs for us, won't be upstreamed
+Patch0:         %{name}-makefile.patch
+# Fedora-specific, won't be upstreamed
+Patch1:         0001-Fedora-specific-error-messages-on-no-configs.patch
+# Upstream has moved on. Will drop when updated.
+Patch2:         uzbl-null-window.patch
+Patch3:         uzbl-tab-index.patch
+
+%if %{with gtk3}
+BuildRequires:  webkitgtk3-devel
+%else
+BuildRequires:  webkitgtk-devel
+%endif
+BuildRequires:  desktop-file-utils
+BuildRequires:  pkgconfig
+
+# New users probably want a tabbed browser
+Requires:       uzbl-tabbed = %{version}-%{release}
+Requires:       uzbl-defaults = %{version}-%{release}
+
+%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."
+
+%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}-browser = %{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.
+
+%package defaults
+Summary:        Default configuration for uzbl
+Group:          Applications/Internet
+Requires:       %{name}-browser = %{version}-%{release}
+
+# XXX: Be aware that script dependencies need enumerated here
+# Dialog for bookmarks and authentication
+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
+# Default config
+Requires:       xclip
+
+%description defaults
+Default configuration for uzbl.
+
+%package vim
+Summary:        Vim highlighting for uzbl's config
+Group:          Applications/Text
+Requires:       vim-filesystem
+
+%description vim
+Highlighting files for uzbl's configuration.
+
+
+%prep
+%setup -q -n %{name}-%{uzblcommit}
+%patch0 -p1 -b .makefile
+%patch1 -p1 -b .fedora
+%patch2 -p1 -b .null-window
+%patch3 -p1 -b .tab-index
+
+mkdir -p icons/hicolor/32x32/apps
+mv examples/data/uzbl.png icons/hicolor/32x32/apps
+
+
+%build
+CFLAGS="%{optflags}"
+export CFLAGS
+make %{?_smp_mflags} \
+%if %{with gtk3}
+    ENABLE_GTK3=yes \
+%else
+    ENABLE_GTK3=no \
+%endif
+%if %{with webkit2}
+    ENABLE_WEBKIT2=yes \
+%else
+    ENABLE_WEBKIT2=no \
+%endif
+
+
+%install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+
+cp -pr icons %{buildroot}%{_datadir}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+%{SOURCE1}
+
+mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/
+install -p extras/vim/ftdetect/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim
+mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/
+install -p extras/vim/ftplugin/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim
+mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax/
+install -p extras/vim/syntax/uzbl.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/uzbl.vim
+
+
+%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, -)
+
+%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-event-manager
+
+%files tabbed
+%defattr(-, root, root, -)
+%{_bindir}/uzbl-tabbed
+
+%files defaults
+%defattr(-, root, root, -)
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/examples/config/
+%{_datadir}/%{name}/examples/data/
+
+%files vim
+%defattr(-, root, root, -)
+%{_datadir}/vim/vimfiles/ftdetect/uzbl.vim
+%{_datadir}/vim/vimfiles/ftplugin/uzbl.vim
+%{_datadir}/vim/vimfiles/syntax/uzbl.vim
+
+
+%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.33.20120514git228bc38cbd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jun 20 2013 Ben Boeckel <mathstuf@gmail.com> - 0-0.32.20120514git228bc38cbd
+- Fix NULL-ptr dereference when setting the UZBL_URI window property
+- Handle errors in uzbl-tabbed
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.31.20120514228bc38cbd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Nov 04 2012 Ben Boeckel <mathstuf@gmail.com> - 0-0.30.20120514git228bc38cbd
+- Update to new snapshot
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.29.20111001git9576f59f05
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Feb 23 2012 Ben Boeckel <mathstuf@gmail.com> - 0-0.28.20111001git9576f59f05
+- Lock down permissions on cookie files (CVE-2012-0843)
+- Clean up vim subpackage
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.27.20111001git9576f59f05
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Oct 25 2011 Ben Boeckel <mathstuf@gmail.com> - 0-0.26.20111001git9576f59f05
+- New upstream snapshot
+- Add conditional support for webkitgtk3
+
+* Mon Apr  4 2011 Daiki Ueno <dueno@redhat.com> - 0-0.25.20110402gite7578e27c
+- New upstream snapshot
+- Don't install removed uzbl-cookie-manager and related files.
+
+* Wed Mar  2 2011 Daiki Ueno <dueno@redhat.com> - 0-0.24.20110215git8bbc39b83
+- New upstream snapshot
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.23.20101125git518004933
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Ben Boeckel <mathstuf@gmail.com> - 0-0.22.20101125git518004933
+- Update the vim subpackage to install for 7.3
+
+* Mon Nov 29 2010 Daiki Ueno <dueno@redhat.com> - 0-0.21.20101125git518004933
+- omit unnecessary buildroot stuff
+
+* Mon Nov 29 2010 Daiki Ueno <dueno@redhat.com> - 0-0.20.20101125git518004933
+- new upstream snapshot.
+- remove patches incorporated into the upstream git master.
+
+* Sun Oct 10 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.19.20100626gitafc0f873e
+- Split out -defaults package
+- Install vim files
+- Remove -O0 compile flag
+- Use %%{optflags}
+
+* 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
+
+* Fri Aug 06 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.16.20100626gitafc0f873e
+- Add patch for shell escaping bug (BZ#621965)
+
+* Sat Jul 03 2010 Ben Boeckel <mathstuf@gmail.com> - 0-0.15.20100626gitafc0f873e
+- Rebuild against webkitgtk
+
+* 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.
+
+* 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).
+
+* 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.
+
+* 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.