November 2013 - notion-devel - Fedora Mailing-Lists

[notion] tag '3.2013030200-3' created

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git New tag : 3.2013030200-3 Referencing: 98c5a0859d5418fbf63038514a7bc819842fba52

10 years, 5 months

1
0
0 / 0

[notion] tag '3.2013030200-1' created

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git New tag : 3.2013030200-1 Referencing: 07a1b22fe907735e2ea2a8ab961920357efbf044

10 years, 5 months

1
0
0 / 0

[notion] master: * Fixed a copy-n-paste typo. * Removed noarch from lib* packages. (01d52ad)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 01d52adde79521bc684f2f1d02b85091c09c4b53 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Tue Nov 26 12:58:05 2013 -0500 * Fixed a copy-n-paste typo. * Removed noarch from lib* packages. >--------------------------------------------------------------- notion.spec | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/notion.spec b/notion.spec index 72aff3b..788550d 100644 --- a/notion.spec +++ b/notion.spec @@ -80,7 +80,6 @@ Notion. %package -n libextl-devel Summary: Small library for very easily extending programs with Lua License: LGPLv2+ -BuildArch: noarch %description -n libextl-devel Libextl supports exporting functions that operate on basic data types (int, @@ -97,7 +96,6 @@ ways to call and load Lua code. %package -n libmainloop-devel Summary: Support library for the Notion window manager -BuildArch: noarch %description -n libmainloop-devel This package contains a support library necessary for extending and @@ -105,7 +103,6 @@ customizing Notion. %package -n libtu-devel Summary: Support library for the Notion window manager -BuildArch: noarch %description -n libtu-devel This package contains a support library necessary for extending and @@ -179,9 +176,9 @@ install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/libmainloop.a $RPM_BUI # 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}/libextl/libtu.a $RPM_BUILD_ROOT%{_libdir}/ +install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libtu/libtu.a $RPM_BUILD_ROOT%{_libdir}/ -# Dev subpackage +# 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/

10 years, 5 months

1
0
0 / 0

[notion] master: * Updated FSF address patch to also patch libextl/LICENSE. * Changed lib* subpackages to lib*-devel, since they have header files. This was to quiet a complaint from rpmlint. * Added descriptions to lib* packages. * Fixed a permissions issue with libmainloop/rx.mk * Added lib*.a files. (52f16c8)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 52f16c867c33db28de4fd851f5e83ac277c7448b Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Tue Nov 26 12:26:42 2013 -0500 * Updated FSF address patch to also patch libextl/LICENSE. * Changed lib* subpackages to lib*-devel, since they have header files. This was to quiet a complaint from rpmlint. * Added descriptions to lib* packages. * Fixed a permissions issue with libmainloop/rx.mk * Added lib*.a files. >--------------------------------------------------------------- notion-3.2013030200.p01-fsf_addr.patch | 22 +++++++++++ notion.spec | 66 +++++++++++++++++++------------ 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/notion-3.2013030200.p01-fsf_addr.patch b/notion-3.2013030200.p01-fsf_addr.patch index e341048..1d61d20 100644 --- a/notion-3.2013030200.p01-fsf_addr.patch +++ b/notion-3.2013030200.p01-fsf_addr.patch @@ -22,3 +22,25 @@ diff -rupN notion-3-2013030200/libtu/rb.h notion-3-2013030200_patched/libtu/rb.h */ /* 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.spec b/notion.spec index bf0c25d..72aff3b 100644 --- a/notion.spec +++ b/notion.spec @@ -77,39 +77,46 @@ BuildArch: noarch This package contains the documentation for extending and customizing Notion. -%package -n libextl -Summary: TODO +%package -n libextl-devel +Summary: Small library for very easily extending programs with Lua +License: LGPLv2+ BuildArch: noarch -%description -n libextl -TODO -This package contains the development files necessary for extending and -customizing Notion. - -%package -n libmainloop -Summary: TODO +%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 BuildArch: noarch -%description -n libmainloop -TODO -This package contains the development files necessary for extending and +%description -n libmainloop-devel +This package contains a support library necessary for extending and customizing Notion. -%package -n libtu -Summary: TODO +%package -n libtu-devel +Summary: Support library for the Notion window manager BuildArch: noarch -%description -n libtu -TODO -This package contains the development files necessary for extending and +%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 = %{version}-%{release} -Requires: libmainloop = %{version}-%{release} -Requires: libtu = %{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 @@ -161,15 +168,18 @@ desktop-file-validate %{buildroot}/%{_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}/ # libmainloop subpackage mkdir -p $RPM_BUILD_ROOT%{_includedir}/libmainloop install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/*.h $RPM_BUILD_ROOT%{_includedir}/libmainloop/ -install -Dm0755 $RPM_BUILD_DIR/%{buildsubdir}/libmainloop/rx.mk $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}/ # 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}/libextl/libtu.a $RPM_BUILD_ROOT%{_libdir}/ # Dev 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 @@ -212,8 +222,9 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %{_bindir}/* %{_libdir}/%{name} %{_mandir}/man1/* +%lang(fi) %{_datadir}/%{name}/welcome.fi.txt +%lang(cs) %{_datadir}/%{name}/welcome.cs.txt %{_datadir}/%{name} - %{_datadir}/xsessions/%{name}.desktop %files contrib @@ -223,17 +234,20 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files doc %doc _docs_staging/* -%files -n libextl -%doc README LICENSE +%files -n libextl-devel +%doc libextl/README libextl/LICENSE %{_includedir}/libextl +%{_libdir}/libextl.a -%files -n libmainloop +%files -n libmainloop-devel %doc README LICENSE %{_includedir}/libmainloop +%{_libdir}/libmainloop.a -%files -n libtu +%files -n libtu-devel %doc README LICENSE %{_includedir}/libtu +%{_libdir}/libtu.a %files devel %doc README LICENSE

10 years, 5 months

1
0
0 / 0

[notion] master: * Added comment re: submission of patch 5. (f03296c)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit f03296cc90774b8bda2e2e2539d285702edce375 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Tue Nov 26 09:51:06 2013 -0500 * Added comment re: submission of patch 5. >--------------------------------------------------------------- notion.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/notion.spec b/notion.spec index f321ad0..bf0c25d 100644 --- a/notion.spec +++ b/notion.spec @@ -22,6 +22,7 @@ Patch2: %{name}-doc-%{majorver}.%{datever}.p02-css_newline.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 +# Patch submitted to upstream via e-mail on 11/26/2013 Patch5: %{name}-%{majorver}.%{datever}.p05-fix_orphaned_statusd.patch BuildRequires: gettext @@ -54,7 +55,6 @@ Features include: 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 %description contrib

10 years, 5 months

1
0
0 / 0

[notion] master: * Had to add back in DOCDIR=%{_pkgdocdir}, otherwise rpmbuild complains about new files in BUILD. (b254166)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit b2541668fd4ef0b672630f2665fb42baecedc2bb Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Nov 25 08:16:55 2013 -0500 * Had to add back in DOCDIR=%{_pkgdocdir}, otherwise rpmbuild complains about new files in BUILD. >--------------------------------------------------------------- notion.spec | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/notion.spec b/notion.spec index a903865..f321ad0 100644 --- a/notion.spec +++ b/notion.spec @@ -137,17 +137,19 @@ sed -e 's|^$PREFIX=$.*$|\1%{_prefix}|' \ -e 's|$CFLAGS *+*= *$$-Os$|\1 $(RPM_OPT_FLAGS) \2|' \ -i system-autodetect.mk +# Installing docs to a temporary directory so that we can pick them up with +# doc macro later. +mkdir _docs_staging + %build -make %{?_smp_mflags} +make %{?_smp_mflags} DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging # Note: -doc won't build w/ ?_smp_mflags. cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc -# Installing docs to a temporary directory so that we can pick them up with -# doc macro later. make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. all %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} %find_lang %{name} --with-man

10 years, 5 months

1
0
0 / 0

[notion] master: * Updated Source2 to use fedorahosted.org url. * Removed commented code. * Updated changelog. (9293f31)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 9293f319d3e2a4cd1df8827b29a17e3f14cae2bc Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Mon Nov 25 07:36:03 2013 -0500 * Updated Source2 to use fedorahosted.org url. * Removed commented code. * Updated changelog. >--------------------------------------------------------------- notion.spec | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/notion.spec b/notion.spec index b2ecee6..a903865 100644 --- a/notion.spec +++ b/notion.spec @@ -9,9 +9,8 @@ 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://github.com/jsbackus/notion-doc/archive/%{name}-doc-3-2013030200.t... -Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-3-2013030200.tar.bz2 -Source2: https://raw.github.com/jsbackus/fedora_notion/master/%{name}.desktop +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 @@ -30,7 +29,6 @@ BuildRequires: pkgconfig BuildRequires: desktop-file-utils BuildRequires: libXinerama-devel BuildRequires: libXrandr-devel -#BuildRequires: lua BuildRequires: lua-devel BuildRequires: libXext-devel BuildRequires: libSM-devel @@ -123,10 +121,6 @@ customizing Notion. # Decompress doc pkg tar -xvf %SOURCE1 -# Screwy name is due to how GitHub names releases vs. directories. Once -# upstream creates an official release this will need to be adjusted. -#mv %{name}-doc-%{name}-doc-%{majorver}-%{datever} %{name}-doc - %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -148,11 +142,12 @@ make %{?_smp_mflags} # Note: -doc won't build w/ ?_smp_mflags. cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc -make TOPDIR=.. all +# Installing docs to a temporary directory so that we can pick them up with +# doc macro later. +make DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. all %install -make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} -#mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} --with-man @@ -214,20 +209,8 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/* %{_libdir}/%{name} -#%lang(cs) %{_mandir}/cs/* -#%lang(fi) %{_mandir}/fi/* %{_mandir}/man1/* -#%lang(cs) %{_datadir}/locale/cs/* -#%lang(de) %{_datadir}/locale/de/* -#%lang(fi) %{_datadir}/locale/fi/* -#%lang(fr) %{_datadir}/locale/fr/* %{_datadir}/%{name} -#%lang(fi) %{_datadir}/%{name}/welcome.fi.txt -#%lang(cs) %{_datadir}/%{name}/welcome.cs.txt -#%{_defaultdocdir}/%{name}-%{version}/README -#%{_defaultdocdir}/%{name}-%{version}/LICENSE -#%{_defaultdocdir}/%{name}-%{version}/ChangeLog -#%{_defaultdocdir}/%{name}-%{version}/RELNOTES %{_datadir}/xsessions/%{name}.desktop @@ -237,7 +220,6 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files doc %doc _docs_staging/* -#%{_defaultdocdir}/%{name}-doc-%{version}/* %files -n libextl %doc README LICENSE @@ -258,13 +240,19 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %changelog * Sun Nov 24 2013 Jeff Backus <jeff.backus(a)gmail.com> - 3.2013030200-3 - Added patch for ion-statusd bug. -- Removed URLs for patches, as per review. -- Added missing libmainloop/rx.mk to -devel. +- 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 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

10 years, 5 months

1
0
0 / 0

[notion] master: * Removed a tab and replaced w/ spaces. * Tweaked path for temporary doc install dir. (5ee3167)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit 5ee3167cf4f8482d17e569eb01b05e333e7d4d04 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Nov 24 19:47:04 2013 -0500 * Removed a tab and replaced w/ spaces. * Tweaked path for temporary doc install dir. >--------------------------------------------------------------- notion.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notion.spec b/notion.spec index 079575c..b2ecee6 100644 --- a/notion.spec +++ b/notion.spec @@ -10,7 +10,7 @@ License: LGPLv2 with exceptions URL: http://notion.sourceforge.net Source0: http://downloads.sourceforge.net/project/notion/%{name}-%{majorver}-%{dat... #Source1: https://github.com/jsbackus/notion-doc/archive/%{name}-doc-3-2013030200.t... -Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-3-2013030200.tar.bz2 +Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-3-2013030200.tar.bz2 Source2: https://raw.github.com/jsbackus/fedora_notion/master/%{name}.desktop # Patch submitted to upstream via e-mail on 11/3/2013 @@ -207,7 +207,7 @@ done # Doc subpackage cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc -make install DOCDIR=%{_builddir}/_docs_staging TOPDIR=.. +make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging TOPDIR=.. %files -f %{name}.lang %doc README LICENSE ChangeLog RELNOTES

10 years, 5 months

1
0
0 / 0

[notion] master: * Removed definition of _pkgdocdir at top. * Changed URL fo Source1 to a released version on fedorahosted.org... hopefully... * Removed arch-dependent requirement from libextl, libmainloop, and libtu, since they are arch-independent. * Removed some commented experiments. * Added --with-man to %find_lang so that it will grab translated man pages. * Trying to install docs to a temporary directory in _builddir so that they can be included later with %doc. (fc9555a)

by jsbackus＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/notion.git On branch : master >--------------------------------------------------------------- commit fc9555a19e2a117e3daefa49d3ebe01f7421ab05 Author: Jeff Backus <jeff.backus(a)gmail.com> Date: Sun Nov 24 19:42:49 2013 -0500 * Removed definition of _pkgdocdir at top. * Changed URL fo Source1 to a released version on fedorahosted.org... hopefully... * Removed arch-dependent requirement from libextl, libmainloop, and libtu, since they are arch-independent. * Removed some commented experiments. * Added --with-man to %find_lang so that it will grab translated man pages. * Trying to install docs to a temporary directory in _builddir so that they can be included later with %doc. >--------------------------------------------------------------- notion.spec | 59 ++++++++++++----------------------------------------------- 1 files changed, 12 insertions(+), 47 deletions(-) diff --git a/notion.spec b/notion.spec index 50fd5b4..079575c 100644 --- a/notion.spec +++ b/notion.spec @@ -1,9 +1,6 @@ %global majorver 3 %global datever 2013030200 -#TODO: Try removing this and running Koji -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - Name: notion Version: %{majorver}.%{datever} Release: 3%{?dist} @@ -12,10 +9,8 @@ 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... -#TODO: Consider putting up a fork of this repo on GitHub and specifying a "release link" -#Source1: git://notion.git.sourceforge.net/gitroot/notion/notion-doc -Source1: https://github.com/jsbackus/notion-doc/archive/%{name}-doc-3-2013030200.t... -#Source1: https://www.dropbox.com/sh/n1icl72l63dy9tr/jFYmjjqH-f/%{name}-doc-%{major... +#Source1: https://github.com/jsbackus/notion-doc/archive/%{name}-doc-3-2013030200.t... +Source1: https://fedorahosted.org/released/%{name}/%{name}-doc-3-2013030200.tar.bz2 Source2: https://raw.github.com/jsbackus/fedora_notion/master/%{name}.desktop # Patch submitted to upstream via e-mail on 11/3/2013 @@ -114,18 +109,15 @@ customizing Notion. %package devel Summary: Development files for the Notion window manager Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libextl%{?_isa} = %{version}-%{release} -Requires: libmainloop%{?_isa} = %{version}-%{release} -Requires: libtu%{?_isa} = %{version}-%{release} +Requires: libextl = %{version}-%{release} +Requires: libmainloop = %{version}-%{release} +Requires: libtu = %{version}-%{release} %description devel This package contains the development files necessary for extending and customizing Notion. %prep -#tar -xvf %SOURCE1 -#%patch2 -p1 - %setup -q -n %{name}-%{majorver}-%{datever} # Decompress doc pkg @@ -133,7 +125,7 @@ tar -xvf %SOURCE1 # Screwy name is due to how GitHub names releases vs. directories. Once # upstream creates an official release this will need to be adjusted. -mv %{name}-doc-%{name}-doc-%{majorver}-%{datever} %{name}-doc +#mv %{name}-doc-%{name}-doc-%{majorver}-%{datever} %{name}-doc %patch0 -p1 %patch1 -p1 @@ -154,19 +146,15 @@ sed -e 's|^$PREFIX=$.*$|\1%{_prefix}|' \ %build make %{?_smp_mflags} +# Note: -doc won't build w/ ?_smp_mflags. cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc make TOPDIR=.. all -# Note: -doc won't build w/ ?_smp_mflags. -#cd $RPM_BUILD_DIR/%{name}-doc -#make TOPDIR=$RPM_BUILD_DIR/%{buildsubdir} all - %install - make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_pkgdocdir} #mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} -%find_lang %{name} +%find_lang %{name} --with-man # Install and verify desktop file desktop-file-install --dir=%{buildroot}/%{_datadir}/xsessions %{SOURCE2} @@ -211,46 +199,23 @@ for i in libextl libmainloop libtu; do ln -s "../$i" $RPM_BUILD_ROOT%{_includedir}/%{name}/$i done -#mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/ -#for i in LICENSE README; do -# install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/$i $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/ -#done - # contrib subpackage for i in keybindings scripts 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/ done -#mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-contrib-%{version} -#for i in LICENSE README; do -# install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-contrib-%{version}/ -#done - -#mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} -#for i in LICENSE README; do -# install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/contrib/$i $RPM_BUILD_ROOT%{_pkgdocdir}/$i -#done - # Doc subpackage -%pre doc cd $RPM_BUILD_DIR/%{buildsubdir}/%{name}-doc -#make install DOCDIR=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version} TOPDIR=.. -#for i in LICENSE README; do -# install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/$i $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/ -#done -make install DOCDIR=%{_pkgdocdir} TOPDIR=.. -#for i in LICENSE README; do -# install -Dm0644 $RPM_BUILD_DIR/%{buildsubdir}/$i $RPM_BUILD_ROOT%{_pkgdocdir}/ -#done +make install DOCDIR=%{_builddir}/_docs_staging TOPDIR=.. %files -f %{name}.lang %doc README LICENSE ChangeLog RELNOTES %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/* %{_libdir}/%{name} -%lang(cs) %{_mandir}/cs/* -%lang(fi) %{_mandir}/fi/* +#%lang(cs) %{_mandir}/cs/* +#%lang(fi) %{_mandir}/fi/* %{_mandir}/man1/* #%lang(cs) %{_datadir}/locale/cs/* #%lang(de) %{_datadir}/locale/de/* @@ -271,7 +236,7 @@ make install DOCDIR=%{_pkgdocdir} TOPDIR=.. %{_datadir}/%{name}/contrib %files doc -%doc %{_pkgdocdir} +%doc _docs_staging/* #%{_defaultdocdir}/%{name}-doc-%{version}/* %files -n libextl

10 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

notion-devel November 2013