rpms/uzbl/F-13 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4 uzbl.patch, 1.3, 1.4 uzbl.spec, 1.4, 1.5

[Daiki Ueno]

Author: ueno

Update of /cvs/pkgs/rpms/uzbl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2609/F-13

Modified Files:
	.cvsignore import.log sources uzbl.patch uzbl.spec 
Log Message:
new upstream snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Apr 2010 01:28:09 -0000	1.3
+++ .cvsignore	31 May 2010 00:57:48 -0000	1.4
@@ -1 +1 @@
-uzbl-ae15d257a.tar.gz
+uzbl-ec473e124.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/F-13/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Apr 2010 08:27:48 -0000	1.3
+++ import.log	31 May 2010 00:57:48 -0000	1.4
@@ -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Apr 2010 01:28:09 -0000	1.3
+++ sources	31 May 2010 00:57:48 -0000	1.4
@@ -1 +1 @@
-0afc4198b9392d62b5ac3c3b022105fb  uzbl-ae15d257a.tar.gz
+5bbd08c1ad7aa8a7eac37c7f04e0081e  uzbl-ec473e124.tar.gz

uzbl.patch:
 Makefile |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Index: uzbl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/F-13/uzbl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- uzbl.patch	8 Apr 2010 08:27:48 -0000	1.3
+++ uzbl.patch	31 May 2010 00:57:48 -0000	1.4
@@ -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)


Index: uzbl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/F-13/uzbl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- uzbl.spec	8 Apr 2010 08:27:48 -0000	1.4
+++ uzbl.spec	31 May 2010 00:57:48 -0000	1.5
@@ -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 th
 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, eac
 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/
 
 %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, -)
 %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
-%{_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 May 31 2010 Daiki Ueno <dueno at redhat.com> - 0-0.13.20100410gitec473e124
+- new upstream snapshot.
+
+* Wed Apr 14 2010 Ben Boeckel <MathStuf at 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 at redhat.com> - 0-0.11.20100405gitae15d257a
 - don't strip uzbl-core with the install command (closes #580250).