January 2014 - notion-devel - Fedora Mailing-Lists

[notion] tag '3.2014010900-3' created

by jsbackus＠fedoraproject.org

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

10 years, 3 months

1
0
0 / 0

[notion] master: * Made final set of changes before moving to RPMFusion. (812a824)

by jsbackus＠fedoraproject.org

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}-%{dat... # 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.

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Removed X11 patch. * Renamed man/utf8 patch to change number. (4b926e5)

by jsbackus＠fedoraproject.org

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}-%{datev... 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.

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Updated x11 patch. (5e74a75)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit 5e74a7577d181d4abc0ed850b2b062730d6322c0 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Jan 20 12:14:32 2014 -0500 * Updated x11 patch. >--------------------------------------------------------------- notion-3.2014010900.p00-x11_prefix.patch | 42 +++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/notion-3.2014010900.p00-x11_prefix.patch b/notion-3.2014010900.p00-x11_prefix.patch index 2ce5d4b..3b6c001 100644 --- a/notion-3.2014010900.p00-x11_prefix.patch +++ b/notion-3.2014010900.p00-x11_prefix.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 1/2] * Modified X11_LIBS and X11_INCLUDES statements to use pkg-config. --- @@ -33,3 +33,43 @@ index d61c447..69b21d0 100644 -- 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 +

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Removed changelog patch. * Renamed x11_prefix patch. (ba0511c)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit ba0511cb5dbe001f8bd2d48bda0d96840434e605 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Jan 20 12:14:11 2014 -0500 * Removed changelog patch. * Renamed x11_prefix patch. >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^ba0511cb5dbe001f8bd2d48bda0d96840434e605~1 ba0511cb5dbe001f8bd2d48bda0d96840434e605

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Removed %check section - still doesn't work. * Removed -devel subpackage. Completely punting for the time being. (0cbb789)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit 0cbb789d6fb401e0dfee8f135f1a20bab7bfccfb Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Jan 20 12:02:27 2014 -0500 * Removed %check section - still doesn't work. * Removed -devel subpackage. Completely punting for the time being. >--------------------------------------------------------------- notion.spec | 58 ++-------------------------------------------------------- 1 files changed, 2 insertions(+), 56 deletions(-) diff --git a/notion.spec b/notion.spec index 21dd853..85cf235 100644 --- a/notion.spec +++ b/notion.spec @@ -13,9 +13,9 @@ Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorv 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 +Patch0: %{name}-%{majorver}.%{datever}.p00-x11_prefix.patch +# Patch submitted to upstream Patch1: %{name}-%{majorver}.%{datever}.p01-man_utf8.patch -Patch2: %{name}-%{majorver}.%{datever}.p02-x11_prefix.patch BuildRequires: gettext BuildRequires: pkgconfig @@ -72,14 +72,6 @@ Requires: %{name} = %{version}-%{release} This package contains the documentation for extending and customizing Notion. -%package devel -Summary: Development files for the Notion window manager -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -This package contains the development files necessary for extending and -customizing Notion. - %prep %setup -q -n %{name}-%{majorver}-%{datever} @@ -88,7 +80,6 @@ tar -xvf %SOURCE1 #%patch0 -p1 %patch1 -p1 -%patch2 -p1 sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ -e 's|^$ETCDIR\s*?=\s*$.*$|\1%{_sysconfdir}/%{name}|' \ @@ -96,8 +87,6 @@ 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. @@ -110,9 +99,6 @@ make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc-%{majorver}-%{datever} make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. all -%check -make test - %install make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} @@ -122,39 +108,6 @@ make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/xsessions %{SOURCE2} desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop -# notion-devel subpackage -# libextl header files -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl/ -install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl-mkexports $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl/ - -# libmainloop header files -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop/ - -# libtu header files -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu/ - -for i in de ioncore mod_dock mod_menu mod_query mod_sm mod_sp mod_statusbar mod_tiling mod_xinerama mod_xkbevents mod_xrandr utils/ion-statusd; do - mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/$i/ - install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/$i/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$i/ -done - -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/build -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/build/*.mk $RPM_BUILD_ROOT%{_includedir}/%{name}/build/ - -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/system-autodetect.mk $RPM_BUILD_ROOT%{_includedir}/%{name}/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/version.h $RPM_BUILD_ROOT%{_includedir}/%{name}/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/config.h $RPM_BUILD_ROOT%{_includedir}/%{name}/ -install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/install-sh $RPM_BUILD_ROOT%{_includedir}/%{name}/ - -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/build -for i in rules.mk system-inc.mk; do - install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/build/$i $RPM_BUILD_ROOT%{_includedir}/%{name}/build/ -done - # 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/ @@ -187,13 +140,6 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files doc %doc _docs_staging/* -%files devel -%doc README LICENSE -%{_includedir}/%{name} -#%{_includedir}/%{name}/libextl -#%{_includedir}/%{name}/libmainloop -#%{_includedir}/%{name}/libtu - %changelog * 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

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Seems to be working. Passes most checks in fedora-review. (dc9585b)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit dc9585b3f416685d90e6ad548fb422064aea72f3 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Jan 20 10:15:57 2014 -0500 * Seems to be working. Passes most checks in fedora-review. >--------------------------------------------------------------- notion.spec | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/notion.spec b/notion.spec index 13c56f5..21dd853 100644 --- a/notion.spec +++ b/notion.spec @@ -96,19 +96,23 @@ 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/%{buildsubdir}/_docs_staging make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -#make 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 +%check +make test + %install make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} @@ -118,6 +122,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/xsessions %{SOURCE2} desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop +# notion-devel subpackage # libextl header files mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl/ @@ -132,7 +137,6 @@ install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $RPM_BUILD_ROOT% mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu/ -# notion-devel subpackage for i in de ioncore mod_dock mod_menu mod_query mod_sm mod_sp mod_statusbar mod_tiling mod_xinerama mod_xkbevents mod_xrandr utils/ion-statusd; do mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/$i/ install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/$i/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$i/ @@ -162,7 +166,7 @@ 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 LICENSE RELNOTES +%doc README ChangeLog LICENSE RELNOTES %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/* %{_libdir}/%{name} @@ -186,23 +190,23 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files devel %doc README LICENSE %{_includedir}/%{name} -%{_includedir}/libextl -%{_includedir}/libmainloop -%{_includedir}/libtu +#%{_includedir}/%{name}/libextl +#%{_includedir}/%{name}/libmainloop +#%{_includedir}/%{name}/libtu %changelog -* Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 +* 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. -* Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-2 +* 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 +* 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 +* 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. @@ -218,10 +222,10 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. - Added optflags to build. - Updated notion.desktop. -* Wed Nov 13 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-2 +* 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 +* Fri Nov 1 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-1 - Initial addition to Fedora.

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Removed Changelog patch. * Removed changelog patch. * Added non-arch-specific Requires for base package to contrib and doc. * Removed libtu/libextl/libmainloop subpackages. Need to get approval. (e1c7e75)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit e1c7e757bf88b045d2f40bf83a1b9cf7dbb143a3 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 19 17:24:38 2014 -0500 * Removed Changelog patch. * Removed changelog patch. * Added non-arch-specific Requires for base package to contrib and doc. * Removed libtu/libextl/libmainloop subpackages. Need to get approval. >--------------------------------------------------------------- notion.spec | 97 +++++++++++++---------------------------------------------- 1 files changed, 21 insertions(+), 76 deletions(-) diff --git a/notion.spec b/notion.spec index bf50f08..13c56f5 100644 --- a/notion.spec +++ b/notion.spec @@ -13,7 +13,7 @@ Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorv 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 +#Patch0: %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch Patch1: %{name}-%{majorver}.%{datever}.p01-man_utf8.patch Patch2: %{name}-%{majorver}.%{datever}.p02-x11_prefix.patch @@ -49,6 +49,7 @@ Summary: 3rd party scripts for the Notion window manager License: GPLv3 and Public Domain and GPLv2+ and Artistic clarified and LGPLv2+ and GPL+ and GPLv2 and BSD BuildArch: noarch Requires: terminus-fonts +Requires: %{name} = %{version}-%{release} %description contrib This package contains a number of scripts from third parties for Notion, @@ -65,48 +66,15 @@ copy/link the script(s) you want into ~/.notion and restart Notion. 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. -#%package -n libextl-devel -#Summary: Small library for very easily extending programs with Lua -#License: LGPLv2+ - -#%description -n libextl-devel -#Libextl supports exporting functions that operate on basic data types (int, -#bool, double, [const] char*) and references to Lua tables and functions -#(ExtlTab, ExtlFn) simply by prefixing the function definition with the -#keywords EXTL_EXPORT, EXTL_EXPORT_AS or EXTL_EXPORT_MEMBER. More complex -#data must, however, either be proxied libtu objects (or objects of some -#other object system with the appropriate macros redefined), or Lua tables. -#The binding glue is, however, generated as painlessly as for functions that -#operate on basic data types with all pointers to a type with a name that -#begins with an uppercase letter considered as such objects. Libextl also -#provides functions to manipulate Lua tables through references to these, and -#ways to call and load Lua code. - -#%package -n libmainloop-devel -#Summary: Support library for the Notion window manager - -#%description -n libmainloop-devel -#This package contains a support library necessary for extending and -#customizing Notion. - -#%package -n libtu-devel -#Summary: Support library for the Notion window manager - -#%description -n libtu-devel -#This package contains a support library necessary for extending and -#customizing Notion. - %package devel Summary: Development files for the Notion window manager Requires: %{name}%{?_isa} = %{version}-%{release} -#Requires: libextl-devel = %{version}-%{release} -#Requires: libmainloop-devel = %{version}-%{release} -#Requires: libtu-devel = %{version}-%{release} %description devel This package contains the development files necessary for extending and @@ -118,7 +86,7 @@ customizing Notion. # Decompress doc pkg tar -xvf %SOURCE1 -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -133,10 +101,11 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ # doc macro later. mkdir $RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -#make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging +make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging +#make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -# Note: -doc won't build w/ ?_smp_mflags. +# 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 @@ -149,22 +118,19 @@ make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/xsessions %{SOURCE2} desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop -# libextl subpackage -mkdir -p $RPM_BUILD_ROOT%{_includedir}/libextl -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/*.h $RPM_BUILD_ROOT%{_includedir}/libextl/ -install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl-mkexports $RPM_BUILD_ROOT%{_includedir}/libextl/ -#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl.a $RPM_BUILD_ROOT%{_libdir}/ +# libextl header files +mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl +install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl/ +install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl-mkexports $RPM_BUILD_ROOT%{_includedir}/%{name}/libextl/ -# libmainloop subpackage -mkdir -p $RPM_BUILD_ROOT%{_includedir}/libmainloop -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/*.h $RPM_BUILD_ROOT%{_includedir}/libmainloop/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $RPM_BUILD_ROOT%{_includedir}/libmainloop/ -#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/libmainloop.a $RPM_BUILD_ROOT%{_libdir}/ +# libmainloop header files +mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop +install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop/ +install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $RPM_BUILD_ROOT%{_includedir}/%{name}/libmainloop/ -# libtu subpackage -mkdir -p $RPM_BUILD_ROOT%{_includedir}/libtu -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/*.h $RPM_BUILD_ROOT%{_includedir}/libtu/ -#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/libtu.a $RPM_BUILD_ROOT%{_libdir}/ +# libtu header files +mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu +install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/libtu/ # notion-devel subpackage for i in de ioncore mod_dock mod_menu mod_query mod_sm mod_sp mod_statusbar mod_tiling mod_xinerama mod_xkbevents mod_xrandr utils/ion-statusd; do @@ -185,12 +151,6 @@ for i in rules.mk system-inc.mk; do install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/build/$i $RPM_BUILD_ROOT%{_includedir}/%{name}/build/ done -# Most parts of Notion actually expect these "libraries" to be in the -# notion TOPDIR, so we'll create links to keep them happy. -#for i in libextl libmainloop libtu; do -# ln -s "../$i" $RPM_BUILD_ROOT%{_includedir}/%{name}/$i -#done - # 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/ @@ -202,14 +162,14 @@ 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 LICENSE ChangeLog RELNOTES +%doc README LICENSE RELNOTES %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/* %{_libdir}/%{name} %{_mandir}/man1/* +%dir %{_datadir}/%{name} %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 @@ -223,21 +183,6 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files doc %doc _docs_staging/* -#%files -n libextl-devel -#%doc libextl/README libextl/LICENSE -#%{_includedir}/libextl -#%{_libdir}/libextl.a - -#%files -n libmainloop-devel -#%doc README LICENSE -#%{_includedir}/libmainloop -#%{_libdir}/libmainloop.a - -#%files -n libtu-devel -#%doc README LICENSE -#%{_includedir}/libtu -#%{_libdir}/libtu.a - %files devel %doc README LICENSE %{_includedir}/%{name}

