diff --git a/.gitignore b/.gitignore index ac8a2a6..306d579 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /spectrwm-2.2.0.tgz /spectrwm-2.3.0.tgz +/spectrwm-2.4.0.tgz diff --git a/sources b/sources index 4fbf8e1..d1aba40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7698a5b219fdabad07a76ef45b1360d1 spectrwm-2.3.0.tgz +23e32c1e292f2fc94ed88195ffe60023 spectrwm-2.4.0.tgz diff --git a/spectrwm-2.3.0-2.fc20.src.rpm b/spectrwm-2.3.0-2.fc20.src.rpm deleted file mode 100644 index 30670f9..0000000 Binary files a/spectrwm-2.3.0-2.fc20.src.rpm and /dev/null differ diff --git a/spectrwm-2.3.0-conf-file.patch b/spectrwm-2.3.0-conf-file.patch deleted file mode 100644 index 008d5d4..0000000 --- a/spectrwm-2.3.0-conf-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -uNr spectrwm-2.3.0/linux/Makefile spectrwm-2.3.0.1/linux/Makefile ---- spectrwm-2.3.0/linux/Makefile 2013-07-28 20:40:20.248940654 -0400 -+++ spectrwm-2.3.0.1/linux/Makefile 2013-07-28 21:01:16.626461245 -0400 -@@ -6,6 +6,7 @@ - BINDIR?= $(PREFIX)/bin - LIBDIR?= $(PREFIX)/lib - MANDIR?= $(PREFIX)/share/man -+SYSCONFDIR?= /etc - - CC?= gcc - -@@ -38,6 +39,7 @@ - install: all - install -m 755 -d $(DESTDIR)$(BINDIR) - install -m 755 -d $(DESTDIR)$(LIBDIR) -+ install -m 755 -d $(DESTDIR)$(SYSCONFDIR) - install -m 755 -d $(DESTDIR)$(MANDIR)/man1 - install -m 755 spectrwm $(DESTDIR)$(BINDIR) - install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR) -@@ -46,6 +48,7 @@ - install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 - install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1 - install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1 -+ install -m 644 ../spectrwm.conf $(DESTDIR)$(SYSCONFDIR)/spectrwm.conf - ln -sf $(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm - ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0 - ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so diff --git a/spectrwm-2.3.0-versioned-shared-lib.patch b/spectrwm-2.3.0-versioned-shared-lib.patch deleted file mode 100644 index 7242997..0000000 --- a/spectrwm-2.3.0-versioned-shared-lib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr spectrwm-2.3.0/linux/Makefile spectrwm-2.3.0.1/linux/Makefile ---- spectrwm-2.3.0/linux/Makefile 2013-04-29 15:55:59.000000000 -0400 -+++ spectrwm-2.3.0.1/linux/Makefile 2013-07-28 18:30:15.321080559 -0400 -@@ -10,6 +10,7 @@ - CC?= gcc - - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) -+MVERS= $(shell . ../lib/shlib_version; echo $$major) - - BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) - ifneq ("${BUILDVERSION}", "") -@@ -32,7 +33,7 @@ - $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@ - - libswmhack.so.$(LVERS): swm_hack.so -- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) -+ $(CC) -Wl,-soname,libswmhack.so.$(MVERS) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) - - install: all - install -m 755 -d $(DESTDIR)$(BINDIR) diff --git a/spectrwm-2.4.0-libdir-cflags.patch b/spectrwm-2.4.0-libdir-cflags.patch new file mode 100644 index 0000000..741503a --- /dev/null +++ b/spectrwm-2.4.0-libdir-cflags.patch @@ -0,0 +1,10 @@ +diff -uNr spectrwm-2.4.0/linux/Makefile spectrwm-2.4.0-1/linux/Makefile +--- spectrwm-2.4.0/linux/Makefile 2013-11-15 06:30:52.000000000 -0600 ++++ spectrwm-2.4.0-1/linux/Makefile 2013-11-23 20:51:18.902773331 -0600 +@@ -1,5 +1,5 @@ + CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g +-CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" ++CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" + LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor + + PREFIX?= /usr/local diff --git a/spectrwm.conf b/spectrwm.conf new file mode 100644 index 0000000..27d46cb --- /dev/null +++ b/spectrwm.conf @@ -0,0 +1,110 @@ +# PLEASE READ THE MAN PAGE BEFORE EDITING THIS FILE! +# http://opensource.conformal.com/cgi-bin/man-cgi?spectrwm +# NOTE: all rgb color values in this file are in hex! see XQueryColor for examples + +# workspace_limit = 22 +# focus_mode = default +# focus_close = previous +# focus_close_wrap = 1 +# focus_default = last +# spawn_position = next + +# Window Decoration +# border_width = 1 +# color_focus = red +# color_unfocus = rgb:88/88/88 +# region_padding = 0 +# tile_gap = 0 + +# Region containment +# Distance window must be dragged/resized beyond the region edge before it is +# allowed outside the region. +# boundary_width = 50 + +# Remove window border when bar is disabled and there is only one window in workspace +# disable_border = 1 + +# Bar Settings +# bar_enabled = 1 +# bar_border_width = 1 +# bar_border[1] = rgb:00/80/80 +# bar_border_unfocus[1] = rgb:00/40/40 +# bar_color[1] = black +# bar_font_color[1] = rgb:a0/a0/a0 +# bar_font = -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-* +# bar_action = baraction.sh +# bar_justify = left +# bar_format = +N:+I +S <+D>+4<%a %b %d %R %Z %Y+8<+A+4<+V +# bar_at_bottom = 1 +# stack_enabled = 1 +# clock_enabled = 1 +# clock_format = %a %b %d %R %Z %Y +# iconic_enabled = 0 +# window_class_enabled = 0 +# window_instance_enabled = 0 +# window_name_enabled = 0 +# verbose_layout = 1 +# urgent_enabled = 1 + +# Dialog box size ratio when using TRANSSZ quirk; 0.3 < dialog_ratio <= 1.0 +# dialog_ratio = 0.6 + +# Split a non-RandR dual head setup into one region per monitor +# (non-standard driver-based multihead is not seen by spectrwm) +# region = screen[1]:1280x1024+0+0 +# region = screen[1]:1280x1024+1280+0 + +# Launch applications in a workspace of choice +# autorun = ws[1]:xterm +# autorun = ws[2]:xombrero http://www.openbsd.org + +# Customize workspace layout at start +# layout = ws[1]:4:0:0:0:vertical +# layout = ws[2]:0:0:0:0:horizontal +# layout = ws[3]:0:0:0:0:fullscreen +# layout = ws[4]:4:0:0:0:vertical_flip +# layout = ws[5]:0:0:0:0:horizontal_flip + +# Mod key, (Windows key is Mod4) (Apple key on OSX is Mod2) +# modkey = Mod1 + +# This allows you to include pre-defined key bindings for your keyboard layout. +# keyboard_mapping = ~/.spectrwm_us.conf + +# PROGRAMS + +# Validated default programs: +# program[lock] = xlock +# program[term] = xterm +# program[menu] = dmenu_run $dmenu_bottom -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_border -sf $bar_color + +# To disable validation of the above, free the respective binding(s): +# bind[] = MOD+Shift+Delete # disable lock +# bind[] = MOD+Shift+Enter # disable term +# bind[] = MOD+p # disable menu + +# Optional default programs that will only be validated if you override: +# program[screenshot_all] = screenshot.sh full # optional +# program[screenshot_wind] = screenshot.sh window # optional +# program[initscr] = initscreen.sh # optional + +# EXAMPLE: Define 'firefox' action and bind to key. +# program[firefox] = firefox http://spectrwm.org/ +# bind[firefox] = MOD+Shift+b + +# QUIRKS +# Default quirks, remove with: quirk[class:name] = NONE +# quirk[MPlayer:xv] = FLOAT + FULLSCREEN + FOCUSPREV +# quirk[OpenOffice.org 2.4:VCLSalFrame] = FLOAT +# quirk[OpenOffice.org 3.0:VCLSalFrame] = FLOAT +# quirk[OpenOffice.org 3.1:VCLSalFrame] = FLOAT +# quirk[Firefox-bin:firefox-bin] = TRANSSZ +# quirk[Firefox:Dialog] = FLOAT +# quirk[Gimp:gimp] = FLOAT + ANYWHERE +# quirk[XTerm:xterm] = XTERM_FONTADJ +# quirk[xine:Xine Window] = FLOAT + ANYWHERE +# quirk[Xitk:Xitk Combo] = FLOAT + ANYWHERE +# quirk[xine:xine Panel] = FLOAT + ANYWHERE +# quirk[Xitk:Xine Window] = FLOAT + ANYWHERE +# quirk[xine:xine Video Fullscreen Window] = FULLSCREEN + FLOAT +# quirk[pcb:pcb] = FLOAT diff --git a/spectrwm.spec b/spectrwm.spec index 3fca588..055eb17 100644 --- a/spectrwm.spec +++ b/spectrwm.spec @@ -1,15 +1,14 @@ Name: spectrwm -Version: 2.3.0 -Release: 3%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Minimalist tiling window manager written in C License: ISC # -Wl,-soname for libswmhack.so.0 -Patch0: %{name}-%{version}-versioned-shared-lib.patch -# install config file -Patch1: %{name}-%{version}-conf-file.patch +Patch0: %{name}-%{version}-libdir-cflags.patch URL: https://opensource.conformal.com/wiki/%{name} Source0: https://opensource.conformal.com/snapshots/%{name}/%{name}-%{version}.tgz +Source1: spectrwm.conf BuildRequires: xcb-util-devel BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-wm-devel @@ -40,8 +39,7 @@ Contains development files used by spectrwm. %prep %setup -q -%patch0 -p1 -b %{name}-%{version}-versioned-shared-lib.patch -%patch1 -p1 -b %{name}-%{version}-conf-file.patch +%patch0 -p1 -b %{name}-%{version}-libdir-cflags.patch iconv -f iso8859-1 -t utf-8 %{name}_es.1 > %{name}_es.1.conv iconv -f iso8859-1 -t utf-8 %{name}_pt.1 > %{name}_pt.1.conv @@ -49,10 +47,12 @@ mv -f %{name}_es.1.conv %{name}_es.1 mv -f %{name}_pt.1.conv %{name}_pt.1 %build -make -C linux/ %{?_smp_mflags} PREFIX=/usr LIBDIR=%{_libdir} +make -C linux/ %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} %install -make -C linux/ install PREFIX=/usr LIBDIR=%{_libdir} DESTDIR=%{buildroot} +make -C linux/ install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} +install -d %{buildroot}%{_sysconfdir} +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -71,6 +71,10 @@ make -C linux/ install PREFIX=/usr LIBDIR=%{_libdir} DESTDIR=%{buildroot} %{_libdir}/libswmhack.so %changelog +* Sat Nov 23 2013 Lokesh Mandvekar - 2.4.0-1 +- version bump +- spectrwm.conf added via install step and not via patch + * Sun Aug 04 2013 Fedora Release Engineering - 2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild