rpms/uzbl/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 uzbl.patch, 1.1, 1.2 uzbl.spec, 1.2, 1.3

Mon Apr 5 01:19:05 UTC 2010

Author: ueno

Update of /cvs/pkgs/rpms/uzbl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12052/devel

Modified Files:
	.cvsignore import.log sources uzbl.patch uzbl.spec 
Log Message:
- split out uzbl-tabbed as a seperate package to avoid dependency on
  pygtk2 (partially merged a patch from Ben Boeckel <mathstuf at gmail.com>).
- new upstream snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	26 Mar 2010 02:37:29 -0000	1.2
+++ .cvsignore	5 Apr 2010 01:19:03 -0000	1.3
@@ -1 +1 @@
-uzbl-abbffe5c3.tar.gz
+uzbl-ae15d257a.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Mar 2010 02:37:30 -0000	1.1
+++ import.log	5 Apr 2010 01:19:03 -0000	1.2
@@ -1 +1,2 @@
 uzbl-0-0_8_20100221gitabbffe5c3:HEAD:uzbl-0-0.8.20100221gitabbffe5c3.src.rpm:1269571031
+uzbl-0-0_10_20100405gitae15d257a_fc13:HEAD:uzbl-0-0.10.20100405gitae15d257a.fc13.src.rpm:1270430258


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Mar 2010 02:37:30 -0000	1.2
+++ sources	5 Apr 2010 01:19:03 -0000	1.3
@@ -1 +1 @@
-0faa2940b9331461ff0b88a0cc8ee2ac  uzbl-abbffe5c3.tar.gz
+0afc4198b9392d62b5ac3c3b022105fb  uzbl-ae15d257a.tar.gz

uzbl.patch:
 Makefile |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Index: uzbl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/devel/uzbl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uzbl.patch	26 Mar 2010 02:37:30 -0000	1.1
+++ uzbl.patch	5 Apr 2010 01:19:03 -0000	1.2
@@ -1,11 +1,11 @@
-diff -ru uzbl-abbffe5c3.orig/Makefile uzbl-abbffe5c3/Makefile
---- uzbl-abbffe5c3.orig/Makefile	2010-02-19 05:51:18.000000000 +0900
-+++ uzbl-abbffe5c3/Makefile	2010-03-13 18:17:35.103876347 +0900
-@@ -1,15 +1,14 @@
+diff -ru uzbl-ae15d257a.orig/Makefile uzbl-ae15d257a/Makefile
+--- uzbl-ae15d257a.orig/Makefile	2010-04-04 04:42:03.000000000 +0900
++++ uzbl-ae15d257a/Makefile	2010-04-05 09:48:30.887543437 +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)\"" -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 ${RPM_OPT_FLAGS}
  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)
@@ -13,54 +13,29 @@ diff -ru uzbl-abbffe5c3.orig/Makefile uz
  LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
  
  SRC = $(wildcard src/*.c)
- HEAD = $(wildcard src/*.h)
--TOBJ = $(SRC:.c=.o)
--OBJ = $(foreach obj, $(TOBJ), $(notdir $(obj)))
-+OBJ = $(SRC:.c=.o)
- 
- all: uzbl-browser options
- 
-@@ -23,17 +22,12 @@
- 
- 
- .c.o:
--	@echo COMPILING $<
--	@${CC} -c ${CFLAGS} $<
--	@echo ... done.
-+	${CC} -o $@ -c ${CFLAGS} $<
- 
- ${OBJ}: ${HEAD}
- 
--uzbl-core: ${TOBJ} # why doesn't ${OBJ} work?
--	@echo
--	@echo LINKING object files
--	@${CC} -o $@ ${OBJ} ${LDFLAGS}
--	@echo ... done.
-+uzbl-core: ${OBJ}
-+	${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- 
- uzbl-browser: uzbl-core
-@@ -100,14 +94,9 @@
+@@ -89,15 +89,11 @@
  
  install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs         $(INSTALLDIR)/share/uzbl/
--	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
- 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
+ 	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)/
+ 	cp -r examples $(INSTALLDIR)/share/uzbl/
+ 	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
++	chmod 644 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*.js
  	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+-	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
++	install -s -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
  
  install-uzbl-browser:
-@@ -117,6 +106,7 @@
- 	install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ 	install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+@@ -105,6 +101,7 @@
+ 	install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
  	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
  	sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
 +	cp -r icons $(INSTALLDIR)/share
  
  install-uzbl-tabbed:
- 	install -d $(INSTALLDIR)/bin
+ 	install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed


Index: uzbl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uzbl/devel/uzbl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uzbl.spec	26 Mar 2010 02:59:50 -0000	1.2
+++ uzbl.spec	5 Apr 2010 01:19:03 -0000	1.3
@@ -1,14 +1,14 @@
-%global		uzblcommit	abbffe5c3
+%global		uzblcommit	ae15d257a
 Name:		uzbl
 Version:	0
-Release:	0.9.20100221git%{uzblcommit}%{?dist}
+Release:	0.10.20100405git%{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=abbffe5c3
+#  export uzblcommit=ae15d257a
 #  git archive --format tar --prefix uzbl-${uzblcommit}/ ${uzblcommit} |\
 #      gzip -c > ../uzbl-${uzblcommit}.tar.gz
 Source0:	%{name}-%{uzblcommit}.tar.gz
@@ -27,6 +27,18 @@ 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 tabbed
+Summary:	Tabbed interface to Uzbl
+Group:		Applications/Internet
+Requires:	%{name} = %{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.
+
 %prep
 %setup -q -n %{name}-%{uzblcommit}
 %patch0 -p1
@@ -66,12 +78,25 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS LICENSE README docs/* src/config.h
-%{_bindir}/*
-%{_datadir}/%{name}/
+%{_bindir}/uzbl-core
+%{_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 Apr  5 2010 Daiki Ueno <ueno at 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 at gmail.com>).
+- new upstream snapshot.
+
 * Fri Mar 26 2010 Daiki Ueno <ueno at unixuser.org> - 0-0.9.20100221gitabbffe5c3
 - add dist number to Release.
 

