[uzbl] Split out -defaults package

Ben Boeckel mathstuf at fedoraproject.org
Sun Oct 10 19:50:18 UTC 2010


commit 9825df88f08155fca732d92966debf6e5c6ba041
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Sun Oct 10 15:46:12 2010 -0400

    Split out -defaults package

 uzbl.spec |   50 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 31 insertions(+), 19 deletions(-)
---
diff --git a/uzbl.spec b/uzbl.spec
index 5cdcd30..3373018 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -28,21 +28,7 @@ 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
-# Default config
-Requires:	xclip
+Requires:	uzbl-defaults = %{version}-%{release}
 
 %description
 Uzbl is a lightweight web browser based on WebKit/Gtk+.  Uzbl follows
@@ -78,6 +64,29 @@ 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
@@ -138,10 +147,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-, root, root, -)
-%{_datadir}/icons/*/*/apps/%{name}.*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/%{name}/examples/config/
-%{_datadir}/%{name}/examples/data/
 
 %files core
 %defattr(-, root, root, -)
@@ -158,6 +163,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %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/vim%{vim_version}/ftdetect/uzbl.vim


More information about the scm-commits mailing list