January 2014 - notion-devel - Fedora Mailing-Lists

[notion] master: * Tweaked spec. (741f182)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 741f18257c49dd9c6e63dac7e79ddeaa41db92a0 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 12 15:28:51 2014 -0500 * Tweaked spec. >--------------------------------------------------------------- notion.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notion.spec b/notion.spec index 84b4c07..d2b7ec2 100644 --- a/notion.spec +++ b/notion.spec @@ -34,7 +34,7 @@ BuildRequires: texlive-collection-latexextra Requires: xterm Requires: xorg-x11-utils -Requires: xorg-x11-fonts-ISO8559-1-75dpi +Requires: xorg-x11-fonts-ISO8559-1-75dpi %description Notion is a tabbed, tiling window manager for the X windows system. @@ -211,11 +211,11 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %{_mandir}/man1/* %lang(fi) %{_datadir}/%{name}/welcome.fi.txt %lang(cs) %{_datadir}/%{name}/welcome.cs.txt +%dir %{_datadir}/%{name} %{_datadir}/%{name}/ion-completeman %{_datadir}/%{name}/ion-runinxterm %{_datadir}/%{name}/notion-lock %{_datadir}/%{name}/welcome.txt -%dir %{_datadir}/%{name} %{_datadir}/xsessions/%{name}.desktop %files contrib

10 years, 3 months

1
0
0 / 0

[notion] master: * Fixed man patch. * Updated patches and changelog in spec file. (2fa7e13)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 2fa7e13423fbc1bbf9bafedb54f23f7c6572e7d1 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 12 11:18:27 2014 -0500 * Fixed man patch. * Updated patches and changelog in spec file. >--------------------------------------------------------------- notion-3.2014010900.p01-man_utf8.patch | 6 +++--- notion.spec | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/notion-3.2014010900.p01-man_utf8.patch b/notion-3.2014010900.p01-man_utf8.patch index 4d608f5..3163921 100644 --- a/notion-3.2014010900.p01-man_utf8.patch +++ b/notion-3.2014010900.p01-man_utf8.patch @@ -1,11 +1,11 @@ diff -rupN notion-3-2014010900/man/Makefile notion-3-2014010900_patched/man/Makefile --- notion-3-2014010900/man/Makefile 2014-01-09 14:02:16.000000000 -0500 -+++ notion-3-2014010900_patched/man/Makefile 2014-01-11 13:22:42.301524339 -0500 ++++ notion-3-2014010900_patched/man/Makefile 2014-01-12 10:46:14.661966471 -0500 @@ -19,6 +19,7 @@ TARGETS=notion.1 notionflux.1 $(foreach MKMAN=$(LUA) ../build/mkman.lua $(MKMAN_DEFS) MKMAN_DEFS=-D ETCDIR $(REL)$(ETCDIR) -D DOCDIR $(REL)$(DOCDIR) -++ICONV=`which iconv` ++ICONV=`which iconv` ifeq ($(RELOCATABLE),1) REL="/..." @@ -13,7 +13,7 @@ diff -rupN notion-3-2014010900/man/Makefile notion-3-2014010900_patched/man/Make notion.%.1: notion.%.in $(CONFIGS) ../po/%.po $(MKMAN) -po ../po/$*.po -i $< -o $@ $(CONFIGS) -++ $(ICONV) -f LATIN1 -t UTF8 -o $@ $@ ++ $(ICONV) -f LATIN1 -t UTF8 -o $@ $@ notionflux.1: notionflux.in $(CONFIGS) $(MKMAN) -i $< -o $@ $(CONFIGS) diff --git a/notion.spec b/notion.spec index 6aacaba..84b4c07 100644 --- a/notion.spec +++ b/notion.spec @@ -14,8 +14,8 @@ Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop Patch0: %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch -Patch1: %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch -Patch2: %{name}-%{majorver}.%{datever}.p04-man_utf8.patch +Patch1: %{name}-%{majorver}.%{datever}.p01-man_utf8.patch +Patch2: %{name}-%{majorver}.%{datever}.p02-x11_prefix.patch #Patch3: %{name}-%{majorver}.%{datever}.p01-fonts.patch BuildRequires: gettext @@ -121,7 +121,7 @@ tar -xvf %SOURCE1 %patch0 -p1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 #%patch3 -p1 sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ @@ -245,7 +245,7 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %{_includedir}/%{name} %changelog -* Sat Jan 4 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010505-1 +* Sat Jan 12 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-1 - New upstream release. - Fixed issue where contrib files where getting picked up by main package.

10 years, 3 months

1
0
0 / 0

[notion] master: * Updated patches for 3.2014010900. (ed1257a)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit ed1257abb8012d4bf7796b90d875f275feb5301c Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 12 10:38:21 2014 -0500 * Updated patches for 3.2014010900. >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^ed1257abb8012d4bf7796b90d875f275feb5301c~1 ed1257abb8012d4bf7796b90d875f275feb5301c

10 years, 3 months

1
0
0 / 0

[notion] master: * Removed old patches. (54b0584)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 54b0584f3fbb4f340e9715c72f0bf65969d630f8 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sat Jan 11 13:30:50 2014 -0500 * Removed old patches. >--------------------------------------------------------------- notion-3.2014010505.p01-fonts.patch | 422 -------------------------------- notion-3.2014010505.p02-fsf_addr.patch | 69 ------ 2 files changed, 0 insertions(+), 491 deletions(-) diff --git a/notion-3.2014010505.p01-fonts.patch b/notion-3.2014010505.p01-fonts.patch deleted file mode 100644 index b32fb0d..0000000 --- a/notion-3.2014010505.p01-fonts.patch +++ /dev/null @@ -1,422 +0,0 @@ -diff -rupN notion-3-2013030200/contrib/styles/look_alex.lua notion-3-2013030200_patched/contrib/styles/look_alex.lua ---- notion-3-2013030200/contrib/styles/look_alex.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_alex.lua 2013-11-14 05:50:46.039550572 -0500 -@@ -49,7 +49,7 @@ de.defstyle("frame-floatframe", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#00aa00", - highlight_colour = "#00aa00", -diff -rupN notion-3-2013030200/contrib/styles/look_asm.lua notion-3-2013030200_patched/contrib/styles/look_asm.lua ---- notion-3-2013030200/contrib/styles/look_asm.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_asm.lua 2013-11-14 05:56:51.190094833 -0500 -@@ -16,7 +16,7 @@ de.defstyle("*", { - spacing = 0, - -- border_style = "elevated", - border_style = "ridge", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "center", - }) - -@@ -92,7 +92,7 @@ de.defstyle("tab", { - padding_colour= "#304050", - foreground_colour = "#a0a0a0", - }), -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - border_style = "ridge", - padding_pixels = 0, - shadow_pixels = 0, -@@ -122,7 +122,7 @@ de.defstyle("tab-menuentry", { - - de.defstyle("tab-menuentry-big", { - based_on = "tab-menuentry", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - border_style = "inlaid", - shadow_pixels = 0, - highlight_pixels = 0, -diff -rupN notion-3-2013030200/contrib/styles/look_blue.lua notion-3-2013030200_patched/contrib/styles/look_blue.lua ---- notion-3-2013030200/contrib/styles/look_blue.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_blue.lua 2013-11-14 05:50:19.231467396 -0500 -@@ -45,7 +45,7 @@ de.defstyle("frame-tiled", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - - de.substyle("active-selected", { - highlight_colour = "#9999bb", -diff -rupN notion-3-2013030200/contrib/styles/look_cleanpastel.lua notion-3-2013030200_patched/contrib/styles/look_cleanpastel.lua ---- notion-3-2013030200/contrib/styles/look_cleanpastel.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_cleanpastel.lua 2013-11-14 05:55:55.078008109 -0500 -@@ -14,7 +14,7 @@ de.defstyle("*", { - shadow_pixels = 1, - spacing = 0, - border_style = "elevated", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "center", - }) - -@@ -36,7 +36,7 @@ de.defstyle("frame-ionframe", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-bold-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#e0f0e0", - highlight_colour = "#b0c0b6", -@@ -75,7 +75,7 @@ de.defstyle("tab-menuentry", { - - de.defstyle("tab-menuentry-big", { - based_on = "tab-menuentry", -- font = "-*-helvetica-medium-r-normal-*-18-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-17-*-*-*-*-*-*-*", - padding_pixels = 10, - }) - -diff -rupN notion-3-2013030200/contrib/styles/look_cleansteel.lua notion-3-2013030200_patched/contrib/styles/look_cleansteel.lua ---- notion-3-2013030200/contrib/styles/look_cleansteel.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_cleansteel.lua 2013-11-14 05:50:03.511005660 -0500 -@@ -50,7 +50,7 @@ de.defstyle("frame-tiled", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#304050", - highlight_colour = "#708090", -diff -rupN notion-3-2013030200/contrib/styles/look_cleansteel_trans.lua notion-3-2013030200_patched/contrib/styles/look_cleansteel_trans.lua ---- notion-3-2013030200/contrib/styles/look_cleansteel_trans.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_cleansteel_trans.lua 2013-11-14 05:55:03.598763445 -0500 -@@ -16,7 +16,7 @@ de.defstyle("*", { - highlight_pixels = 1, - shadow_pixels = 1, - border_style = "elevated", -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "center", - transparent_background = false, - }) -@@ -55,7 +55,7 @@ de.defstyle("frame-tiled", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#304050", - highlight_colour = "#708090", -diff -rupN notion-3-2013030200/contrib/styles/look_minimalist.lua notion-3-2013030200_patched/contrib/styles/look_minimalist.lua ---- notion-3-2013030200/contrib/styles/look_minimalist.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_minimalist.lua 2013-11-14 05:53:42.695522231 -0500 -@@ -20,7 +20,7 @@ de.defstyle("*", { - highlight_pixels = 1, - shadow_pixels = 1, - border_style = "elevated", -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "center", - }) - -@@ -57,7 +57,7 @@ de.defstyle("frame-floatframe", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - padding_pixels = 0, - highlight_pixels = 0, - shadow_pixels = 0, -@@ -105,7 +105,7 @@ de.defstyle("tab-frame-ionframe", { - - de.defstyle("tab-menuentry", { - based_on = "tab", -- font = "-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-25-*-*-*-*-*-*-*", - text_align = "left", - highlight_pixels = 0, - shadow_pixels = 0, -@@ -120,7 +120,7 @@ de.defstyle("tab-menuentry", { - - de.defstyle("tab-menuentry-big", { - based_on = "tab-menuentry", -- font = "-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-25-*-*-*-*-*-*-*", - padding_pixels = 7, - de.substyle("inactive-unselected", { - shadow_colour = "#dfb700", -@@ -139,7 +139,7 @@ de.defstyle("input", { - padding_pixels = 1, - highlight_pixels = 1, - shadow_pixels = 1, -- font = "-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-25-*-*-*-*-*-*-*", - border_style = "elevated", - de.substyle("*-cursor", { - background_colour = "#000000", -diff -rupN notion-3-2013030200/contrib/styles/look_moy.lua notion-3-2013030200_patched/contrib/styles/look_moy.lua ---- notion-3-2013030200/contrib/styles/look_moy.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_moy.lua 2013-11-14 05:45:03.855794018 -0500 -@@ -61,7 +61,7 @@ de.defstyle("frame-floatframe", { - - de.defstyle("tab", { - based_on = "*", -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#8888aa", - highlight_colour = "#333366", -@@ -147,7 +147,7 @@ de.defstyle("tab-menuentry-big", { - - de.defstyle("input", { - based_on = "*", -- font = "-Adobe-Courier-Medium-R-Normal--12-120-75-75-M-70-ISO8859-1", -+ font = "-Adobe-Courier-Medium-R-Normal--11-*-*-*-M-*-ISO8859-1", - shadow_colour = "#777777", - highlight_colour = "#eeeeee", - background_colour = "#aaaaaa", -diff -rupN notion-3-2013030200/contrib/styles/look_tibi.lua notion-3-2013030200_patched/contrib/styles/look_tibi.lua ---- notion-3-2013030200/contrib/styles/look_tibi.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_tibi.lua 2013-11-14 05:51:54.258221077 -0500 -@@ -106,7 +106,7 @@ de.defstyle("tab", { - foreground_colour = "black", - background_colour = my_neutral_color_dimmed, - text_align = "center", -- font = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-bold-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - background_colour = my_accent_color_normal, - }), -@@ -127,7 +127,7 @@ de.defstyle("input-edln", { - highlight_colour = my_accent_color_dark, - shadow_pixels = 1, - shadow_colour = my_accent_color_dark, -- font ="-*-lucidatypewriter-medium-r-*-*-10-*-*-*-*-*-*-*", -+ font ="-*-lucidatypewriter-medium-r-*-*-11-*-*-*-*-*-*-*", - de.substyle("*-cursor", { - foreground_colour = my_accent_color_bright, - background_colour = "black", -@@ -145,7 +145,7 @@ de.defstyle("stdisp", { - highlight_pixels = 0, - background_colour = my_neutral_color_dark, - foreground_colour = "white", -- font ="-*-lucida-medium-r-*-*-10-*-*-*-*-*-*-*", -+ font ="-*-lucida-medium-r-*-*-11-*-*-*-*-*-*-*", - }) - - de.defstyle("tab-menuentry", { -@@ -155,7 +155,7 @@ de.defstyle("tab-menuentry", { - spacing = 0, - shadow_pixels = 0, - highlight_pixels = 0, -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - foreground_colour = "black", - background_colour = my_accent_color_bright, - de.substyle("inactive-selected", { -@@ -172,7 +172,7 @@ de.defstyle("actnotify", { - shadow_colour = my_accent_color_normal, - background_colour = "red", - foreground_colour = "white", -- font = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-bold-r-normal-*-11-*-*-*-*-*-*-*", - }) - - gr.refresh() -diff -rupN notion-3-2013030200/contrib/styles/look_tiny.lua notion-3-2013030200_patched/contrib/styles/look_tiny.lua ---- notion-3-2013030200/contrib/styles/look_tiny.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_tiny.lua 2013-11-14 05:42:25.552155221 -0500 -@@ -14,7 +14,7 @@ de.defstyle("*", { - highlight_pixels = 0, - shadow_pixels = 0, - border_style = "ridge", -- font = "-*-lucida-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "left", - transparent_background = true, - }) -@@ -58,13 +58,13 @@ de.defstyle("tab", { - - de.defstyle("tab-menuentry", { - based_on = "tabstyle", -- font = "-*-lucida-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "left", - }) - - de.defstyle("tab-menuentry-big", { - based_on = "tab-menuentry", -- font = "-*-lucida-medium-r-normal-*-24-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-25-*-*-*-*-*-*-*", - }) - - de.defstyle("input", { -diff -rupN notion-3-2013030200/contrib/styles/look_tiny_min_tabs.lua notion-3-2013030200_patched/contrib/styles/look_tiny_min_tabs.lua ---- notion-3-2013030200/contrib/styles/look_tiny_min_tabs.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_tiny_min_tabs.lua 2013-11-14 05:51:37.054808217 -0500 -@@ -16,7 +16,7 @@ de.defstyle("*", { - highlight_pixels = 0, - shadow_pixels = 0, - border_style = "ridge", -- font = "-*-lucida-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "left", - transparent_background = true, - }) -@@ -73,13 +73,13 @@ de.defstyle("tab", { - - de.defstyle("tab-menuentry", { - based_on = "tabstyle", -- font = "-*-lucida-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "left", - }) - - de.defstyle("tab-menuentry-big", { - based_on = "tab-menuentry", -- font = "-*-lucida-medium-r-normal-*-24-*-*-*-*-*-*-*", -+ font = "-*-lucida-medium-r-normal-*-25-*-*-*-*-*-*-*", - }) - - de.defstyle("input", { -diff -rupN notion-3-2013030200/contrib/styles/look_whitecode.lua notion-3-2013030200_patched/contrib/styles/look_whitecode.lua ---- notion-3-2013030200/contrib/styles/look_whitecode.lua 2013-03-02 16:03:45.000000000 -0500 -+++ notion-3-2013030200_patched/contrib/styles/look_whitecode.lua 2013-11-14 05:41:36.848803755 -0500 -@@ -14,7 +14,7 @@ de.defstyle("*", { - highlight_pixels = 0, - shadow_pixels = 0, - spacing = 1, -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - text_align = "center", - }) - -diff -rupN notion-3-2013030200/etc/look_brownsteel.lua notion-3-2013030200_patched/etc/look_brownsteel.lua ---- notion-3-2013030200/etc/look_brownsteel.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_brownsteel.lua 2013-11-14 06:01:33.086483004 -0500 -@@ -18,7 +18,7 @@ de.defstyle("*", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#304050", - highlight_colour = "#708090", -diff -rupN notion-3-2013030200/etc/look_cleanios.lua notion-3-2013030200_patched/etc/look_cleanios.lua ---- notion-3-2013030200/etc/look_cleanios.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_cleanios.lua 2013-11-14 05:51:24.088250868 -0500 -@@ -19,7 +19,7 @@ de.defstyle("*", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-bold-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#f0f066", - highlight_colour = "#f0f066", -diff -rupN notion-3-2013030200/etc/look_clean.lua notion-3-2013030200_patched/etc/look_clean.lua ---- notion-3-2013030200/etc/look_clean.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_clean.lua 2013-11-14 06:00:44.870127042 -0500 -@@ -63,7 +63,7 @@ dopath("lookcommon_clean") - - de.defstyle("tab-menuentry-big", { - padding_pixels = 7, -- font = "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*", -+ font = "-misc-fixed-medium-r-*-*-17-*-*-*-*-*-*-*", - }) - - gr.refresh() -diff -rupN notion-3-2013030200/etc/look_cleanviolet.lua notion-3-2013030200_patched/etc/look_cleanviolet.lua ---- notion-3-2013030200/etc/look_cleanviolet.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_cleanviolet.lua 2013-11-14 05:51:18.327447566 -0500 -@@ -30,7 +30,7 @@ de.defstyle("*", { - - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - - de.substyle("active-selected", { - -- Violet tab -diff -rupN notion-3-2013030200/etc/look_dusky.lua notion-3-2013030200_patched/etc/look_dusky.lua ---- notion-3-2013030200/etc/look_dusky.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_dusky.lua 2013-11-14 05:59:29.718689478 -0500 -@@ -18,7 +18,7 @@ de.defstyle("*", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#452727", - highlight_colour = "#866868", -diff -rupN notion-3-2013030200/etc/look_greenlight.lua notion-3-2013030200_patched/etc/look_greenlight.lua ---- notion-3-2013030200/etc/look_greenlight.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_greenlight.lua 2013-11-14 05:51:06.854839371 -0500 -@@ -35,7 +35,7 @@ de.defstyle("frame", { - - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - spacing = 1, - - de.substyle("active-selected", { -diff -rupN notion-3-2013030200/etc/look_greyviolet.lua notion-3-2013030200_patched/etc/look_greyviolet.lua ---- notion-3-2013030200/etc/look_greyviolet.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_greyviolet.lua 2013-11-14 05:59:24.253875810 -0500 -@@ -18,7 +18,7 @@ de.defstyle("*", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#333366", - highlight_colour = "#aaaacc", -diff -rupN notion-3-2013030200/etc/look_ios.lua notion-3-2013030200_patched/etc/look_ios.lua ---- notion-3-2013030200/etc/look_ios.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_ios.lua 2013-11-14 05:50:59.735082584 -0500 -@@ -18,7 +18,7 @@ de.defstyle("*", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*", -+ font = "-*-helvetica-bold-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "#f09000", - highlight_colour = "#f0f066", -diff -rupN notion-3-2013030200/etc/look_newviolet.lua notion-3-2013030200_patched/etc/look_newviolet.lua ---- notion-3-2013030200/etc/look_newviolet.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_newviolet.lua 2013-11-14 05:50:52.711322563 -0500 -@@ -28,7 +28,7 @@ de.defstyle("*", { - - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - - de.substyle("active-selected", { - highlight_colour = "#aaaacc", -diff -rupN notion-3-2013030200/etc/look_simpleblue.lua notion-3-2013030200_patched/etc/look_simpleblue.lua ---- notion-3-2013030200/etc/look_simpleblue.lua 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/etc/look_simpleblue.lua 2013-11-14 05:56:58.301852342 -0500 -@@ -35,7 +35,7 @@ de.defstyle("frame", { - }) - - de.defstyle("tab", { -- font = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*", -+ font = "-*-helvetica-medium-r-normal-*-11-*-*-*-*-*-*-*", - de.substyle("active-selected", { - shadow_colour = "black", - highlight_colour = "black", diff --git a/notion-3.2014010505.p02-fsf_addr.patch b/notion-3.2014010505.p02-fsf_addr.patch deleted file mode 100644 index 053fbe0..0000000 --- a/notion-3.2014010505.p02-fsf_addr.patch +++ /dev/null @@ -1,69 +0,0 @@ -From aa27e3422e62331cd228dbe17e5f15ea830ed8e6 Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Sun, 5 Jan 2014 13:09:45 -0500 -Subject: [PATCH] * Found some additional instances of incorrect FSF addresses. - ---- - contrib/scripts/stock.lua | 2 +- - contrib/scripts/weather.lua | 2 +- - contrib/statusd/statusd_nginfo.lua | 4 ++-- - contrib/statusd/statusd_weather.lua | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/contrib/scripts/stock.lua b/contrib/scripts/stock.lua -index 162a3ff..c44485d 100644 ---- a/contrib/scripts/stock.lua -+++ b/contrib/scripts/stock.lua -@@ -91,7 +91,7 @@ - - -- You should have received a copy of the GNU General Public License - -- along with this program; if not, write to the Free Software ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - - -- Have fun! -diff --git a/contrib/scripts/weather.lua b/contrib/scripts/weather.lua -index 7b37feb..7212294 100644 ---- a/contrib/scripts/weather.lua -+++ b/contrib/scripts/weather.lua -@@ -131,7 +131,7 @@ - - -- You should have received a copy of the GNU General Public License - -- along with this program; if not, write to the Free Software ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - - -- Have fun! -diff --git a/contrib/statusd/statusd_nginfo.lua b/contrib/statusd/statusd_nginfo.lua -index e6af4e0..072904f 100644 ---- a/contrib/statusd/statusd_nginfo.lua -+++ b/contrib/statusd/statusd_nginfo.lua -@@ -21,8 +21,8 @@ - -- - -- You should have received a copy of the GNU Lesser General Public - -- License along with this library; if not, write to the Free Software ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ---- 02111-1307 USA -+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+-- 02110-1301 USA - -- - - -- Nagios checking script -diff --git a/contrib/statusd/statusd_weather.lua b/contrib/statusd/statusd_weather.lua -index 5d5ddd0..08300a2 100644 ---- a/contrib/statusd/statusd_weather.lua -+++ b/contrib/statusd/statusd_weather.lua -@@ -42,7 +42,7 @@ - - -- You should have received a copy of the GNU General Public License - -- along with this program; if not, write to the Free Software ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -- Have a nice weather :) - --- -1.8.1.4 -

10 years, 3 months

1
0
0 / 0

[notion] master: * Updated spec for new release. * Changed names of relevant patches for new release. (631b343)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 631b3430784b2d3fd6a66b658c25770fb38bd664 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sat Jan 11 13:25:59 2014 -0500 * Updated spec for new release. * Changed names of relevant patches for new release. >--------------------------------------------------------------- ... notion-3.2014010900.p00-ChangeLog_update.patch | 0 ...patch => notion-3.2014010900.p01-man_utf8.patch | 0 ...tch => notion-3.2014010900.p02-x11_prefix.patch | 0 notion.spec | 32 ++++++------------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/notion-3.2014010505.p00-ChangeLog_update.patch b/notion-3.2014010900.p00-ChangeLog_update.patch similarity index 100% rename from notion-3.2014010505.p00-ChangeLog_update.patch rename to notion-3.2014010900.p00-ChangeLog_update.patch diff --git a/notion-3.2014010505.p04-man_utf8.patch b/notion-3.2014010900.p01-man_utf8.patch similarity index 100% rename from notion-3.2014010505.p04-man_utf8.patch rename to notion-3.2014010900.p01-man_utf8.patch diff --git a/notion-3.2014010505.p03-x11_prefix.patch b/notion-3.2014010900.p02-x11_prefix.patch similarity index 100% rename from notion-3.2014010505.p03-x11_prefix.patch rename to notion-3.2014010900.p02-x11_prefix.patch diff --git a/notion.spec b/notion.spec index bdeb776..6aacaba 100644 --- a/notion.spec +++ b/notion.spec @@ -1,5 +1,5 @@ %global majorver 3 -%global datever 2014010505 +%global datever 2014010900 Name: notion Version: %{majorver}.%{datever} @@ -14,10 +14,9 @@ Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop Patch0: %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch -#Patch1: %{name}-%{majorver}.%{datever}.p01-fonts.patch -Patch2: %{name}-%{majorver}.%{datever}.p02-fsf_addr.patch -Patch3: %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch -Patch4: %{name}-%{majorver}.%{datever}.p04-man_utf8.patch +Patch1: %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch +Patch2: %{name}-%{majorver}.%{datever}.p04-man_utf8.patch +#Patch3: %{name}-%{majorver}.%{datever}.p01-fonts.patch BuildRequires: gettext BuildRequires: pkgconfig @@ -115,26 +114,15 @@ This package contains the development files necessary for extending and customizing Notion. %prep -rm -rf $RPM_BUILD_DIR -mkdir -p $RPM_BUILD_DIR -%setup -q -n %{name} - -# Hack -mkdir -p $RPM_BUILD_DIR/.pfft -mv $RPM_BUILD_DIR/* $RPM_BUILD_DIR/.pfft -mv $RPM_BUILD_DIR/.pfft $RPM_BUILD_DIR/%{name} -cd $RPM_BUILD_DIR/%{name} -rm $RPM_BUILD_DIR/.gitignore $RPM_BUILD_DIR/.travis.yml +%setup -q -n %{name}-%{majorver}-%{datever} # Decompress doc pkg tar -xvf %SOURCE1 %patch0 -p1 -#%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -#%patch4 -p1 -sed -e 's|^$NROFF=nroff -man$.*$|\1 -Tutf8|' -i man/Makefile +%patch1 -p1 +#%patch2 -p1 +#%patch3 -p1 sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ @@ -142,11 +130,11 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|$CFLAGS *+*= *$$-Os$|\1 $(RPM_OPT_FLAGS) \2|' \ -i system-autodetect.mk +%build # Installing docs to a temporary directory so that we can pick them up with # doc macro later. -mkdir $RPM_BUILD_DIR/%{name}/_docs_staging +mkdir $RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -%build make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging # Note: -doc won't build w/ ?_smp_mflags.

10 years, 3 months

1
0
0 / 0

[notion] master: * Renamed patches for 3.2014010505. * Updated spec for 3.2014010505. * Had to add a hack because the notion tarball doesn't can a subdirectory. * Removed fonts patch and addred requirement for xorg-x11-fonts-ISO8559-1-75dpi. * Still trying to figure out man issue. Still suspect Lua. (a71ea6a)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit a71ea6a167e98002287a3d52e1396fc3ad7701f9 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Thu Jan 9 05:58:07 2014 -0500 * Renamed patches for 3.2014010505. * Updated spec for 3.2014010505. * Had to add a hack because the notion tarball doesn't can a subdirectory. * Removed fonts patch and addred requirement for xorg-x11-fonts-ISO8559-1-75dpi. * Still trying to figure out man issue. Still suspect Lua. >--------------------------------------------------------------- ... notion-3.2014010505.p00-ChangeLog_update.patch | 0 ...ts.patch => notion-3.2014010505.p01-fonts.patch | 0 ...patch => notion-3.2014010505.p02-fsf_addr.patch | 0 ...tch => notion-3.2014010505.p03-x11_prefix.patch | 0 ...patch => notion-3.2014010505.p04-man_utf8.patch | 0 notion.spec | 25 ++++++++++++++----- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/notion-3.2014010402.p00-ChangeLog_update.patch b/notion-3.2014010505.p00-ChangeLog_update.patch similarity index 100% rename from notion-3.2014010402.p00-ChangeLog_update.patch rename to notion-3.2014010505.p00-ChangeLog_update.patch diff --git a/notion-3.2014010402.p01-fonts.patch b/notion-3.2014010505.p01-fonts.patch similarity index 100% rename from notion-3.2014010402.p01-fonts.patch rename to notion-3.2014010505.p01-fonts.patch diff --git a/notion-3.2014010402.p02-fsf_addr.patch b/notion-3.2014010505.p02-fsf_addr.patch similarity index 100% rename from notion-3.2014010402.p02-fsf_addr.patch rename to notion-3.2014010505.p02-fsf_addr.patch diff --git a/notion-3.2014010402.p03-x11_prefix.patch b/notion-3.2014010505.p03-x11_prefix.patch similarity index 100% rename from notion-3.2014010402.p03-x11_prefix.patch rename to notion-3.2014010505.p03-x11_prefix.patch diff --git a/notion-3.2014010402.p04-man_utf8.patch b/notion-3.2014010505.p04-man_utf8.patch similarity index 100% rename from notion-3.2014010402.p04-man_utf8.patch rename to notion-3.2014010505.p04-man_utf8.patch diff --git a/notion.spec b/notion.spec index 7394476..bdeb776 100644 --- a/notion.spec +++ b/notion.spec @@ -1,5 +1,5 @@ %global majorver 3 -%global datever 2014010402 +%global datever 2014010505 Name: notion Version: %{majorver}.%{datever} @@ -9,12 +9,12 @@ Summary: Tabbed, tiling window manager forked from Ion3 License: LGPLv2 with exceptions URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{dat... -# Source https://github.com/jsbackus/notion-doc/archive/3-2014010402.tar.gz +# Source https://github.com/jsbackus/notion-doc/archive/3-2014010505.tar.gz Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datev... Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop Patch0: %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch -Patch1: %{name}-%{majorver}.%{datever}.p01-fonts.patch +#Patch1: %{name}-%{majorver}.%{datever}.p01-fonts.patch Patch2: %{name}-%{majorver}.%{datever}.p02-fsf_addr.patch Patch3: %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch Patch4: %{name}-%{majorver}.%{datever}.p04-man_utf8.patch @@ -35,6 +35,7 @@ BuildRequires: texlive-collection-latexextra Requires: xterm Requires: xorg-x11-utils +Requires: xorg-x11-fonts-ISO8559-1-75dpi %description Notion is a tabbed, tiling window manager for the X windows system. @@ -114,16 +115,26 @@ This package contains the development files necessary for extending and customizing Notion. %prep +rm -rf $RPM_BUILD_DIR +mkdir -p $RPM_BUILD_DIR %setup -q -n %{name} +# Hack +mkdir -p $RPM_BUILD_DIR/.pfft +mv $RPM_BUILD_DIR/* $RPM_BUILD_DIR/.pfft +mv $RPM_BUILD_DIR/.pfft $RPM_BUILD_DIR/%{name} +cd $RPM_BUILD_DIR/%{name} +rm $RPM_BUILD_DIR/.gitignore $RPM_BUILD_DIR/.travis.yml + # Decompress doc pkg tar -xvf %SOURCE1 %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +#%patch4 -p1 +sed -e 's|^$NROFF=nroff -man$.*$|\1 -Tutf8|' -i man/Makefile sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ @@ -133,7 +144,7 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ # Installing docs to a temporary directory so that we can pick them up with # doc macro later. -mkdir _docs_staging +mkdir $RPM_BUILD_DIR/%{name}/_docs_staging %build make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging @@ -246,7 +257,7 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %{_includedir}/%{name} %changelog -* Sat Jan 4 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010402-1 +* Sat Jan 4 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010505-1 - New upstream release. - Fixed issue where contrib files where getting picked up by main package.

10 years, 3 months

1
0
0 / 0

[notion] 3.2014010402, master: * Added back in manpage UTF8 conversion patch. * Converged ChangeLog to UTF8. * More tweaks to spec. (3da9112)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: 3.2014010402,master >--------------------------------------------------------------- commit 3da9112e8302af6647712204946f658c920c0855 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 5 14:48:28 2014 -0500 * Added back in manpage UTF8 conversion patch. * Converged ChangeLog to UTF8. * More tweaks to spec. >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^3da9112e8302af6647712204946f658c920c0855~1 3da9112e8302af6647712204946f658c920c0855

10 years, 4 months

1
0
0 / 0

[notion] 3.2014010402, master: * Goofed the name on the FSF patch. (39b0665)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: 3.2014010402,master >--------------------------------------------------------------- commit 39b0665f53963839485ccacb4963e0766abcbfca Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 5 13:35:30 2014 -0500 * Goofed the name on the FSF patch. >--------------------------------------------------------------- ...patch => notion-3.2014010402.p02-fsf_addr.patch | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/notion-3.2014010402.p01-fsf_addr.patch b/notion-3.2014010402.p02-fsf_addr.patch similarity index 100% rename from notion-3.2014010402.p01-fsf_addr.patch rename to notion-3.2014010402.p02-fsf_addr.patch

10 years, 4 months

1
0
0 / 0

[notion] 3.2014010402, master: * Removed old patches that are no longer applicable. * Added a new patch to address instances of wrong FSF address that I miseed earlier. * Added updated changelog. * Added a patch that changes X11_LIBS and X11_INCLUDE to use pkg-config. * Renamed fonts patch for new version. * Updated spec to build latest release. (a2ed713)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: 3.2014010402,master >--------------------------------------------------------------- commit a2ed7137ab986fe706fee66c715d2157c4e90620 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 5 13:32:40 2014 -0500 * Removed old patches that are no longer applicable. * Added a new patch to address instances of wrong FSF address that I miseed earlier. * Added updated changelog. * Added a patch that changes X11_LIBS and X11_INCLUDE to use pkg-config. * Renamed fonts patch for new version. * Updated spec to build latest release. >--------------------------------------------------------------- notion-3.2013030200.p00-man-utf8.patch | 19 -- notion-3.2013030200.p01-fsf_addr.patch | 46 ----- notion-3.2013030200.p05-fix_orphaned_statusd.patch | 199 ------------------- ... notion-3.2014010402.p00-ChangeLog_update.patch | 201 ++++++++++++++++++-- ...ts.patch => notion-3.2014010402.p01-fonts.patch | 0 notion-3.2014010402.p01-fsf_addr.patch | 69 +++++++ notion-3.2014010402.p03-x11_prefix.patch | 35 ++++ notion-doc-3.2013030200.p02-css_newline.patch | 136 ------------- notion.spec | 53 ++++-- 9 files changed, 323 insertions(+), 435 deletions(-) diff --git a/notion-3.2013030200.p00-man-utf8.patch b/notion-3.2013030200.p00-man-utf8.patch deleted file mode 100644 index 495d04f..0000000 --- a/notion-3.2013030200.p00-man-utf8.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN notion-3-2013030200/man/Makefile notion-3-2013030200_patched/man/Makefile ---- notion-3-2013030200/man/Makefile 2013-03-02 16:02:30.000000000 -0500 -+++ notion-3-2013030200_patched/man/Makefile 2013-11-02 17:36:28.261608243 -0400 -@@ -19,6 +19,7 @@ TARGETS=notion.1 $(foreach tr, $(TRANSLA - - MKMAN=$(LUA) ../build/mkman.lua $(MKMAN_DEFS) - MKMAN_DEFS=-D ETCDIR $(REL)$(ETCDIR) -D DOCDIR $(REL)$(DOCDIR) -+ICONV=`which iconv` - - ifeq ($(RELOCATABLE),1) - REL="/..." -@@ -44,6 +45,7 @@ notion.1: notion.in $(CONFIGS) - - notion.%.1: notion.%.in $(CONFIGS) ../po/%.po - $(MKMAN) -po ../po/$*.po -i $< -o $@ $(CONFIGS) -+ $(ICONV) -f LATIN1 -t UTF8 -o $@ $@ - - welcome%txt: welcome%head notion%1 - (cat welcome$*head; \ diff --git a/notion-3.2013030200.p01-fsf_addr.patch b/notion-3.2013030200.p01-fsf_addr.patch deleted file mode 100644 index 1d61d20..0000000 --- a/notion-3.2013030200.p01-fsf_addr.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -rupN notion-3-2013030200/libtu/rb.c notion-3-2013030200_patched/libtu/rb.c ---- notion-3-2013030200/libtu/rb.c 2013-11-02 18:01:10.234076407 -0400 -+++ notion-3-2013030200_patched/libtu/rb.c 2013-11-02 18:02:17.498783135 -0400 -@@ -15,7 +15,7 @@ Lesser General Public License for more d - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software --Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - */ - /* Revision 1.2. Jim Plank */ - -diff -rupN notion-3-2013030200/libtu/rb.h notion-3-2013030200_patched/libtu/rb.h ---- notion-3-2013030200/libtu/rb.h 2013-11-02 18:01:10.233076442 -0400 -+++ notion-3-2013030200_patched/libtu/rb.h 2013-11-02 18:02:33.026253752 -0400 -@@ -15,7 +15,7 @@ Lesser General Public License for more d - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software --Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - */ - - /* Revision 1.2. Jim Plank */ - -diff -rupN notion-3-2013030200/libextl/LICENSE notion-3-2013030200_patched/libextl/LICENSE ---- notion-3-2013030200/libextl/LICENSE 2013-03-02 16:04:10.000000000 -0500 -+++ notion-3-2013030200_patched/libextl/LICENSE 2013-11-26 12:23:12.165723236 -0500 -@@ -3,7 +3,7 @@ - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -490,7 +490,7 @@ notice is found. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - diff --git a/notion-3.2013030200.p05-fix_orphaned_statusd.patch b/notion-3.2013030200.p05-fix_orphaned_statusd.patch deleted file mode 100644 index 7a1a57b..0000000 --- a/notion-3.2013030200.p05-fix_orphaned_statusd.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 6352415a8131b6751c2ec96f23476de31e2d14b2 Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Sun, 17 Nov 2013 17:37:48 -0500 -Subject: [PATCH 1/5] * Added a _terminate_statusd function to statusd-launch.c - that will attempt to kill the specified process. * Added code to - mod_statusbar.lua that will add a deinit hook and call _terminate_statusd on - the statusd process. - ---- - mod_statusbar/mod_statusbar.lua | 14 ++++++++++++++ - mod_statusbar/statusd-launch.c | 14 +++++++++++++- - 2 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua -index db91e27..a8e6d34 100644 ---- a/mod_statusbar/mod_statusbar.lua -+++ b/mod_statusbar/mod_statusbar.lua -@@ -343,6 +343,20 @@ function mod_statusbar.create(param) - return sb - end - -+--DOC -+-- Function to terminate \file{ion-statusd} on exit or reload. Should -+-- be called from hook \var{deinit}. -+function mod_statusbar.terminate_statusd() -+ if statusd_pid==0 then -+ return -+ end -+ -+ mod_statusbar._terminate_statusd(statusd_pid) -+end -+ -+-- Establish hook -+ioncore.get_hook("ioncoore_deinit_hook"): add(mod_statusbar.terminate_statusd) -+ - -- }}} - - -diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c -index b298f9d..e16fcc0 100644 ---- a/mod_statusbar/statusd-launch.c -+++ b/mod_statusbar/statusd-launch.c -@@ -8,6 +8,7 @@ - - #include <sys/time.h> - #include <sys/types.h> -+#include <signal.h> - #include <unistd.h> - #include <time.h> - #include <errno.h> -@@ -31,7 +32,6 @@ - - #define USEC 1000000 - -- - static bool process_pipe(int fd, ExtlFn fn, - bool *doneseen, bool *eagain) - { -@@ -177,3 +177,15 @@ err: - return -1; - } - -+EXTL_EXPORT -+int mod_statusbar__terminate_statusd(int pid) -+{ -+ if(pid==0) { -+ return -1; -+ } -+ -+ // Send SIGHUP to the specified statusd process to indicate -+ // that we're done. -+ kill( (pid_t)pid, SIGHUP) -+} -+ --- -1.8.1.4 - - -From d452b7d8132d6c20dc379fc92f8d2ee7f3dac49d Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Sun, 17 Nov 2013 17:45:12 -0500 -Subject: [PATCH 2/5] * Fixed a typo. It now compiles. - ---- - mod_statusbar/statusd-launch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c -index e16fcc0..3af9c77 100644 ---- a/mod_statusbar/statusd-launch.c -+++ b/mod_statusbar/statusd-launch.c -@@ -186,6 +186,6 @@ int mod_statusbar__terminate_statusd(int pid) - - // Send SIGHUP to the specified statusd process to indicate - // that we're done. -- kill( (pid_t)pid, SIGHUP) -+ kill( (pid_t)pid, SIGHUP); - } - --- -1.8.1.4 - - -From 425edadc2da784d4e4d20f068abd48bf24adb9ed Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Tue, 19 Nov 2013 05:38:42 -0500 -Subject: [PATCH 3/5] * Fixed a typo w/ hook. Now properly terminates - ion-statusd on exit. - ---- - mod_statusbar/mod_statusbar.lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua -index a8e6d34..59669c8 100644 ---- a/mod_statusbar/mod_statusbar.lua -+++ b/mod_statusbar/mod_statusbar.lua -@@ -355,7 +355,7 @@ function mod_statusbar.terminate_statusd() - end - - -- Establish hook --ioncore.get_hook("ioncoore_deinit_hook"): add(mod_statusbar.terminate_statusd) -+ioncore.get_hook("ioncore_deinit_hook"):add(mod_statusbar.terminate_statusd) - - -- }}} - --- -1.8.1.4 - - -From 6796948299c3e2f125279abee8cdd056c16fa746 Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Tue, 19 Nov 2013 06:41:16 -0500 -Subject: [PATCH 4/5] * Forgot to clear out the old statusd pid after - terminating it. - ---- - mod_statusbar/mod_statusbar.lua | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua -index 59669c8..82e6baf 100644 ---- a/mod_statusbar/mod_statusbar.lua -+++ b/mod_statusbar/mod_statusbar.lua -@@ -352,6 +352,8 @@ function mod_statusbar.terminate_statusd() - end - - mod_statusbar._terminate_statusd(statusd_pid) -+ -+ statusd_pid=0 - end - - -- Establish hook --- -1.8.1.4 - - -From 87402b78203f6877d7dd70a698ddb626e1b27b59 Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Wed, 20 Nov 2013 05:38:07 -0500 -Subject: [PATCH 5/5] * Documented reason / bug at head of - _terminate_statusd(). * Added a return 0 to the end of _terminate_statusd(). - ---- - mod_statusbar/statusd-launch.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c -index 3af9c77..c597738 100644 ---- a/mod_statusbar/statusd-launch.c -+++ b/mod_statusbar/statusd-launch.c -@@ -177,6 +177,16 @@ err: - return -1; - } - -+/* It looks like child processes generated via fork() on Linux do not -+ * get a signal when the parent process dies. Specifically, the -+ * PR_SET_PDEATHSIG is cleared, therefore the ion-statusd process must -+ * be explicitly terminated on deinit. This function should be called -+ * from Lua on deinit with the ion-statusd process id generated above. -+ * -+ * For more information, refer to the following man pages: -+ * - fork(2) -+ * - prctl(2), specifically section on PR_SET_PDEATHSIG -+ */ - EXTL_EXPORT - int mod_statusbar__terminate_statusd(int pid) - { -@@ -187,5 +197,7 @@ int mod_statusbar__terminate_statusd(int pid) - // Send SIGHUP to the specified statusd process to indicate - // that we're done. - kill( (pid_t)pid, SIGHUP); -+ -+ return 0; - } - --- -1.8.1.4 - diff --git a/notion-3.2013030200.p03-ChangeLog_update.patch b/notion-3.2014010402.p00-ChangeLog_update.patch similarity index 99% rename from notion-3.2013030200.p03-ChangeLog_update.patch rename to notion-3.2014010402.p00-ChangeLog_update.patch index 3efcb2d..27b33d9 100644 --- a/notion-3.2013030200.p03-ChangeLog_update.patch +++ b/notion-3.2014010402.p00-ChangeLog_update.patch @@ -1,10 +1,181 @@ -diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog ---- notion-3-2013030200/ChangeLog 2013-11-03 11:54:15.058549338 -0500 -+++ notion-3-2013030200_patched/ChangeLog 2013-11-03 11:54:20.310370467 -0500 -@@ -1 +1,19164 @@ +diff -rupN notion/ChangeLog notion-patched/ChangeLog +--- notion/ChangeLog 2010-12-16 10:57:50.000000000 -0500 ++++ notion-patched/ChangeLog 2014-01-05 12:32:11.788249887 -0500 +@@ -1 +1,19335 @@ -(The ChangeLog will be generated by release scripts from svn logs) ++2014-01-05 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Add manpage for notionflux ++ ++2014-01-04 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Simple lua repl for testing ++ ++ Better error message ++ ++ Include mod_xkbevents instead of using a submodule ++ ++ Include mod_xrandr instead of using submodules ++ ++ Include mod_xinerama instead of using submodules ++ ++ Include notionflux in the main repo instead of its own submodule ++ ++ Make 'contrib' a normal folder rather than a git submodule ++ ++2013-12-16 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ More specifically name WGroup's ++ ++ Newer versions of libextl and libtu ++ ++2013-12-05 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Use UTF-8 instead of LATIN1 for manpages and welcome heading ++ ++ Use explicit window names for WFrames ++ ++2013-12-01 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ More specific names for diffent kinds of Frame's ++ ++ Prevent overflow while calculating frame size hints ++ Fixes #67 ++ ++2013-11-26 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Better explain the need for explicitly closing statusd on deinit ++ ++2013-11-26 Jeff Backus <jeff.backus(a)gmail.com> ++ ++ * Documented reason / bug at head of _terminate_statusd(). * Added a return 0 to the end of _terminate_statusd(). ++ ++ * Forgot to clear out the old statusd pid after terminating it. ++ ++ * Fixed a typo w/ hook. Now properly terminates ion-statusd on exit. ++ ++ * Fixed a typo. It now compiles. ++ ++ * Added a _terminate_statusd function to statusd-launch.c that will attempt to kill the specified process. * Added code to mod_statusbar.lua that will add a deinit hook and call _terminate_statusd on the statusd process. ++ ++2013-11-26 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Add comments to fork() logic for readibility ++ ++2013-11-25 Etan Reisner <deryni(a)unreliablesource.net> ++ ++ LUA_INCLUDES can legitimately be empty (e.g. on gentoo). ++ The rest of this file is a bit debian-specific (and friends) also but this is ++ the only part that seems to get in the way at the moment. The 5.0 fallback ++ makes the rest work out. ++ ++2013-11-03 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ build efficiency improvement thanks to Dima Kogan ++ ++ Update contrib ++ ++2013-11-02 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ use $(CC) rather than 'gcc' ++ https://sourceforge.net/p/notion/bugs/62/ ++ ++ Removed old stuff from system-inc.mk ++ Thanks to Olof Johansson for noticing ++ ++2013-09-16 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Fix segfault when logging not finding a font ++ ++2013-09-10 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Improved lua version detection (thanks Nikolay Orlyuk and Justin Lebar!) ++ https://sourceforge.net/p/notion/bugs/64/ ++ ++ Slightly better logging for font loading ++ ++2013-08-05 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Compile warning ++ ++ Be more forgiving when XCreateFontSet creates a fontset with missing charsets ++ Especially utf-8 locales list unreasonable amounts of charsets as requirements. ++ When a font can be found that satisfies some, but not all of them, we just use ++ the font and write a warning into the logging. A user who really cares about ++ all those charsets can fix his configuration himself. ++ ++2013-07-28 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ In use_mb mode, use a more reasonable default/fallback font. ++ 'fixed' does not exist for the multibyte font searching methods, and it does ++ not make sense to have this be a compile-time option. ++ ++2013-07-22 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Correct error message when no fontset was found ++ ++2013-07-21 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Add target to quickly compile a snapshot version ++ ++ Only build the 'travis' github branch on Travis ++ ++ Also make C99_SOURCE overridable ++ ++2013-07-21 Olof Johansson <olof(a)ethup.se> ++ ++ build: Use more overrideable system-autodetect.mk ++ With these changes, some commonly overrided values can be exported ++ from the environment to influence the build output (e.g. PREFIX, CFLAGS, ++ INSTALL, etc). You can also specify the lua version you'd like to use ++ with the following variable: "LUA_VERSION" (if not specified, it tries ++ to detect the highest lua version available (as seen by pkg-config)). ++ ++2013-07-21 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Also log date and time ++ ++ Also log the loglevel ++ ++ Build with C99 by default (but older C is still supported) ++ ++ More debug-logging for loading fontsets ++ ++ Log startup ++ ++ Also log the function name ++ ++ Support building with -std=c99 ++ ++ More flexible logging subsystem ++ For now we'll let this live alongside the existing libtu 'warn' infrastructure ++ ++2013-05-23 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ Rename 'goto_' to 'goto_focus', keep backwards compatibility ++ restore backwards compatibility for display(), too ++ ++2013-05-10 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ document a field ++ ++ New mod_xrandr fixes a bug with rearranging workspaces when disconnecting a monitor ++ ++ Fix unittests for mod_xinerama and mod_xrandr, have them run on 'make test' ++ ++2013-04-05 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ New versions of mod_xinerama and mod_xrandr ++ (to rearrange workspaces before closing superfluous screens) ++ ++2013-03-03 Arnout Engelen <arnouten(a)bzzt.net> ++ ++ new mod_xrandr ++ +2013-03-02 Arnout Engelen <arnouten(a)bzzt.net> + ++ Introduce 'make dist' as a './predist.sh' replacement ++ + Much simpler release procedure due to recent improvements in project setup + +2013-02-03 Philipp Hartwig <ph(a)phhart.de> @@ -1109,7 +1280,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + + Error message was later removed in the otherwise unrelated patch http://notion.git.sourceforge.net/git/gitweb.cgi?p=notion/notion;a=blobdi... + -+2011-04-12 TomÃÂ¡ÃÂ¡ Ebenlendr <ebik(a)ucw.cz> ++2011-04-12 TomÃ¡Å¡ Ebenlendr <ebik(a)ucw.cz> + + Autodetect libtu and libextl in subdirectories. + If libtu or libextl is in subdirectory, then automatically set up paths @@ -1196,7 +1367,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + + Specify make dependencies to allow for parallel building + -+2011-02-06 TomÃÂ¡ÃÂ¡ Ebenlendr <ebik(a)ucw.cz> ++2011-02-06 TomÃ¡Å¡ Ebenlendr <ebik(a)ucw.cz> + + Proportional and elastic tab width algorithms. + Proportional and elastic algorithms for calculating widths of tabs. @@ -1210,7 +1381,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + Add framework to allow more named algorithms. Allow switching such + algorithms using style. + -+2011-02-03 TomÃÂ¡ÃÂ¡ Ebenlendr <ebik(a)ucw.cz> ++2011-02-03 TomÃ¡Å¡ Ebenlendr <ebik(a)ucw.cz> + + More readable tab width calculation code. + Only code cosmetics. @@ -1223,7 +1394,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + + Merge branch 'master' of http://drak.ucw.cz/~ebik/git/notion + -+2011-01-27 TomÃÂ¡ÃÂ¡ Ebenlendr <ebik(a)ucw.cz> ++2011-01-27 TomÃ¡Å¡ Ebenlendr <ebik(a)ucw.cz> + + Add default style. + @@ -1237,7 +1408,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + contains my (ebik(a)ucw.cz) patch to elastic/proportional tab sizes, + which was proof of concept and was not intended to get into mainline. + -+2011-01-27 TomÃÂ¡ÃÂ¡ Ebenlendr <ebik(a)ucw.cz> ++2011-01-27 TomÃ¡Å¡ Ebenlendr <ebik(a)ucw.cz> + + Reverting commit 8cabc655, to revert 951f7acb + Reverting commit 8cabc655 (fix of miscalculations of tab sizes) to be @@ -1340,7 +1511,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + + Merge some changes found in http://github.com/gwash/ion-3plus + -+2009-12-06 Ole JÃÂžrgen BrÃÂžnner <olejorgenb(a)yahoo.no> ++2009-12-06 Ole JÃžrgen BrÃžnner <olejorgenb(a)yahoo.no> + + Fixed issue with size policy of scratchpad not being saved + Ignore-this: 11c7ddba2d747e870ff72cdd84ab04cc @@ -2073,7 +2244,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + Minor clarification + darcs-hash:20071123175048-4eba8-da791ea254534b4cc8fd3de2dccf428fccd386d8.gz + -+ Try to prevent EnterWindow event triggered focus change when switchtoÃºlse. ++ Try to prevent EnterWindow event triggered focus change when switchtoúlse. + darcs-hash:20071123173956-4eba8-bd0162874b70976db12d182f241ebd774a225797.gz + +2007-11-22 Tuomo Valkonen <tuomov(a)iki.fi> @@ -5014,7 +5185,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + Moved commented-out transpose_words as Control+K T. + darcs-hash:20060825020635-4eba8-96e87886d11e9257e80a96dc0888feb483ee6f2a.gz + -+2006-08-24 Tibor CsÃÂ¶gÃÂ¶r <tibi(a)tiborius.net> ++2006-08-24 Tibor CsÃ¶gÃ¶r <tibi(a)tiborius.net> + + Added transpose_chars and transpose_words to mod_query. + darcs-hash:20060824205251-265e0-cb46397ca8a3052de824b9986ff1419f6cd8ef3c.gz @@ -5110,7 +5281,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + Changes in WMPlex structure. + - l1/l2 lists are gone, and instead there just a single list of all + managed regions using WStacking nodes, and another list of the -+ Ã¢ÂÂlayer 1Ã¢ÂÂ or Ã¢ÂÂmutually exclusiveÃ¢ÂÂ regions. ++ âlayer 1â or âmutually exclusiveâ regions. + + darcs-hash:20060807162916-4eba8-f18752e69cf3e32680c6058fbd266093540f1e99.gz + @@ -5549,7 +5720,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog + More Lua 5.1 stuff: use # instead of table.getn. + darcs-hash:20060519163437-4eba8-1d1f740a9a9813280c631b500036cca89cbb88b7.gz + -+2006-05-19 RenÃÂ© van Bevern <rvb(a)debian.org> ++2006-05-19 RenÃ© van Bevern <rvb(a)debian.org> + + take ioncore_bindings.lua of ion3 to lua 5.1 + darcs-hash:20060519071255-f015f-e36f2493d27dca1c2a795a672fb8d42162592d88.gz @@ -17168,7 +17339,7 @@ diff -rupN notion-3-2013030200/ChangeLog notion-3-2013030200_patched/ChangeLog +2003-04-12 tuomov <arnouten(a)bzzt.net> + + trunk: changeset 438 -+ Added the flag -stdÃ9 to options to compile luaextl.c as it needs ++ Added the flag -stdÉ9 to options to compile luaextl.c as it needs + va_copy from C99 and some versions of GCC seem to disable this macro + otherwise. + diff --git a/notion-3.2013030200.p04-fonts.patch b/notion-3.2014010402.p01-fonts.patch similarity index 100% rename from notion-3.2013030200.p04-fonts.patch rename to notion-3.2014010402.p01-fonts.patch diff --git a/notion-3.2014010402.p01-fsf_addr.patch b/notion-3.2014010402.p01-fsf_addr.patch new file mode 100644 index 0000000..053fbe0 --- /dev/null +++ b/notion-3.2014010402.p01-fsf_addr.patch @@ -0,0 +1,69 @@ +From aa27e3422e62331cd228dbe17e5f15ea830ed8e6 Mon Sep 17 00:00:00 2001 +From: Jeff Backus <jeff.backus(a)gmail.com> +Date: Sun, 5 Jan 2014 13:09:45 -0500 +Subject: [PATCH] * Found some additional instances of incorrect FSF addresses. + +--- + contrib/scripts/stock.lua | 2 +- + contrib/scripts/weather.lua | 2 +- + contrib/statusd/statusd_nginfo.lua | 4 ++-- + contrib/statusd/statusd_weather.lua | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/contrib/scripts/stock.lua b/contrib/scripts/stock.lua +index 162a3ff..c44485d 100644 +--- a/contrib/scripts/stock.lua ++++ b/contrib/scripts/stock.lua +@@ -91,7 +91,7 @@ + + -- You should have received a copy of the GNU General Public License + -- along with this program; if not, write to the Free Software +--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + -- Have fun! +diff --git a/contrib/scripts/weather.lua b/contrib/scripts/weather.lua +index 7b37feb..7212294 100644 +--- a/contrib/scripts/weather.lua ++++ b/contrib/scripts/weather.lua +@@ -131,7 +131,7 @@ + + -- You should have received a copy of the GNU General Public License + -- along with this program; if not, write to the Free Software +--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + -- Have fun! +diff --git a/contrib/statusd/statusd_nginfo.lua b/contrib/statusd/statusd_nginfo.lua +index e6af4e0..072904f 100644 +--- a/contrib/statusd/statusd_nginfo.lua ++++ b/contrib/statusd/statusd_nginfo.lua +@@ -21,8 +21,8 @@ + -- + -- You should have received a copy of the GNU Lesser General Public + -- License along with this library; if not, write to the Free Software +--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +--- 02111-1307 USA ++-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++-- 02110-1301 USA + -- + + -- Nagios checking script +diff --git a/contrib/statusd/statusd_weather.lua b/contrib/statusd/statusd_weather.lua +index 5d5ddd0..08300a2 100644 +--- a/contrib/statusd/statusd_weather.lua ++++ b/contrib/statusd/statusd_weather.lua +@@ -42,7 +42,7 @@ + + -- You should have received a copy of the GNU General Public License + -- along with this program; if not, write to the Free Software +--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + -- Have a nice weather :) + +-- +1.8.1.4 + diff --git a/notion-3.2014010402.p03-x11_prefix.patch b/notion-3.2014010402.p03-x11_prefix.patch new file mode 100644 index 0000000..2ce5d4b --- /dev/null +++ b/notion-3.2014010402.p03-x11_prefix.patch @@ -0,0 +1,35 @@ +From f7d05f65a1602d7da52495de0934d0d04494ea14 Mon Sep 17 00:00:00 2001 +From: Jeff Backus <jeff.backus(a)gmail.com> +Date: Sun, 5 Jan 2014 13:19:29 -0500 +Subject: [PATCH] * Modified X11_LIBS and X11_INCLUDES statements to use + pkg-config. + +--- + system-autodetect.mk | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/system-autodetect.mk b/system-autodetect.mk +index d61c447..69b21d0 100644 +--- a/system-autodetect.mk ++++ b/system-autodetect.mk +@@ -77,12 +77,14 @@ include $(TOPDIR)/build/lua-detect.mk + ## + + # Paths +-X11_PREFIX ?= /usr/X11R6 ++#X11_PREFIX ?= /usr/X11R6 + # SunOS/Solaris + #X11_PREFIX ?= /usr/openwin + +-X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext +-X11_INCLUDES=-I$(X11_PREFIX)/include ++#X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext ++#X11_INCLUDES=-I$(X11_PREFIX)/include ++X11_LIBS := $(or $(shell pkg-config --libs x11 xext), $(error "pkg-config couldn't find X11 libraries")) ++X11_INCLUDES := $(shell pkg-config --cflags x11 xext) + + # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault. + # The following setting should work around that situation. +-- +1.8.1.4 + diff --git a/notion-doc-3.2013030200.p02-css_newline.patch b/notion-doc-3.2013030200.p02-css_newline.patch deleted file mode 100644 index 969b32e..0000000 --- a/notion-doc-3.2013030200.p02-css_newline.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -rupN notion-3-2013030200/notion-doc/notion.css notion-3-2013030200_patched/notion-doc/notion.css ---- notion-3-2013030200/notion-doc/notion.css 2013-11-03 11:46:36.481168728 -0500 -+++ notion-3-2013030200_patched/notion-doc/notion.css 2013-11-03 11:47:03.618244380 -0500 -@@ -1,66 +1,66 @@ --* { margin: 0px; padding: 0px; } --html { min-height: 100%; } -- --body { margin-left: 20%; margin-right: 20%; text-align: left; font-family: arial, verdana, sans-serif; font-size: 12px; color: #333; background:white url(../images/bg_page.gif) no-repeat 50% 0; line-height:18px; } --p, h1, h2, h3, ol, ul, dl { padding:2px 6px 8px; } --ol,dl --h1, h2, h3, ol, dl { padding:8px 6px 3px; } --table, th, td { font-family: arial, verdana, sans-serif; font-size: 12px; color: #333; } --ol, ul, dir, menu, dd { margin-left: 40px } --ol { list-style-type: decimal } --ol ul, ul ol, ul ul, ol ol { margin-top: 0; margin-bottom: 0 } --blockquote { width:80%; margin:10px auto; padding:0 26px; background:#FFF url(../images/bg_blockquote_side.gif) no-repeat 0 50%; } --#skip { display: none; } --a img, :link img, :visited img { border: none; } --img { display: block; } --a:link { color: #C74848; text-decoration: underline; } --a:visited { color: #333; text-decoration: underline; } --a:hover, a:active { color: #DB7C7C; } -- --.alignright { text-align: right !important; } --.floatright { float: right; } --.inline { display: inline; } -- --.clear { clear: both;} -- --.clearfix:after { content:"."; display:block; height:0; clear:both; visibility:hidden; } --.clearfix { display:inline-block; } --/*\*/ .clearfix { display:block; } /**/ -- --h1 { font-size: 20px; line-height: 18px; } --h2 { font-size:18px; } --h3 { font-size: 16px; color: #666; } -- --#wrapper { width:760px; margin:0 auto; } --#header { line-height: 10em; position:relative; display:block; width:760px; height:102px; background:#FFF url(../images/bg_header.gif) repeat-x; } --#header .logo { position:absolute; left:40px; top:0px; } --#header a { -- color: white; -- font-size: 42px; -- font-family: arial, sans-serif; -- text-decoration: none; --} -- --#nav { display:block; width:760px; height:26px; margin:0; padding:0; list-style:none; text-align:center; background:#A13D3D url(../images/bg_nav.gif) repeat-x; } --#nav li { float:left; width:150px; } --#nav li a { text-decoration:none; display:block; padding:0; padding:0; height:1%; line-height:26px; color:#FFF; } --#nav li.on { display:block; padding:0; width:120px; height:26px; line-height:26px; background:url(../images/bg_nav_on_2.gif) no-repeat 50% 0; color:#EFEFEF; } --#nav li a:hover { background:url(../images/bg_nav_on.gif) no-repeat 50% 0; } -- --#content { width:740px; padding:50px 10px 0; min-height:543px; background:#FFF url(../images/bg_content.gif) no-repeat 0 0; text-align:left; } --* html #content, * html #content #col_1 { height:543px; } -- --#content #col_1 { width:20%; float:left; min-height:543px; background:url(../images/bg_left.gif) no-repeat 100% 50%; } --#content #col_1 h2 { color:#999999; font-size:14px; font-weight:normal; } --#subnav, #subnav ul { margin:0; padding:0; list-style:none; } --#subnav li { } --#subnav li a { display:block; padding:5px 10px 5px 10px; height:1%; background:url(../images/bg_subnav.gif) no-repeat 100% 100%; text-decoration:none } --#subnav li a:hover { background:#E9D1D1 url(../images/bg_left_nav_on.gif) no-repeat 100% 0; text-decoration:none; } --#content #col_2 { width:80%; float:left; } -- --#footer { display:block; width:680px; padding: 10px 40px; margin:0 auto; background:#EEE9E8; -moz-border-radius:6px; } --#footer small { } -- --.t_form { margin:20px; } --.t_form th { background:#efefef; } --.t_form td, .t_form th { padding:5px; border-bottom:1px solid #666; } -+* { margin: 0px; padding: 0px; } -+html { min-height: 100%; } -+ -+body { margin-left: 20%; margin-right: 20%; text-align: left; font-family: arial, verdana, sans-serif; font-size: 12px; color: #333; background:white url(../images/bg_page.gif) no-repeat 50% 0; line-height:18px; } -+p, h1, h2, h3, ol, ul, dl { padding:2px 6px 8px; } -+ol,dl -+h1, h2, h3, ol, dl { padding:8px 6px 3px; } -+table, th, td { font-family: arial, verdana, sans-serif; font-size: 12px; color: #333; } -+ol, ul, dir, menu, dd { margin-left: 40px } -+ol { list-style-type: decimal } -+ol ul, ul ol, ul ul, ol ol { margin-top: 0; margin-bottom: 0 } -+blockquote { width:80%; margin:10px auto; padding:0 26px; background:#FFF url(../images/bg_blockquote_side.gif) no-repeat 0 50%; } -+#skip { display: none; } -+a img, :link img, :visited img { border: none; } -+img { display: block; } -+a:link { color: #C74848; text-decoration: underline; } -+a:visited { color: #333; text-decoration: underline; } -+a:hover, a:active { color: #DB7C7C; } -+ -+.alignright { text-align: right !important; } -+.floatright { float: right; } -+.inline { display: inline; } -+ -+.clear { clear: both;} -+ -+.clearfix:after { content:"."; display:block; height:0; clear:both; visibility:hidden; } -+.clearfix { display:inline-block; } -+/*\*/ .clearfix { display:block; } /**/ -+ -+h1 { font-size: 20px; line-height: 18px; } -+h2 { font-size:18px; } -+h3 { font-size: 16px; color: #666; } -+ -+#wrapper { width:760px; margin:0 auto; } -+#header { line-height: 10em; position:relative; display:block; width:760px; height:102px; background:#FFF url(../images/bg_header.gif) repeat-x; } -+#header .logo { position:absolute; left:40px; top:0px; } -+#header a { -+ color: white; -+ font-size: 42px; -+ font-family: arial, sans-serif; -+ text-decoration: none; -+} -+ -+#nav { display:block; width:760px; height:26px; margin:0; padding:0; list-style:none; text-align:center; background:#A13D3D url(../images/bg_nav.gif) repeat-x; } -+#nav li { float:left; width:150px; } -+#nav li a { text-decoration:none; display:block; padding:0; padding:0; height:1%; line-height:26px; color:#FFF; } -+#nav li.on { display:block; padding:0; width:120px; height:26px; line-height:26px; background:url(../images/bg_nav_on_2.gif) no-repeat 50% 0; color:#EFEFEF; } -+#nav li a:hover { background:url(../images/bg_nav_on.gif) no-repeat 50% 0; } -+ -+#content { width:740px; padding:50px 10px 0; min-height:543px; background:#FFF url(../images/bg_content.gif) no-repeat 0 0; text-align:left; } -+* html #content, * html #content #col_1 { height:543px; } -+ -+#content #col_1 { width:20%; float:left; min-height:543px; background:url(../images/bg_left.gif) no-repeat 100% 50%; } -+#content #col_1 h2 { color:#999999; font-size:14px; font-weight:normal; } -+#subnav, #subnav ul { margin:0; padding:0; list-style:none; } -+#subnav li { } -+#subnav li a { display:block; padding:5px 10px 5px 10px; height:1%; background:url(../images/bg_subnav.gif) no-repeat 100% 100%; text-decoration:none } -+#subnav li a:hover { background:#E9D1D1 url(../images/bg_left_nav_on.gif) no-repeat 100% 0; text-decoration:none; } -+#content #col_2 { width:80%; float:left; } -+ -+#footer { display:block; width:680px; padding: 10px 40px; margin:0 auto; background:#EEE9E8; -moz-border-radius:6px; } -+#footer small { } -+ -+.t_form { margin:20px; } -+.t_form th { background:#efefef; } -+.t_form td, .t_form th { padding:5px; border-bottom:1px solid #666; } diff --git a/notion.spec b/notion.spec index 788550d..3af55d8 100644 --- a/notion.spec +++ b/notion.spec @@ -1,29 +1,36 @@ %global majorver 3 -%global datever 2013030200 +%global datever 2014010402 Name: notion Version: %{majorver}.%{datever} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Tabbed, tiling window manager forked from Ion3 License: LGPLv2 with exceptions URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{dat... -Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datev... +# Source https://github.com/jsbackus/notion-doc/archive/3-2014010402.tar.gz +Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datev... Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop # Patch submitted to upstream via e-mail on 11/3/2013 -Patch0: %{name}-%{majorver}.%{datever}.p00-man-utf8.patch +#Patch0: %{name}-%{majorver}.%{datever}.p00-man-utf8.patch # Patch submitted to upstream via e-mail on 11/3/2013 -Patch1: %{name}-%{majorver}.%{datever}.p01-fsf_addr.patch +#Patch1: %{name}-%{majorver}.%{datever}.p01-fsf_addr.patch # Patch submitted to upstream via e-mail on 11/3/2013 -Patch2: %{name}-doc-%{majorver}.%{datever}.p02-css_newline.patch +#Patch2: %{name}-doc-%{majorver}.%{datever}.p02-css_newline.patch # Patch submitted to upstream via e-mail on 11/3/2013 -Patch3: %{name}-%{majorver}.%{datever}.p03-ChangeLog_update.patch +#Patch3: %{name}-%{majorver}.%{datever}.p03-ChangeLog_update.patch # Patch submitted to upstream via e-mail on 11/16/2013 -Patch4: %{name}-%{majorver}.%{datever}.p04-fonts.patch +#Patch4: %{name}-%{majorver}.%{datever}.p04-fonts.patch # Patch submitted to upstream via e-mail on 11/26/2013 -Patch5: %{name}-%{majorver}.%{datever}.p05-fix_orphaned_statusd.patch +#Patch5: %{name}-%{majorver}.%{datever}.p05-fix_orphaned_statusd.patch + +Patch0: %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch +Patch1: %{name}-%{majorver}.%{datever}.p01-fonts.patch +Patch2: %{name}-%{majorver}.%{datever}.p02-fsf_addr.patch +Patch3: %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch + BuildRequires: gettext BuildRequires: pkgconfig @@ -120,7 +127,8 @@ This package contains the development files necessary for extending and customizing Notion. %prep -%setup -q -n %{name}-%{majorver}-%{datever} +#%setup -q -n %{name}-%{majorver}-%{datever} +%setup -q -n %{name} # Decompress doc pkg tar -xvf %SOURCE1 @@ -129,18 +137,19 @@ tar -xvf %SOURCE1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 - -sed -e 's|^$PREFIX=$.*$|\1%{_prefix}|' \ - -e 's|^$ETCDIR=$.*$|\1%{_sysconfdir}/%{name}|' \ - -e 's|^$LUA_DIR=$.*$|\1%{_prefix}|' \ - -e 's|^$X11_PREFIX=$.*$|\1%{_prefix}|' \ - -e 's|^$X11_LIBS=$.*$|\1`pkg-config --libs x11 xext`|' \ +#%patch4 -p1 +#%patch5 -p1 + +sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ + -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ -e 's|^$LIBDIR=$.*$|\1%{_libdir}|' \ -e 's|$CFLAGS *+*= *$$-Os$|\1 $(RPM_OPT_FLAGS) \2|' \ -i system-autodetect.mk +# -e 's|^$X11_PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ +# -e 's|^$X11_LIBS=$.*$|\1`pkg-config --libs x11 xext`|' \ +# -e 's|^$LUA_DIR=$.*$|\1%{_prefix}|' \ + # Installing docs to a temporary directory so that we can pick them up with # doc macro later. mkdir _docs_staging @@ -204,11 +213,12 @@ for i in libextl libmainloop libtu; do done # contrib subpackage -for i in keybindings scripts statusbar statusd styles; do +for i in keybindings scripts scripts/legacy statusbar statusd styles; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ - install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i/* $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ + install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i/*.lua $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ done + # Doc subpackage cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. @@ -251,6 +261,9 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %{_includedir}/%{name} %changelog +* Sat Jan 4 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010402-3 +- New release + * Sun Nov 24 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-3 - Added patch for ion-statusd bug. - Removed URLs for patches.

10 years, 4 months

1
0
0 / 0

[notion] branch '3.2014010402' created

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git New branch : 3.2014010402 Referencing: 3da9112e8302af6647712204946f658c920c0855

10 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

notion-devel January 2014