diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c8f4cdc..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -uzbl-abbffe5c3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a3d2afe --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +requires webkit1 which has been retired diff --git a/sources b/sources deleted file mode 100644 index 0513904..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -0faa2940b9331461ff0b88a0cc8ee2ac uzbl-abbffe5c3.tar.gz diff --git a/uzbl.desktop b/uzbl.desktop deleted file mode 100644 index b1cc8af..0000000 --- a/uzbl.desktop +++ /dev/null @@ -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; diff --git a/uzbl.patch b/uzbl.patch deleted file mode 100644 index 2916ace..0000000 --- a/uzbl.patch +++ /dev/null @@ -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 diff --git a/uzbl.spec b/uzbl.spec deleted file mode 100644 index 9b104be..0000000 --- a/uzbl.spec +++ /dev/null @@ -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 - 0-0.9.20100221gitabbffe5c3 -- add dist number to Release. - -* Fri Mar 19 2010 Daiki Ueno - 0-0.8.20100221gitabbffe5c3 -- use the macro "global" instead of "define". - -* Thu Mar 18 2010 Daiki Ueno - 0-0.7.20100221gitabbffe5c3 -- copy files under /usr/share/uzbl/ only once. - -* Tue Mar 16 2010 Daiki Ueno - 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 - 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 - 0-0.4.20100221gitabbffe5c3 -- make sure support scripts are not executable. - -* Sun Mar 7 2010 Daiki Ueno - 0-0.3.20100221gitabbffe5c3 -- use LDFLAGS from x11.pc to follow the F-13 DSO linking change. - -* Sun Mar 7 2010 Daiki Ueno - 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 - 1:0-0.1.20100221gitabbffe5c3 -- initial packaging for fedora.