packages: uzbl/uzbl.spec - scripts subpackage - examples contains only conf...

[pawelz]

Author: pawelz                       Date: Mon Jul 13 14:14:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- scripts subpackage
- examples contains only configs now

---- Files affected:
packages/uzbl:
   uzbl.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/uzbl/uzbl.spec
diff -u packages/uzbl/uzbl.spec:1.12 packages/uzbl/uzbl.spec:1.13
--- packages/uzbl/uzbl.spec:1.12	Mon Jul 13 14:58:44 2009
+++ packages/uzbl/uzbl.spec	Mon Jul 13 16:14:01 2009
@@ -16,6 +16,7 @@
 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
@@ -39,10 +40,18 @@
 %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
@@ -50,22 +59,22 @@
 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}
@@ -79,8 +88,14 @@
 # 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
@@ -91,22 +106,19 @@
 %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}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -114,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/07/13 14:14:01  pawelz
+- scripts subpackage
+- examples contains only configs now
+
 Revision 1.12  2009/07/13 12:58:44  pawelz
 - tabbed subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uzbl/uzbl.spec?r1=1.12&r2=1.13&f=u