- scripts subpackage

- examples contains only configs now

Changed files:
    uzbl.spec -> 1.13

diff --git a/uzbl.spec b/uzbl.spec
index 86a0f457626f886701e593fdeda0ea3a415cdd92..8f23f78766bb41936998d78b709cf8539427a33b 100644 (file)
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -15,6 +15,7 @@ License:      GPL v3
 Group:         X11/Applications/Networking
 Source0:       %{name}-%{gitdate}.tar.xz
 # Source0-md5: e90ffe6b73747731a1d9d7c456e3e411
+Patch0:                uzbl-config.patch
 URL:           http://www.uzbl.org/
 BuildRequires: curl-devel
 BuildRequires: gtk+2-devel
@@ -38,10 +39,18 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 %description tabbed
 Wrapper for uzbl that provides firefox-style tabs.
 
+%package scripts
+Summary:       Scripts for uzbl
+Group:         X11/Applications/Networking
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description scripts
+Scripts for uzbl that handles cookies, downloads, history, etc.
+
 %package examples
-Summary:       Example config and scripts for uzbl
+Summary:       Example configs
 Summary(hu.UTF-8):     Példa konfigurációs fájlok és szkriptek uzbl-hez
-Summary(pl.UTF8):      Przykładowa konfiguracja i skrypty dla uzbl
+Summary(pl.UTF8):      Przykładowa konfiguracja dla uzbl
 Group:         Documentation
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bash
@@ -49,22 +58,22 @@ Requires:   dmenu
 Requires:      zenity
 
 %description examples
-Example config files and scripts for uzbl. If you want just try uzbl
-install this package and run:
+Example config files for uzbl. If you want just try uzbl install this package
+and run:
 
-uzbl -c %{_datadir}/uzbl/configs/sampleconfig
+uzbl -c %{_examplesdir}/%{name}-%{version}/config
 
 %description examples -l hu.UTF-8
 Példa konfigurációs fájlok és szkriptek uzbl-hez. Ha ki akarod
 próbálni az uzbl-lel, akkor telepítsd ezt a csomagot és a következő
 paranccsal indíthatod:
 
-uzbl -c %{_datadir}/uzbl/configs/sampleconfig
+uzbl -c %{_examplesdir}/%{name}-%{version}/config
 
 %prep
 %setup -q -n %{name}-%{gitdate}
 
-find examples -type f | xargs sed -i 's,/examples/,/,g'
+%patch0 -p0
 
 %build
 %{__make}
@@ -78,8 +87,14 @@ rm -rf $RPM_BUILD_ROOT
 # tabbed
 mv $RPM_BUILD_ROOT%{_datadir}/uzbl/examples/data/uzbl/scripts/uzbl_tabbed.py $RPM_BUILD_ROOT%{_bindir}/uzbl_tabbed
 
-# examples
-mv $RPM_BUILD_ROOT%{_datadir}/uzbl/examples/* $RPM_BUILD_ROOT%{_datadir}/uzbl
+# most important scripts
+install -d $RPM_BUILD_ROOT%{_datadir}/uzbl/scripts
+mv $RPM_BUILD_ROOT%{_datadir}/uzbl/examples/data/uzbl/scripts $RPM_BUILD_ROOT%{_datadir}/uzbl
+
+# example config
+install -d $RPM_BUILD_ROOT%{_examplesdir}/uzbl-%{version}
+mv $RPM_BUILD_ROOT%{_datadir}/uzbl/examples/config/uzbl/config $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/config
+mv $RPM_BUILD_ROOT%{_datadir}/uzbl/examples/data/uzbl/forms $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/forms
 rm -r $RPM_BUILD_ROOT%{_datadir}/uzbl/{docs,examples}
 
 %clean
@@ -90,19 +105,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README docs/*
 %attr(755,root,root) %{_bindir}/uzbl
 %attr(755,root,root) %{_bindir}/uzblctrl
+%dir %{_datadir}/uzbl
 
 %files tabbed
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uzbl_tabbed
 
+%files scripts
+%dir %{_datadir}/uzbl/scripts
+%attr(755,root,root) %{_datadir}/uzbl/scripts/*
+
 %files examples
 %defattr(644,root,root,755)
-%dir %{_datadir}/uzbl
-%dir %{_datadir}/uzbl/data
-%dir %{_datadir}/uzbl/data/uzbl
-%dir %{_datadir}/uzbl/data/uzbl/scripts
-%attr(755,root,root) %{_datadir}/uzbl/data/uzbl/scripts/*
-%{_datadir}/uzbl/data/uzbl/forms
-%{_datadir}/uzbl/data/uzbl/bookmarks
-%{_datadir}/uzbl/data/uzbl/*.*
-%{_datadir}/uzbl/config
+%{_examplesdir}/uzbl-%{version}