Compare commits

..

63 commits

Author SHA1 Message Date
Ben Boeckel
5c69f5dfbd requires webkit1 which has been retired 2017-12-08 11:56:31 -05:00
Fedora Release Engineering
fd166be1b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 09:56:28 +00:00
Fedora Release Engineering
7dbcdaa230 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:07:58 +00:00
Fedora Release Engineering
db21f100e4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 16:52:55 +00:00
Fedora Release Engineering
0b54a8c00c - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 02:30:09 +00:00
Ben Boeckel
862dae50da use %make_install 2015-08-02 12:30:43 -04:00
Dennis Gilmore
2b3ea9c444 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 01:45:33 +00:00
Richard Hughes
4c3cbe8219 Add an AppData file for the software center 2015-03-26 16:45:34 +00:00
Ben Boeckel
8712558978 Make the vim subpackage noarch 2015-02-08 20:32:07 -05:00
57f6b26ed8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 07:23:07 +00:00
Dennis Gilmore
981d625ac3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 22:11:03 -05:00
Dennis Gilmore
13e1dbb889 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 00:52:14 -05:00
Ben Boeckel
cf491fa277 Handle errors in event handlers in uzbl-tabbed 2013-06-20 02:16:42 -04:00
Ben Boeckel
e7252f4552 Fix NULL dereference 2013-06-20 02:11:48 -04:00
Dennis Gilmore
c0be76be09 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 20:36:28 -06:00
Ben Boeckel
7232fa1a73 Update to new snapshot 2012-11-04 22:23:48 -05:00
Dennis Gilmore
3da8714271 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 21:19:44 -05:00
Ben Boeckel
fc6f0c5af1 Add patch for cookie file permissions 2012-02-23 20:15:56 -05:00
Ben Boeckel
d2b791f45e Narrow the vim dependencies 2012-02-23 20:09:09 -05:00
Dennis Gilmore
1bd2daf184 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 01:43:05 -06:00
Ben Boeckel
c6831043e7 Fix the makefile patch one more time 2011-10-25 15:09:54 -04:00
Ben Boeckel
0dcd6c6f48 Update gthread patch 2011-10-25 14:41:19 -04:00
Ben Boeckel
7699ce6d8b Fix up patches and add upstreaming links 2011-10-25 14:28:48 -04:00
Ben Boeckel
5cd1f89ca8 Revert "Include gthread.h, not glib.h"
This reverts commit 799769f7de.
2011-10-25 14:03:17 -04:00
Ben Boeckel
799769f7de Include gthread.h, not glib.h 2011-10-25 13:34:36 -04:00
Ben Boeckel
577ec9d527 Also link gthread-2.0 2011-10-25 13:25:39 -04:00
Ben Boeckel
83af9a3184 Add patches to fix warnings and the build 2011-10-25 13:15:09 -04:00
Ben Boeckel
fb62613bf9 Add patch to link with jscore 2011-10-25 12:55:04 -04:00
Ben Boeckel
08e7c4a28b Rediff the makefile patch 2011-10-25 12:39:49 -04:00
Ben Boeckel
cf39d078ea Update Fedora-specific patch 2011-10-25 12:30:05 -04:00
Ben Boeckel
e3dccf87c7 Add conditional support for webkitgtk3 2011-10-25 12:04:27 -04:00
Ben Boeckel
ef8b311e61 Update snapshot 2011-10-25 12:04:16 -04:00
Daiki Ueno
0ed72488ad Don't install removed uzbl-cookie-manager. 2011-04-04 18:19:25 +09:00
Daiki Ueno
afcb097d58 Update uzbl-makefile.patch not to remove non-existent files. 2011-04-04 18:10:06 +09:00
Daiki Ueno
7380eaf552 Update to 0-0.25.20110402gite7578e27c. 2011-04-04 18:02:14 +09:00
Daiki Ueno
8df971f1cd Update to 0-0.24.20110215git8bbc39b83. 2011-03-02 18:00:23 +09:00
Dennis Gilmore
b9482f0bb4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-07 18:50:20 -06:00
Ben Boeckel
c39cb331b4 - Update the vim subpackage to install for 7.3 2011-01-25 13:47:08 -05:00
Daiki Ueno
77f0717214 Update to 0-0.21.20101125git518004933. 2010-11-29 17:11:50 +09:00
Daiki Ueno
d8cbcfe2f9 Update to 0-0.20.20101125git518004933. 2010-11-29 15:17:36 +09:00
Ben Boeckel
97e75c9c5f Remove references to local patches 2010-10-10 16:19:02 -04:00
Ben Boeckel
f36ae116fa Fix CFLAGS exporting 2010-10-10 16:15:14 -04:00
Ben Boeckel
b76bd8d842 Missing BR on pkg-config 2010-10-10 16:11:47 -04:00
Ben Boeckel
2e5f099678 Link glib-2.0 as well 2010-10-10 16:09:01 -04:00
Ben Boeckel
d1abc0702c Bump release 2010-10-10 15:48:55 -04:00
Ben Boeckel
8603c3ae4c Add a message for new users without uzbl-defaults 2010-10-10 15:48:13 -04:00
Ben Boeckel
9825df88f0 Split out -defaults package 2010-10-10 15:46:12 -04:00
Ben Boeckel
62a6ce9e9b Ship vim highlighting files 2010-10-10 15:45:20 -04:00
Ben Boeckel
381154769e Use %{optflags} instead of -O0 2010-10-10 15:44:41 -04:00
Daiki Ueno
f92faa6109 Update to -0.18. 2010-09-06 09:56:22 +09:00
Ben Boeckel
003d0c46f7 - Add Requires: on xclip 2010-08-20 23:27:56 -04:00
Ben Boeckel
40b0d8edb5 Add patch to fix shell escaping 2010-08-06 18:38:17 -04:00
Ben Boeckel
ac8c7a0917 Move the patch to be more descriptive 2010-08-06 18:28:37 -04:00
Fedora Release Engineering
d3ce5e40be dist-git conversion 2010-07-29 14:51:53 +00:00
Ben Boeckel
3d17ab6df9 Rebuild against webkitgtk 2010-07-03 13:01:47 +00:00
Daiki Ueno
ebd7623b32 new upstream snapshot. 2010-06-30 07:22:18 +00:00
Daiki Ueno
7a53b4cbfc new upstream snapshot 2010-05-31 00:45:57 +00:00
Ben Boeckel
a2c5dff0cd Oops, bump Release 2010-04-14 05:40:50 +00:00
Ben Boeckel
e481a47154 Split packages and minor touchups 2010-04-14 05:39:48 +00:00
Daiki Ueno
5a79073fed don't strip uzbl-core with the install command (closes #580250). 2010-04-08 03:49:14 +00:00
Daiki Ueno
b041f2c66a - split out uzbl-tabbed as a seperate package to avoid dependency on pygtk2
(partially merged a patch from Ben Boeckel <mathstuf@gmail.com>).
- new upstream snapshot.
2010-04-05 01:19:03 +00:00
Daiki Ueno
60b21dc061 Add dist number to Release. 2010-03-26 02:59:50 +00:00
Daiki Ueno
7e5d9575f8 Import uzbl. 2010-03-26 02:37:30 +00:00
6 changed files with 1 additions and 187 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
uzbl-abbffe5c3.tar.gz

