notion-devel

notion-devel@lists.fedorahosted.org

46 discussions

[notion] master, no_docs: * Fixed revision number. * Added DOCDIR back to make install since build was failing on F19. (4ec8d9c)
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: master,no_docs >--------------------------------------------------------------- commit 4ec8d9c1b8b9d3d423342e398e88ece9a66a4a76 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Thu Jun 26 19:04:31 2014 -0400 * Fixed revision number. * Added DOCDIR back to make install since build was failing on F19. >--------------------------------------------------------------- notion.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notion.spec b/notion.spec index f3563c8..3a0bac6 100644 --- a/notion.spec +++ b/notion.spec @@ -3,7 +3,7 @@ Name: notion Version: %{majorver}.%{datever} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Tabbed, tiling window manager forked from Ion3 # Notion is distributed under a modified LGPLv2.1. As of 1/20/2014 this @@ -67,7 +67,7 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} %find_lang %{name} --with-man

1 0

[notion] master, no_docs: * Removed RELNOTES and fixed ChangeLog case. (0644688)
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: master,no_docs >--------------------------------------------------------------- commit 06446887f93015b9b8acea089d8c3546f2d09c57 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Wed Jun 25 19:51:04 2014 -0400 * Removed RELNOTES and fixed ChangeLog case. >--------------------------------------------------------------- notion.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/notion.spec b/notion.spec index 333f357..f3563c8 100644 --- a/notion.spec +++ b/notion.spec @@ -81,7 +81,7 @@ for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd s done %files -f %{name}.lang -%doc README ChangeLog LICENSE RELNOTES +%doc README CHANGELOG LICENSE %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/* %{_libdir}/%{name}

1 0

[notion] master, no_docs: * Started removing doc package, as it isn't really supported by upstream. (ee2ce27)
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: master,no_docs >--------------------------------------------------------------- commit ee2ce2783f72101ce4d6a53891949ceb0e0530ff Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Wed Jun 25 19:45:56 2014 -0400 * Started removing doc package, as it isn't really supported by upstream. >--------------------------------------------------------------- notion.spec | 94 ++++------------------------------------------------------ 1 files changed, 7 insertions(+), 87 deletions(-) diff --git a/notion.spec b/notion.spec index f385244..333f357 100644 --- a/notion.spec +++ b/notion.spec @@ -1,5 +1,5 @@ %global majorver 3 -%global datever 2014010900 +%global datever 2014052800 Name: notion Version: %{majorver}.%{datever} @@ -12,12 +12,7 @@ Summary: Tabbed, tiling window manager forked from Ion3 License: Redistributable, modified LGPLv2.1 URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{datev… -# Source https://github.com/jsbackus/notion-doc/archive/%{majorver}-%{datever}/%{nam… -Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datever… -Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop - -# Patch submitted to upstream -Patch0: %{name}-%{majorver}.%{datever}.p00-man_utf8.patch +Source1: https://fedorahosted.org/released/%{name}/%{name}.desktop BuildRequires: gettext BuildRequires: pkgconfig @@ -28,11 +23,6 @@ BuildRequires: lua-devel BuildRequires: libXext-devel BuildRequires: libSM-devel -BuildRequires: rubber -BuildRequires: latex2html -BuildRequires: texlive-collection-htmlxml -BuildRequires: texlive-collection-latexextra - Requires: xterm Requires: xorg-x11-utils Requires: xorg-x11-fonts-ISO8859-1-75dpi @@ -64,24 +54,9 @@ such as: Scripts are installed into %{_datadir}/%{name}/contrib. To use, copy/link the script(s) you want into ~/.notion and restart Notion. -%package doc -Summary: Documentation for the Notion window manager -License: GFDL -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -This package contains the documentation for extending and customizing -Notion. - %prep %setup -q -n %{name}-%{majorver}-%{datever} -# Decompress doc pkg -tar -xvf %SOURCE1 - -%patch0 -p1 - sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ -e 's|^$LIBDIR=$.*$|\1%{_libdir}|' \ @@ -89,25 +64,15 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -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/%{buildsubdir}/_docs_staging - -make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging - -# Note: -doc won't build w/ ?_smp_mflags. Shouldn't be a problem as there are -# no executables. -cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc-%{majorver}-%{datever} -make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. all +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} --with-man # Install and verify desktop file -desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/xsessions %{SOURCE2} -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop +desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/xsessions %{SOURCE1} # contrib subpackage for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd statusd/legacy styles; do @@ -115,10 +80,6 @@ for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd s install -pm 0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i/*.lua $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ done -# Doc subpackage -cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc-%{majorver}-%{datever} -make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. - %files -f %{name}.lang %doc README ChangeLog LICENSE RELNOTES %config(noreplace) %{_sysconfdir}/%{name} @@ -138,47 +99,6 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %doc README LICENSE %{_datadir}/%{name}/contrib -%files doc -%doc _docs_staging/* - %changelog -* Wed Jan 29 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 -- Tweaked install commands to preserve timestamps. - -* Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 -- Changed method of correcting manpage text encoding to something upstream can - apply to source. -- Removed devel subpackage. -- Removed unnecessary patches. -- Modified license to reflect - -* Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-2 -- Fixed a typo in required font package name. - -* Sun 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. - -* Sun Nov 24 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-3 -- Added patch for ion-statusd bug. -- Removed URLs for patches. -- Updated URLs for source1 and source2. -- Switched to all references to package version to use variables. -- Switched to find_lang from lang. -- Switched to desktop-file-install and added desktop-file-validate. -- Changed files section such that package owns whole directory instead of - just individual files. -- Moved libextl, libmainloop, and libtu into their own packages to conform - to Fedora guidelines. -- Switched all documentation references in files section to using doc macro. -- Removed BuildRequires: lua -- Added optflags to build. -- Updated notion.desktop. - -* Wed Nov 13 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-2 -- Modified devel to place all files in /usr/include -- Added sed statment to alter X11_LIBS= in system-autodetect.mk to use pkgconfig. -- Patched fonts in styles scripts to use valid 100dpi fonts. - -* Fri Nov 1 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-1 -- Initial addition to Fedora. +* Wed Jun 25 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014052800-1 +- Initial RPMFusion Release

1 0

[notion] master, no_docs, with_docs: * Updated comment re: source of notion doc. (e0112fd)
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: master,no_docs,with_docs >--------------------------------------------------------------- commit e0112fd97e8bb47c56d0b4cacf6a7809b2c21e0f Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Wed May 28 06:23:46 2014 -0400 * Updated comment re: source of notion doc. >--------------------------------------------------------------- notion.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/notion.spec b/notion.spec index 0442195..f385244 100644 --- a/notion.spec +++ b/notion.spec @@ -12,7 +12,7 @@ Summary: Tabbed, tiling window manager forked from Ion3 License: Redistributable, modified LGPLv2.1 URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{datev… -# Source https://github.com/jsbackus/notion-doc/archive/3-2014010505.tar.gz +# Source https://github.com/jsbackus/notion-doc/archive/%{majorver}-%{datever}/%{nam… Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datever… Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop

1 0

[notion] master, no_docs, with_docs: * Updated install commands. (5cb09f5)
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: master,no_docs,with_docs >--------------------------------------------------------------- commit 5cb09f5e24810398b1d6cd43e6aefa7ef640dbc5 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Wed Jan 29 17:20:35 2014 -0500 * Updated install commands. >--------------------------------------------------------------- notion.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/notion.spec b/notion.spec index f6b348b..0442195 100644 --- a/notion.spec +++ b/notion.spec @@ -111,8 +111,8 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop # contrib subpackage for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd statusd/legacy styles; do - mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ - install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i/*.lua $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ + install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i + install -pm 0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i/*.lua $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/$i/ done # Doc subpackage @@ -142,6 +142,9 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %doc _docs_staging/* %changelog +* Wed Jan 29 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 +- Tweaked install commands to preserve timestamps. + * Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 - Changed method of correcting manpage text encoding to something upstream can apply to source.

1 0

[notion] branch 'with_docs' created
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git New branch : with_docs Referencing: e0112fd97e8bb47c56d0b4cacf6a7809b2c21e0f

1 0

[notion] branch 'no_docs' created
by jsbackus＠fedoraproject.org 26 Jun '14

26 Jun '14

Repository : http://git.fedorahosted.org/cgit/notion.git New branch : no_docs Referencing: 4ec8d9c1b8b9d3d423342e398e88ece9a66a4a76

1 0

[notion] tag '3.2014010900-3' created
by jsbackus＠fedoraproject.org 24 Jan '14

24 Jan '14

Repository : http://git.fedorahosted.org/cgit/notion.git New tag : 3.2014010900-3 Referencing: 95cd17fbcd694489d0172da6e8afd184b3bd648b

1 0

[notion] master: * Made final set of changes before moving to RPMFusion. (812a824)
by jsbackus＠fedoraproject.org 24 Jan '14

24 Jan '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 812a8243b73d6bcd604d4ed85df0bba883fdb709 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Fri Jan 24 11:30:15 2014 -0500 * Made final set of changes before moving to RPMFusion. >--------------------------------------------------------------- notion.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/notion.spec b/notion.spec index 8479085..f6b348b 100644 --- a/notion.spec +++ b/notion.spec @@ -6,7 +6,10 @@ Version: %{majorver}.%{datever} Release: 3%{?dist} Summary: Tabbed, tiling window manager forked from Ion3 -License: LGPLv2 with exceptions +# Notion is distributed under a modified LGPLv2.1. As of 1/20/2014 this +# license was considered to be to restrictive to be included in the +# official Fedora repositories. +License: Redistributable, modified LGPLv2.1 URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{datev… # Source https://github.com/jsbackus/notion-doc/archive/3-2014010505.tar.gz @@ -144,6 +147,7 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. apply to source. - Removed devel subpackage. - Removed unnecessary patches. +- Modified license to reflect * Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-2 - Fixed a typo in required font package name.

1 0

[notion] drop_dev, master: * Removed X11 patch. * Renamed man/utf8 patch to change number. (4b926e5)
by jsbackus＠fedoraproject.org 24 Jan '14

24 Jan '14

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit 4b926e516ba555f9b58cf0b60859bd098ae93c64 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Jan 20 13:00:15 2014 -0500 * Removed X11 patch. * Renamed man/utf8 patch to change number. >--------------------------------------------------------------- ...patch => notion-3.2014010900.p00-man_utf8.patch | 0 notion-3.2014010900.p00-x11_prefix.patch | 75 -------------------- notion.spec | 8 +- 3 files changed, 4 insertions(+), 79 deletions(-) diff --git a/notion-3.2014010900.p01-man_utf8.patch b/notion-3.2014010900.p00-man_utf8.patch similarity index 100% rename from notion-3.2014010900.p01-man_utf8.patch rename to notion-3.2014010900.p00-man_utf8.patch diff --git a/notion-3.2014010900.p00-x11_prefix.patch b/notion-3.2014010900.p00-x11_prefix.patch deleted file mode 100644 index 3b6c001..0000000 --- a/notion-3.2014010900.p00-x11_prefix.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 1/2] * 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 - - -From c18c8f9865f26b21edcdc99986abc33df526bcf7 Mon Sep 17 00:00:00 2001 -From: Jeff Backus <jeff.backus(a)gmail.com> -Date: Mon, 20 Jan 2014 12:10:18 -0500 -Subject: [PATCH 2/2] * Reverted back to non-pkg-config method. * Added two new - variables, X11_LIBDIR and X11_INCDIR that allow the user more fine-grained - control over X11 lib and inc paths. - ---- - system-autodetect.mk | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/system-autodetect.mk b/system-autodetect.mk -index 69b21d0..cb8c65f 100644 ---- a/system-autodetect.mk -+++ b/system-autodetect.mk -@@ -77,14 +77,15 @@ 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 := $(or $(shell pkg-config --libs x11 xext), $(error "pkg-config couldn't find X11 libraries")) --X11_INCLUDES := $(shell pkg-config --cflags x11 xext) -+X11_LIBDIR ?= $(X11_PREFIX)/lib -+X11_INCDIR ?= $(X11_PREFIX)/include -+ -+X11_LIBS=-L$(X11_LIBDIR) -lX11 -lXext -+X11_INCLUDES=-I$(X11_INCDIR) - - # 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.spec b/notion.spec index 85cf235..8479085 100644 --- a/notion.spec +++ b/notion.spec @@ -13,9 +13,8 @@ Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorv Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datever… Source2: https://fedorahosted.org/released/%{name}/%{name}.desktop -Patch0: %{name}-%{majorver}.%{datever}.p00-x11_prefix.patch # Patch submitted to upstream -Patch1: %{name}-%{majorver}.%{datever}.p01-man_utf8.patch +Patch0: %{name}-%{majorver}.%{datever}.p00-man_utf8.patch BuildRequires: gettext BuildRequires: pkgconfig @@ -78,8 +77,7 @@ Notion. # Decompress doc pkg tar -xvf %SOURCE1 -#%patch0 -p1 -%patch1 -p1 +%patch0 -p1 sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ @@ -144,6 +142,8 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. * Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 - Changed method of correcting manpage text encoding to something upstream can apply to source. +- Removed devel subpackage. +- Removed unnecessary patches. * Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-2 - Fixed a typo in required font package name.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

notion-devel