10 years, 3 months

1
0
0 / 0

[notion] drop_dev, master: * Modified spec to roll "lib" subpackages into devel subpackage. * Removed .a files from package. * Removed multi-processor flags from make in build section. (9713ff2)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branches: drop_dev,master >--------------------------------------------------------------- commit 9713ff2af05926ff30c8bdf878a0b1299f344f1d Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Jan 19 13:45:28 2014 -0500 * Modified spec to roll "lib" subpackages into devel subpackage. * Removed .a files from package. * Removed multi-processor flags from make in build section. >--------------------------------------------------------------- notion.spec | 111 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 57 insertions(+), 54 deletions(-) diff --git a/notion.spec b/notion.spec index bb7d2e6..bf50f08 100644 --- a/notion.spec +++ b/notion.spec @@ -70,43 +70,43 @@ BuildArch: noarch This package contains the documentation for extending and customizing Notion. -%package -n libextl-devel -Summary: Small library for very easily extending programs with Lua -License: LGPLv2+ - -%description -n libextl-devel -Libextl supports exporting functions that operate on basic data types (int, -bool, double, [const] char*) and references to Lua tables and functions -(ExtlTab, ExtlFn) simply by prefixing the function definition with the -keywords EXTL_EXPORT, EXTL_EXPORT_AS or EXTL_EXPORT_MEMBER. More complex -data must, however, either be proxied libtu objects (or objects of some -other object system with the appropriate macros redefined), or Lua tables. -The binding glue is, however, generated as painlessly as for functions that -operate on basic data types with all pointers to a type with a name that -begins with an uppercase letter considered as such objects. Libextl also -provides functions to manipulate Lua tables through references to these, and -ways to call and load Lua code. - -%package -n libmainloop-devel -Summary: Support library for the Notion window manager - -%description -n libmainloop-devel -This package contains a support library necessary for extending and -customizing Notion. - -%package -n libtu-devel -Summary: Support library for the Notion window manager - -%description -n libtu-devel -This package contains a support library necessary for extending and -customizing Notion. +#%package -n libextl-devel +#Summary: Small library for very easily extending programs with Lua +#License: LGPLv2+ + +#%description -n libextl-devel +#Libextl supports exporting functions that operate on basic data types (int, +#bool, double, [const] char*) and references to Lua tables and functions +#(ExtlTab, ExtlFn) simply by prefixing the function definition with the +#keywords EXTL_EXPORT, EXTL_EXPORT_AS or EXTL_EXPORT_MEMBER. More complex +#data must, however, either be proxied libtu objects (or objects of some +#other object system with the appropriate macros redefined), or Lua tables. +#The binding glue is, however, generated as painlessly as for functions that +#operate on basic data types with all pointers to a type with a name that +#begins with an uppercase letter considered as such objects. Libextl also +#provides functions to manipulate Lua tables through references to these, and +#ways to call and load Lua code. + +#%package -n libmainloop-devel +#Summary: Support library for the Notion window manager + +#%description -n libmainloop-devel +#This package contains a support library necessary for extending and +#customizing Notion. + +#%package -n libtu-devel +#Summary: Support library for the Notion window manager + +#%description -n libtu-devel +#This package contains a support library necessary for extending and +#customizing Notion. %package devel Summary: Development files for the Notion window manager Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libextl-devel = %{version}-%{release} -Requires: libmainloop-devel = %{version}-%{release} -Requires: libtu-devel = %{version}-%{release} +#Requires: libextl-devel = %{version}-%{release} +#Requires: libmainloop-devel = %{version}-%{release} +#Requires: libtu-devel = %{version}-%{release} %description devel This package contains the development files necessary for extending and @@ -133,7 +133,8 @@ sed -e 's|^$PREFIX\s*?=\s*$.*$|\1%{_prefix}|' \ # doc macro later. mkdir $RPM_BUILD_DIR/%{buildsubdir}/_docs_staging -make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging +#make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging +make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging # Note: -doc won't build w/ ?_smp_mflags. cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc-%{majorver}-%{datever} @@ -152,18 +153,18 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/xsessions/%{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_includedir}/libextl install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/*.h $RPM_BUILD_ROOT%{_includedir}/libextl/ install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl-mkexports $RPM_BUILD_ROOT%{_includedir}/libextl/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl.a $RPM_BUILD_ROOT%{_libdir}/ +#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libextl/libextl.a $RPM_BUILD_ROOT%{_libdir}/ # libmainloop subpackage mkdir -p $RPM_BUILD_ROOT%{_includedir}/libmainloop install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/*.h $RPM_BUILD_ROOT%{_includedir}/libmainloop/ install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $RPM_BUILD_ROOT%{_includedir}/libmainloop/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/libmainloop.a $RPM_BUILD_ROOT%{_libdir}/ +#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/libmainloop.a $RPM_BUILD_ROOT%{_libdir}/ # libtu subpackage mkdir -p $RPM_BUILD_ROOT%{_includedir}/libtu install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/*.h $RPM_BUILD_ROOT%{_includedir}/libtu/ -install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/libtu.a $RPM_BUILD_ROOT%{_libdir}/ +#install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/libtu.a $RPM_BUILD_ROOT%{_libdir}/ # notion-devel subpackage for i in de ioncore mod_dock mod_menu mod_query mod_sm mod_sp mod_statusbar mod_tiling mod_xinerama mod_xkbevents mod_xrandr utils/ion-statusd; do @@ -186,9 +187,9 @@ done # Most parts of Notion actually expect these "libraries" to be in the # notion TOPDIR, so we'll create links to keep them happy. -for i in libextl libmainloop libtu; do - ln -s "../$i" $RPM_BUILD_ROOT%{_includedir}/%{name}/$i -done +#for i in libextl libmainloop libtu; do +# ln -s "../$i" $RPM_BUILD_ROOT%{_includedir}/%{name}/$i +#done # contrib subpackage for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd statusd/legacy styles; do @@ -196,7 +197,6 @@ for i in keybindings scripts scripts/legacy statusbar statusbar/legacy statusd s 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-%{majorver}-%{datever} make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. @@ -223,24 +223,27 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files doc %doc _docs_staging/* -%files -n libextl-devel -%doc libextl/README libextl/LICENSE -%{_includedir}/libextl -%{_libdir}/libextl.a +#%files -n libextl-devel +#%doc libextl/README libextl/LICENSE +#%{_includedir}/libextl +#%{_libdir}/libextl.a -%files -n libmainloop-devel -%doc README LICENSE -%{_includedir}/libmainloop -%{_libdir}/libmainloop.a +#%files -n libmainloop-devel +#%doc README LICENSE +#%{_includedir}/libmainloop +#%{_libdir}/libmainloop.a -%files -n libtu-devel -%doc README LICENSE -%{_includedir}/libtu -%{_libdir}/libtu.a +#%files -n libtu-devel +#%doc README LICENSE +#%{_includedir}/libtu +#%{_libdir}/libtu.a %files devel %doc README LICENSE %{_includedir}/%{name} +%{_includedir}/libextl +%{_includedir}/libmainloop +%{_includedir}/libtu %changelog * Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-3 @@ -250,7 +253,7 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. * Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-2 - Fixed a typo in required font package name. -* Sat Jan 12 2014 Jeff Backus <jeff.backus(a)gmail.com> - 3.2014010900-1 +* 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.

10 years, 3 months

1
0
0 / 0

[notion] branch 'drop_dev' created

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git New branch : drop_dev Referencing: 4b926e516ba555f9b58cf0b60859bd098ae93c64

10 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

notion-devel January 2014