1
dead.package Normal file
View file

@ -0,0 +1 @@
requires webkit1 which has been retired

View file

@ -1 +0,0 @@
0faa2940b9331461ff0b88a0cc8ee2ac uzbl-abbffe5c3.tar.gz

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Uzbl
GenericName=Uzbl Web Browser
Comment=Browse the Web
Exec=uzbl-browser
Icon=uzbl
Terminal=false
Type=Application
Categories=Network;WebBrowser;

View file

@ -1,66 +0,0 @@
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 @@
# 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!=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)
+LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0 x11) -pthread $(LDFLAGS)
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 @@
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
sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
install-uzbl-browser:
@@ -117,6 +106,7 @@
install -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

110
uzbl.spec
View file

@ -1,110 +0,0 @@
%global uzblcommit abbffe5c3
Name: uzbl
Version: 0
Release: 0.9.20100221git%{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
# 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
%description
Uzbl is a lightweight web browser based on WebKit/Gtk+. Uzbl follows
the UNIX philosophy - "Write programs that do one thing and do it
well. Write programs to work together. Write programs to handle text
streams, because that is a universal interface."
%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 \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-, root, root, -)
%doc AUTHORS LICENSE README docs/* src/config.h
%{_bindir}/*
%{_datadir}/%{name}/
%{_datadir}/icons/*/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
%changelog
* Fri Mar 26 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.9.20100221gitabbffe5c3
- add dist number to Release.
* Fri Mar 19 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.8.20100221gitabbffe5c3
- use the macro "global" instead of "define".
* Thu Mar 18 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.7.20100221gitabbffe5c3
- copy files under /usr/share/uzbl/ only once.
* Tue Mar 16 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.6.20100221gitabbffe5c3
- preserve timestamp of installed files.
- include scriptlets for icon cache.
- claim ownership of the directory "uzbl" under datadir.
* Sat Mar 13 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.5.20100221gitabbffe5c3
- install 32x32 icon under the standard icon path.
- fix the executable name in uzbl.desktop.
- prevent re-compilation on "make install".
- install examples/* under /usr/share/uzbl/examples, since the path is
hard-coded in bundled scripts.
* Mon Mar 8 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.4.20100221gitabbffe5c3
- make sure support scripts are not executable.
* Sun Mar 7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.3.20100221gitabbffe5c3
- use LDFLAGS from x11.pc to follow the F-13 DSO linking change.
* Sun Mar 7 2010 Daiki Ueno <ueno@unixuser.org> - 0-0.2.20100221gitabbffe5c3
- don't use Epoch.
- make the build log more verbose.
- don't use the makeinstall macro and use _prefix macro.
- include uzbl.desktop.
- install all document files under /usr/share/doc/uzbl-0.
* Sun Feb 21 2010 Daiki Ueno <ueno@unixuser.org> - 1:0-0.1.20100221gitabbffe5c3
- initial packaging for fedora.