May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit zile for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package zile for openSUSE:Factory checked in at 2016-05-05 08:12:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zile (Old) and /work/SRC/openSUSE:Factory/.zile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zile" Changes: -------- --- /work/SRC/openSUSE:Factory/zile/zile.changes 2016-05-02 10:44:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zile.new/zile.changes 2016-05-05 08:12:45.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Apr 17 21:21:44 UTC 2016 - sleep_walker(a)opensuse.org + +- remove --enable-xterm-support as not understood configure option +- fix documentaion path, mark documentation files as %doc +- add libacl as BuildRequires where available +- remove extra LDFLAGS as it doesn't affect build at all +- reduce BuildRequires - remove obvious ones and unsued texinfo +- make update-desktop-files openSUSE specific +- make zile-doc noarch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zile.spec ++++++ --- /var/tmp/diff_new_pack.8hUYwc/_old 2016-05-05 08:12:46.000000000 +0200 +++ /var/tmp/diff_new_pack.8hUYwc/_new 2016-05-05 08:12:46.000000000 +0200 @@ -27,20 +27,18 @@ Source: http://ftp.gnu.org/gnu/zile/zile-%{version}.tar.gz Source1: zile.desktop Source2: zile.png -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc -BuildRequires: glibc-devel BuildRequires: help2man -BuildRequires: libtool -BuildRequires: make BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkg-config BuildRequires: termcap -BuildRequires: texinfo +%if 0%{?suse_version} BuildRequires: update-desktop-files +%endif BuildRequires: pkgconfig(bdw-gc) +%if 0%{?suse_version} >= 1330 +BuildRequires: pkgconfig(libacl) +%endif Requires: termcap Provides: %{name}-base = %{version} Provides: %{name}-desktop = %{version} @@ -57,6 +55,7 @@ %package doc Summary: Lightweight Emacs Clone (Documentation) Group: Productivity/Editors/Emacs +BuildArch: noarch %description doc Zile is another Emacs-clone. Zile is a customizable, self-documenting @@ -69,23 +68,16 @@ %setup -q %build -LDFLAGS="-L%{_libdir}/termcap" \ %configure \ - --enable-xterm-support \ - --disable-debug - -make %{?_smp_mflags} V=1 + --disable-debug \ + --disable-silent-rules \ + --docdir=%{_docdir}/%{name} +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -rm -rf "%{buildroot}%{_datadir}/doc/zile" - -install -d "%{buildroot}%{_docdir}/%{name}" -for f in AUTHORS ChangeLog COPYING NEWS README THANKS FAQ src/dotzile.sample; do - install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" -done - +install -m0644 -t "%{buildroot}%{_docdir}/%{name}/" ChangeLog COPYING README THANKS install -Dp -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" install -Dp -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" %if 0%{?suse_version} @@ -107,6 +99,6 @@ %files doc %defattr(-,root,root) -%{_docdir}/%{name} +%doc %{_docdir}/%{name} %changelog

1 0

commit ncdu for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package ncdu for openSUSE:Factory checked in at 2016-05-05 08:12:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncdu (Old) and /work/SRC/openSUSE:Factory/.ncdu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncdu" Changes: -------- --- /work/SRC/openSUSE:Factory/ncdu/ncdu.changes 2013-09-04 14:02:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncdu.new/ncdu.changes 2016-05-05 08:12:44.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 28 18:28:00 UTC 2016 - toddrme2178(a)gmail.com + +- Update to 1.11 + * Added 'b' key to spawn shell in the current directory + * Support scanning (and refreshing) of empty directories + * Added --si flag for base 10 prefixes + * Fix toggle dirs before files +- Spec file cleanups +- Add include_sys_wait.patch. Fixes building on earlier distros. + The patch is includes upstream and should be in the next release. + Please see: + + https://dev.yorhel.nl/ncdu/bug/70 + + https://g.blicky.net/ncdu.git/commit/?id=29f347c19cb7ad17c4b401e1d984fce8ea… + +------------------------------------------------------------------- Old: ---- ncdu-1.10.tar.gz ncdu-1.10.tar.gz.asc New: ---- include_sys_wait.patch ncdu-1.11.tar.gz ncdu-1.11.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncdu.spec ++++++ --- /var/tmp/diff_new_pack.YdyprE/_old 2016-05-05 08:12:45.000000000 +0200 +++ /var/tmp/diff_new_pack.YdyprE/_new 2016-05-05 08:12:45.000000000 +0200 @@ -1,8 +1,7 @@ -# vim: set sw=4 ts=4 et: # # spec file for package ncdu # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +17,7 @@ Name: ncdu -Version: 1.10 +Version: 1.11 Release: 0 Summary: NCurses Disk Usage License: MIT @@ -26,6 +25,8 @@ Url: http://dev.yorhel.nl/ncdu/ Source0: http://dev.yorhel.nl/download/ncdu-%{version}.tar.gz Source1: http://dev.yorhel.nl/download/ncdu-%{version}.tar.gz.asc +# PATCH-FIX-UPSTREAM include_sys_wait.patch https://dev.yorhel.nl/ncdu/bug/70 +Patch0: include_sys_wait.patch Source2: %{name}.keyring BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,21 +38,19 @@ %prep %setup -q +%patch0 -p1 %build %configure -%__make %{?_smp_flags} +make %{?_smp_flags} %install -%makeinstall - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%make_install %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog README COPYING -%doc %{_mandir}/man1/%{name}.1* %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* %changelog ++++++ include_sys_wait.patch ++++++ >From 29f347c19cb7ad17c4b401e1d984fce8eafaaafa Mon Sep 17 00:00:00 2001 From: Yorhel <git(a)yorhel.nl> Date: Tue, 7 Apr 2015 10:39:46 +0200 Subject: shell.c: Include sys/wait.h Required for the W* macros on OpenBSD. Reported by Brian Callahan. --- src/shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shell.c b/src/shell.c index d601b5a..eb275cd 100644 --- a/src/shell.c +++ b/src/shell.c @@ -32,6 +32,7 @@ #include <ncurses.h> #include <stdlib.h> #include <unistd.h> +#include <sys/wait.h> void shell_draw() { char *full_path; -- cgit v0.12 ++++++ ncdu-1.10.tar.gz -> ncdu-1.11.tar.gz ++++++ ++++ 1622 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/COPYING new/ncdu-1.11/COPYING --- old/ncdu-1.10/COPYING 2012-09-27 11:00:09.000000000 +0200 +++ new/ncdu-1.11/COPYING 2014-01-22 15:26:36.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (c) 2007-2012 Yoran Heling +Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/ChangeLog new/ncdu-1.11/ChangeLog --- old/ncdu-1.10/ChangeLog 2013-05-09 16:29:06.000000000 +0200 +++ new/ncdu-1.11/ChangeLog 2015-04-05 10:00:43.000000000 +0200 @@ -1,3 +1,9 @@ +1.11 - 2014-04-05 + - Added 'b' key to spawn shell in the current directory + - Support scanning (and refreshing) of empty directories + - Added --si flag for base 10 prefixes + - Fix toggle dirs before files + 1.10 - 2013-05-09 - Added 'c' key to display item counts - Added 'C' key to order by item counts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/Makefile.am new/ncdu-1.11/Makefile.am --- old/ncdu-1.10/Makefile.am 2013-04-25 08:14:55.000000000 +0200 +++ new/ncdu-1.11/Makefile.am 2014-12-14 09:16:27.000000000 +0100 @@ -12,6 +12,7 @@ src/dir_scan.c\ src/exclude.c\ src/help.c\ + src/shell.c\ src/main.c\ src/path.c\ src/util.c @@ -26,6 +27,7 @@ src/exclude.h\ src/global.h\ src/help.h\ + src/shell.h\ src/path.h\ src/util.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/README new/ncdu-1.11/README --- old/ncdu-1.10/README 2013-05-09 16:39:43.000000000 +0200 +++ new/ncdu-1.11/README 2015-04-05 10:05:08.000000000 +0200 @@ -1,4 +1,4 @@ -ncdu 1.10 +ncdu 1.11 ========= DESCRIPTION @@ -33,7 +33,7 @@ COPYING - Copyright (c) 2007-2013 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/config.h.in new/ncdu-1.11/config.h.in --- old/ncdu-1.10/config.h.in 2013-05-09 16:39:56.000000000 +0200 +++ new/ncdu-1.11/config.h.in 2015-04-05 10:05:27.000000000 +0200 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Used default shell interpreter */ +#undef DEFAULT_SHELL + /* Define to 1 if you have the `chdir' function. */ #undef HAVE_CHDIR @@ -15,6 +18,9 @@ /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD +/* Define to 1 if you have the `getenv' function. */ +#undef HAVE_GETENV + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -39,9 +45,6 @@ /* Define to 1 if you have the `rmdir' function. */ #undef HAVE_RMDIR -/* Define to 1 if you have the `setlocale' function. */ -#undef HAVE_SETLOCALE - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -61,6 +64,9 @@ `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ #undef HAVE_ST_BLOCKS +/* Define to 1 if you have the `system' function. */ +#undef HAVE_SYSTEM + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/configure.ac new/ncdu-1.11/configure.ac --- old/ncdu-1.10/configure.ac 2013-05-09 16:39:38.000000000 +0200 +++ new/ncdu-1.11/configure.ac 2015-04-05 10:05:15.000000000 +0200 @@ -1,5 +1,5 @@ -AC_INIT(ncdu, 1.10, projects(a)yorhel.nl) +AC_INIT(ncdu, 1.11, projects(a)yorhel.nl) AC_CONFIG_SRCDIR([src/global.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([foreign subdir-objects]) @@ -12,9 +12,11 @@ # Check for header files. AC_CHECK_HEADERS( - [limits.h sys/time.h sys/types.h sys/stat.h dirent.h unistd.h fnmatch.h ncurses.h locale.h],[], + [limits.h sys/time.h sys/types.h sys/stat.h dirent.h unistd.h fnmatch.h ncurses.h],[], AC_MSG_ERROR([required header file not found])) +AC_CHECK_HEADERS(locale.h) + # Check for typedefs, structures, and compiler characteristics. AC_TYPE_INT64_T AC_TYPE_UINT64_T @@ -23,7 +25,7 @@ # Check for library functions. AC_CHECK_FUNCS( - [getcwd gettimeofday fnmatch chdir rmdir unlink lstat setlocale],[], + [getcwd gettimeofday fnmatch chdir rmdir unlink lstat system getenv],[], AC_MSG_ERROR([required function missing])) @@ -53,7 +55,14 @@ ]) fi +# Configure default shell for spawning shell when $SHELL is not set +AC_ARG_WITH([shell], + [AS_HELP_STRING([--with-shell], + [used interpreter as default shell (default is /bin/sh)])], + [DEFAULT_SHELL=$withval], + [DEFAULT_SHELL=/bin/sh]) +AC_MSG_NOTICE([Using $DEFAULT_SHELL as the default shell if \$SHELL is not set]) +AC_DEFINE_UNQUOTED(DEFAULT_SHELL, "$DEFAULT_SHELL", [Used default shell interpreter]) AC_OUTPUT([Makefile]) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/doc/ncdu.pod new/ncdu-1.11/doc/ncdu.pod --- old/ncdu-1.10/doc/ncdu.pod 2013-04-12 19:27:38.000000000 +0200 +++ new/ncdu-1.11/doc/ncdu.pod 2014-12-14 09:16:27.000000000 +0100 @@ -97,6 +97,12 @@ interface in that case. It has no effect when C<-f> is used, either, because the deletion feature is disabled in that case anyway. +=item --si + +List sizes using base 10 prefixes, that is, powers of 1000 (KB, MB, etc), as +defined in the International System of Units (SI), instead of the usual base 2 +prefixes, that is, powers of 1024 (KiB, MiB, etc). + =back =head2 Scan Options @@ -204,6 +210,14 @@ Refresh/recalculate the current directory. +=item b + +Spawn shell in current directory. + +We first check the $SHELL environment variable of the user for the preferred +shell interpreter. If it's not set, we fall back to the compile time +configured default shell (usually /bin/bash). + =item q Quit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/ncdu.1 new/ncdu-1.11/ncdu.1 --- old/ncdu-1.10/ncdu.1 2013-05-09 16:39:56.000000000 +0200 +++ new/ncdu-1.11/ncdu.1 2015-04-05 09:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "NCDU 1" -.TH NCDU 1 "2013-04-12" "ncdu-1.10" "ncdu manual" +.TH NCDU 1 "2014-12-14" "ncdu-1.10g" "ncdu manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -205,6 +214,11 @@ option has no effect when \f(CW\*(C`\-o\*(C'\fR is used, because there will not be a browser interface in that case. It has no effect when \f(CW\*(C`\-f\*(C'\fR is used, either, because the deletion feature is disabled in that case anyway. +.IP "\-\-si" 4 +.IX Item "--si" +List sizes using base 10 prefixes, that is, powers of 1000 (\s-1KB, MB,\s0 etc), as +defined in the International System of Units (\s-1SI\s0), instead of the usual base 2 +prefixes, that is, powers of 1024 (KiB, MiB, etc). .SS "Scan Options" .IX Subsection "Scan Options" These options affect the scanning progress, and have no effect when importing @@ -224,7 +238,7 @@ by a newline. .IP "\-\-exclude\-caches" 4 .IX Item "--exclude-caches" -Exclude directories containing \s-1CACHEDIR\s0.TAG. The directories will still be +Exclude directories containing \s-1CACHEDIR.TAG. \s0 The directories will still be displayed, but not their content, and they are not counted towards the disk usage statistics. See http://www.brynosaurus.com/cachedir/ @@ -282,6 +296,13 @@ .IP "r" 4 .IX Item "r" Refresh/recalculate the current directory. +.IP "b" 4 +.IX Item "b" +Spawn shell in current directory. +.Sp +We first check the \f(CW$SHELL\fR environment variable of the user for the preferred +shell interpreter. If it's not set, we fall back to the compile time +configured default shell (usually /bin/bash). .IP "q" 4 .IX Item "q" Quit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/browser.c new/ncdu-1.11/src/browser.c --- old/ncdu-1.10/src/browser.c 2013-05-09 16:23:58.000000000 +0200 +++ new/ncdu-1.11/src/browser.c 2015-04-05 10:01:50.000000000 +0200 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -98,13 +98,12 @@ /* reference to parent dir has a different format */ if(n == dirlist_parent) { mvhline(row, 0, ' ', wincols); - o = graph == 0 ? 12 : - graph == 1 ? 24 : - graph == 2 ? 20 : - 31 ; - if (show_items) { + o = graph == 0 ? 13 : + graph == 1 ? 25 : + graph == 2 ? 21 : + 32 ; + if(show_items) o += 7; - } mvaddstr(row, o, "/.."); if(n->flags & FF_BSEL) attroff(A_REVERSE); @@ -142,8 +141,8 @@ x = 0; - mvprintw(row, x, "%c %8s ", ct, size); - x += 11; + mvprintw(row, x, "%c %9s ", ct, size); + x += 12; if (show_items) { if (n->items > 99999) @@ -169,7 +168,7 @@ void browse_draw() { struct dir *t; - char fmtsize[9], *tmp; + char fmtsize[10], *tmp; int selected = 0, i; erase(); @@ -188,9 +187,9 @@ /* second line - the path */ mvhline(1, 0, '-', wincols); - if(t) { + if(dirlist_par) { mvaddch(1, 3, ' '); - tmp = getpath(t->parent); + tmp = getpath(dirlist_par); mvaddstr(1, 4, cropstr(tmp, wincols-8)); mvaddch(1, 4+((int)strlen(tmp) > wincols-8 ? wincols-8 : (int)strlen(tmp)), ' '); } @@ -350,7 +349,7 @@ info_show = 0; break; case 't': - dirlist_set_sort(DL_NOCHANGE, DL_NOCHANGE, dirlist_sort_df); + dirlist_set_sort(DL_NOCHANGE, DL_NOCHANGE, !dirlist_sort_df); info_show = 0; break; case 'a': @@ -364,8 +363,8 @@ case 10: case KEY_RIGHT: case 'l': - if(sel != NULL && sel->sub != NULL) { - dirlist_open(sel->sub); + if(sel != NULL && sel->flags & FF_DIR) { + dirlist_open(sel == dirlist_parent ? dirlist_par->parent : sel); dirlist_top(-3); } info_show = 0; @@ -373,8 +372,8 @@ case KEY_LEFT: case 'h': case '<': - if(sel != NULL && sel->parent->parent != NULL) { - dirlist_open(sel->parent); + if(dirlist_par && dirlist_par->parent != NULL) { + dirlist_open(dirlist_par->parent); dirlist_top(-3); } info_show = 0; @@ -386,10 +385,10 @@ message = "Directory imported from file, won't refresh."; break; } - if(sel != NULL) { + if(dirlist_par) { dir_ui = 2; - dir_mem_init(sel->parent); - dir_scan_init(getpath(sel->parent)); + dir_mem_init(dirlist_par); + dir_scan_init(getpath(dirlist_par)); } info_show = 0; break; @@ -426,9 +425,16 @@ info_show = 0; if((t = dirlist_get(1)) == sel) if((t = dirlist_get(-1)) == sel || t == dirlist_parent) - t = sel->parent; + t = NULL; delete_init(sel, t); break; + case 'b': + if(dir_import_active) { + message = "Shell feature not available for imported directories."; + break; + } + shell_init(); + break; } /* make sure the info_* options are correct */ @@ -442,9 +448,9 @@ } -void browse_init(struct dir *cur) { +void browse_init(struct dir *par) { pstate = ST_BROWSE; message = NULL; - dirlist_open(cur); + dirlist_open(par); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/browser.h new/ncdu-1.11/src/browser.h --- old/ncdu-1.10/src/browser.h 2012-09-27 11:00:09.000000000 +0200 +++ new/ncdu-1.11/src/browser.h 2014-01-22 15:24:08.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/delete.c new/ncdu-1.11/src/delete.c --- old/ncdu-1.10/src/delete.c 2012-09-27 11:00:09.000000000 +0200 +++ new/ncdu-1.11/src/delete.c 2014-08-03 15:08:27.000000000 +0200 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -209,11 +209,13 @@ void delete_process() { + struct dir *par; + /* confirm */ seloption = 1; while(state == DS_CONFIRM && !noconfirm) if(input_handle(0)) { - browse_init(root); + browse_init(root->parent); return; } @@ -229,13 +231,13 @@ /* delete */ seloption = 0; state = DS_PROGRESS; - if(delete_dir(root)) - browse_init(root); - else { + par = root->parent; + delete_dir(root); + if(nextsel) nextsel->flags |= FF_BSEL; - browse_init(nextsel); + browse_init(par); + if(nextsel) dirlist_top(-4); - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/delete.h new/ncdu-1.11/src/delete.h --- old/ncdu-1.10/src/delete.h 2012-09-27 11:00:09.000000000 +0200 +++ new/ncdu-1.11/src/delete.h 2014-08-03 15:08:27.000000000 +0200 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir.h new/ncdu-1.11/src/dir.h --- old/ncdu-1.10/src/dir.h 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/dir.h 2014-01-22 15:24:24.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir_common.c new/ncdu-1.11/src/dir_common.c --- old/ncdu-1.10/src/dir_common.c 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/dir_common.c 2014-01-22 15:24:29.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir_export.c new/ncdu-1.11/src/dir_export.c --- old/ncdu-1.10/src/dir_export.c 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/dir_export.c 2014-01-22 15:24:33.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir_import.c new/ncdu-1.11/src/dir_import.c --- old/ncdu-1.10/src/dir_import.c 2013-04-12 19:35:27.000000000 +0200 +++ new/ncdu-1.11/src/dir_import.c 2014-01-22 15:24:37.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -547,8 +547,6 @@ if(!isroot) dir_curpath_leave(); - else /* The root item must not be empty. */ - E(ctx->items <= 1, "Empty directory"); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir_mem.c new/ncdu-1.11/src/dir_mem.c --- old/ncdu-1.10/src/dir_mem.c 2013-04-25 08:10:45.000000000 +0200 +++ new/ncdu-1.11/src/dir_mem.c 2014-01-22 15:24:43.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -198,7 +198,7 @@ freedir(orig); } - browse_init(root->sub); + browse_init(root); dirlist_top(-3); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dir_scan.c new/ncdu-1.11/src/dir_scan.c --- old/ncdu-1.10/src/dir_scan.c 2013-04-12 19:42:25.000000000 +0200 +++ new/ncdu-1.11/src/dir_scan.c 2014-01-24 11:28:09.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -266,12 +266,6 @@ if(!dir_fatalerr && !(dir = dir_read(&fail))) dir_seterr("Error reading directory: %s", strerror(errno)); - /* Special case: empty directory = error */ - if(!dir_fatalerr && !*dir) { - dir_seterr("Directory empty"); - free(dir); - } - if(!dir_fatalerr) { curdev = (uint64_t)fs.st_dev; d = dir_createstruct(dir_curpath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dirlist.c new/ncdu-1.11/src/dirlist.c --- old/ncdu-1.10/src/dirlist.c 2013-01-18 10:12:16.000000000 +0100 +++ new/ncdu-1.11/src/dirlist.c 2014-01-22 15:24:52.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -29,7 +29,8 @@ /* public variables */ -struct dir *dirlist_parent = NULL; +struct dir *dirlist_parent = NULL, + *dirlist_par = NULL; int64_t dirlist_maxs = 0, dirlist_maxa = 0; @@ -186,29 +187,33 @@ void dirlist_open(struct dir *d) { + dirlist_par = d; + /* set the head of the list */ - head_real = head = d == NULL ? NULL : d->parent == NULL ? d->sub : d->parent->sub; + head_real = head = d == NULL ? NULL : d->sub; /* reset internal status */ dirlist_maxs = dirlist_maxa = 0; /* stop if this is not a directory list we can work with */ - if(head == NULL) { + if(d == NULL) { dirlist_parent = NULL; return; } /* sort the dir listing */ - head_real = head = dirlist_sort(head); + if(head) + head_real = head = dirlist_sort(head); /* set the reference to the parent dir */ dirlist_parent_alloc.flags &= ~FF_BSEL; - if(head->parent->parent) { + dirlist_parent_alloc.flags |= FF_DIR; + if(d->parent) { dirlist_parent = &dirlist_parent_alloc; strcpy(dirlist_parent->name, ".."); dirlist_parent->next = head; - dirlist_parent->parent = head->parent; - dirlist_parent->sub = head->parent; + dirlist_parent->parent = d; + dirlist_parent->sub = d; head = dirlist_parent; } else dirlist_parent = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/dirlist.h new/ncdu-1.11/src/dirlist.h --- old/ncdu-1.10/src/dirlist.h 2013-01-18 10:12:16.000000000 +0100 +++ new/ncdu-1.11/src/dirlist.h 2014-01-22 15:24:56.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -68,6 +68,9 @@ /* The 'reference to parent dir' */ extern struct dir *dirlist_parent; +/* The actual parent dir */ +extern struct dir *dirlist_par; + /* current sorting configuration (set with dirlist_set_sort()) */ extern int dirlist_sort_desc, dirlist_sort_col, dirlist_sort_df; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/exclude.c new/ncdu-1.11/src/exclude.c --- old/ncdu-1.10/src/exclude.c 2013-05-09 16:22:04.000000000 +0200 +++ new/ncdu-1.11/src/exclude.c 2014-01-22 15:25:00.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/exclude.h new/ncdu-1.11/src/exclude.h --- old/ncdu-1.10/src/exclude.h 2013-04-12 19:27:38.000000000 +0200 +++ new/ncdu-1.11/src/exclude.h 2014-01-22 15:25:04.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/global.h new/ncdu-1.11/src/global.h --- old/ncdu-1.10/src/global.h 2013-04-12 19:27:38.000000000 +0200 +++ new/ncdu-1.11/src/global.h 2014-12-14 09:21:26.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -55,6 +55,7 @@ #define ST_BROWSE 1 #define ST_DEL 2 #define ST_HELP 3 +#define ST_SHELL 4 /* structure representing a file or directory */ @@ -102,5 +103,6 @@ #include "help.h" #include "path.h" #include "util.h" +#include "shell.h" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/help.c new/ncdu-1.11/src/help.c --- old/ncdu-1.10/src/help.c 2013-01-18 10:12:16.000000000 +0100 +++ new/ncdu-1.11/src/help.c 2014-12-14 09:19:20.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -32,7 +32,7 @@ int page, start; -#define KEYS 16 +#define KEYS 17 char *keys[KEYS*2] = { /*|----key----| |----------------description----------------|*/ "up, k", "Move cursor up", @@ -50,6 +50,7 @@ "e", "Show/hide hidden or excluded files", "i", "Show information about selected item", "r", "Recalculate the current directory", + "b", "Spawn shell in current directory", "q", "Quit ncdu" }; @@ -60,7 +61,7 @@ browse_draw(); nccreate(15, 60, "ncdu help"); - ncaddstr(13, 38, "Press q to continue"); + ncaddstr(13, 42, "Press q to close"); if(page == 1) attron(A_REVERSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/help.h new/ncdu-1.11/src/help.h --- old/ncdu-1.10/src/help.h 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/help.h 2014-01-22 15:25:19.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/main.c new/ncdu-1.11/src/main.c --- old/ncdu-1.10/src/main.c 2013-04-25 08:10:12.000000000 +0200 +++ new/ncdu-1.11/src/main.c 2014-12-14 09:16:27.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -32,7 +32,6 @@ #include <unistd.h> #include <sys/time.h> -#include <locale.h> #include <yopt.h> @@ -53,6 +52,7 @@ case ST_CALC: dir_draw(); break; case ST_BROWSE: browse_draw(); break; case ST_HELP: help_draw(); break; + case ST_SHELL: shell_draw(); break; case ST_DEL: delete_draw(); break; } } @@ -127,10 +127,12 @@ { 1, 1, "--exclude" }, { 'X', 1, "-X,--exclude-from" }, { 'C', 0, "--exclude-caches" }, + { 's', 0, "--si" }, {0,0,NULL} }; dir_ui = -1; + si = 0; yopt_init(&yopt, argc, argv, opts); while((v = yopt_next(&yopt, &val)) != -1) { @@ -146,6 +148,7 @@ printf(" -o FILE Export scanned directory to FILE\n"); printf(" -f FILE Import scanned directory from FILE\n"); printf(" -0,-1,-2 UI to use when scanning (0=none,2=full ncurses)\n"); + printf(" --si Use base 10 (SI) prefixes instead of base 2\n"); printf(" --exclude PATTERN Exclude files that match PATTERN\n"); printf(" -X, --exclude-from FILE Exclude files that match any pattern in FILE\n"); printf(" --exclude-caches Exclude directories containing CACHEDIR.TAG\n"); @@ -156,6 +159,7 @@ exit(0); case 'x': dir_scan_smfs = 1; break; case 'r': read_only = 1; break; + case 's': si = 1; break; case 'o': export = val; break; case 'f': import = val; break; case '0': dir_ui = 0; break; @@ -251,7 +255,6 @@ /* main program */ int main(int argc, char **argv) { - setlocale(LC_ALL, ""); read_locale(); argv_parse(argc, argv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/path.c new/ncdu-1.11/src/path.c --- old/ncdu-1.10/src/path.c 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/path.c 2014-01-22 15:25:27.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/path.h new/ncdu-1.11/src/path.h --- old/ncdu-1.10/src/path.h 2012-09-27 11:00:10.000000000 +0200 +++ new/ncdu-1.11/src/path.h 2014-01-22 15:25:42.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/shell.c new/ncdu-1.11/src/shell.c --- old/ncdu-1.10/src/shell.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ncdu-1.11/src/shell.c 2014-12-14 15:13:08.000000000 +0100 @@ -0,0 +1,78 @@ +/* ncdu - NCurses Disk Usage + + Copyright (c) 2007-2014 Yoran Heling + Shell support: Copyright (c) 2014 Thomas Jarosch + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +#include "config.h" +#include "global.h" +#include "dirlist.h" +#include "util.h" + +#include <ncurses.h> +#include <stdlib.h> +#include <unistd.h> + +void shell_draw() { + char *full_path; + int res; + + /* suspend ncurses mode */ + def_prog_mode(); + endwin(); + + full_path = getpath(dirlist_par); + res = chdir(full_path); + if (res != 0) { + reset_prog_mode(); + clear(); + printw("ERROR: Can't change directory: %s (errcode: %d)\n" + "\n" + "Press any key to continue.", + full_path, res); + } else { + char *shell = getenv("SHELL"); + if (shell == NULL) + shell = DEFAULT_SHELL; + + res = system(shell); + + /* resume ncurses mode */ + reset_prog_mode(); + + if (res == -1 || !WIFEXITED(res) || WEXITSTATUS(res) == 127) { + clear(); + printw("ERROR: Can't execute shell interpreter: %s\n" + "\n" + "Press any key to continue.", + shell); + } + } + + refresh(); + pstate = ST_BROWSE; +} + +void shell_init() { + pstate = ST_SHELL; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/shell.h new/ncdu-1.11/src/shell.h --- old/ncdu-1.10/src/shell.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ncdu-1.11/src/shell.h 2014-12-14 09:22:01.000000000 +0100 @@ -0,0 +1,35 @@ +/* ncdu - NCurses Disk Usage + + Copyright (c) 2007-2014 Yoran Heling + Shell support: Copyright (c) 2014 Thomas Jarosch + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +#ifndef _shell_h +#define _shell_h + +#include "global.h" + +void shell_draw(void); +void shell_init(); + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/util.c new/ncdu-1.11/src/util.c --- old/ncdu-1.10/src/util.c 2013-01-18 10:12:16.000000000 +0100 +++ new/ncdu-1.11/src/util.c 2014-04-30 12:25:48.000000000 +0200 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -28,10 +28,14 @@ #include <string.h> #include <stdlib.h> #include <ncurses.h> +#include <stdarg.h> +#ifdef HAVE_LOCALE_H #include <locale.h> +#endif int winrows, wincols; int subwinr, subwinc; +int si; char thou_sep; @@ -57,17 +61,29 @@ char *formatsize(int64_t from) { - static char dat[9]; /* "xxx.xMiB" */ + static char dat[10]; /* "xxx.x MiB" */ float r = from; char c = ' '; - if(r < 1000.0f) { } - else if(r < 1023e3f) { c = 'K'; r/=1024.0f; } - else if(r < 1023e6f) { c = 'M'; r/=1048576.0f; } - else if(r < 1023e9f) { c = 'G'; r/=1073741824.0f; } - else if(r < 1023e12f){ c = 'T'; r/=1099511627776.0f; } - else if(r < 1023e15f){ c = 'P'; r/=1125899906842624.0f; } - else { c = 'E'; r/=1152921504606846976.0f; } - sprintf(dat, "%5.1f%c%cB", r, c, c == ' ' ? ' ' : 'i'); + if (si) { + if(r < 1000.0f) { } + else if(r < 1e6f) { c = 'K'; r/=1e3f; } + else if(r < 1e9f) { c = 'M'; r/=1e6f; } + else if(r < 1e12f){ c = 'G'; r/=1e9f; } + else if(r < 1e15f){ c = 'T'; r/=1e12f; } + else if(r < 1e18f){ c = 'P'; r/=1e15f; } + else { c = 'E'; r/=1e18f; } + sprintf(dat, "%5.1f %cB", r, c); + } + else { + if(r < 1000.0f) { } + else if(r < 1023e3f) { c = 'K'; r/=1024.0f; } + else if(r < 1023e6f) { c = 'M'; r/=1048576.0f; } + else if(r < 1023e9f) { c = 'G'; r/=1073741824.0f; } + else if(r < 1023e12f){ c = 'T'; r/=1099511627776.0f; } + else if(r < 1023e15f){ c = 'P'; r/=1125899906842624.0f; } + else { c = 'E'; r/=1152921504606846976.0f; } + sprintf(dat, "%5.1f %c%cB", r, c, c == ' ' ? ' ' : 'i'); + } return dat; } @@ -99,12 +115,13 @@ void read_locale() { + thou_sep = '.'; +#ifdef HAVE_LOCALE_H + setlocale(LC_ALL, ""); char *locale_thou_sep = localeconv()->thousands_sep; - if (locale_thou_sep && 1 == strlen(locale_thou_sep)) { + if(locale_thou_sep && 1 == strlen(locale_thou_sep)) thou_sep = locale_thou_sep[0]; - } else { - thou_sep = '.'; - } +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncdu-1.10/src/util.h new/ncdu-1.11/src/util.h --- old/ncdu-1.10/src/util.h 2013-01-18 10:12:16.000000000 +0100 +++ new/ncdu-1.11/src/util.h 2014-01-22 15:25:53.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2012 Yoran Heling + Copyright (c) 2007-2014 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -35,6 +35,9 @@ /* used by the nc* functions and macros */ extern int subwinr, subwinc; +/* used by formatsize to choose between base 2 or 10 prefixes */ +extern int si; + /* Instead of using several ncurses windows, we only draw to stdscr. * the functions nccreate, ncprint and the macros ncaddstr and ncaddch

1 0

commit grc for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package grc for openSUSE:Factory checked in at 2016-05-05 08:12:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grc (Old) and /work/SRC/openSUSE:Factory/.grc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grc" Changes: -------- New Changes file: --- /dev/null 2016-04-07 01:36:33.300037506 +0200 +++ /work/SRC/openSUSE:Factory/.grc.new/grc.changes 2016-05-05 08:12:41.000000000 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Apr 9 11:11:11 UTC 2015 - sor.alexei(a)meowr.ru + +- Initial package. New: ---- conf.osc grc-1.9.tar.gz grc.changes grc.spec quilt-feature-osc-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grc.spec ++++++ # # spec file for package grc # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: grc Version: 1.9 Release: 0 Summary: Generic colouriser for everything License: GPL-2.0+ Group: System/Console Url: http://kassiopeia.juls.savba.sk/~garabik/software/grc.html Source: https://github.com/garabik/grc/archive/v%{version}.tar.gz#/grc-%{version}.t… # https://github.com/simotek/grc-osc-conf Source1: conf.osc Patch0: quilt-feature-osc-build.patch BuildArch: noarch %description Generic Colouriser is yet another colouriser for beautifying your logfiles or commands output. %prep %setup -q %patch0 %build # Nothing to build. %install install -Dm 0755 grc %{buildroot}%{_bindir}/grc install -Dm 0755 grcat %{buildroot}%{_bindir}/grcat install -Dm 0644 grc.conf %{buildroot}%{_sysconfdir}/grc.conf install -Dm 0644 grc.bashrc %{buildroot}%{_sysconfdir}/profile.d/grc.bash install -Dm 0644 grc.1 %{buildroot}%{_mandir}/man1/grc.1 install -Dm 0644 grcat.1 %{buildroot}%{_mandir}/man1/grcat.1 mkdir -p %{buildroot}%{_datadir}/grc/ install -m 0644 conf.* %{buildroot}%{_datadir}/grc/ install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/grc/ %files %defattr(-,root,root) %doc COPYING CREDITS README TODO Regexp.txt debian/changelog debian/copyright %config(noreplace) %{_sysconfdir}/grc.conf %config %{_sysconfdir}/profile.d/grc.bash %{_bindir}/grc* %{_datadir}/grc/ %{_mandir}/man?/grc* %changelog ++++++ conf.osc ++++++ # # The following config file is designed for osc build, it is based off the # gcc and configure config files. # # Author: Simon Lees sflees(a)suse.de # Source: https://github.com/simotek/grc-osc-conf # License: GPL-2.0+ # # ......... # # From gcc # regexp=\sgcc\s colours=bold blue count=more ......... # regexp=^[^:\s]*?:\d+: colours=bold magenta ......... regexp=^[^:\s]*?: colours=cyan count=once ......... # regexp=\`[A-Za-z0-9_():&*]+( const)?\' colours=magenta ......... # -O regexp=\-O\d colours=green ......... # -o regexp=\-o\s[^\s]+ colours=bold magenta ......... # warning and error won't work, unless you redirect also # stderr to grcat # # warning regexp=warning:.* colours=white ......... regexp=warning: colours=bold yellow count=once ......... # error regexp=error:.* colours=bold white ......... regexp=error: colours=bold white on_red count=once ......... # # Configure # #note regexp=note: colours=bold cyan count=once ......... regexp=^checking colours=bold blue ......... regexp=\.\.\. .*$ colours=bold blue ......... regexp=\.\.\. yes$ colours=bold cyan ......... regexp=\.\.\. no$ colours=bold red ......... regexp=\.\.\.[ ] colours=default ......... # # osc build # # Timestamp - take advantage of coming first regexp=\[ colours= bold black count=once ......... regexp=\] colours= bold black count=once ......... # Timestamp - take advantage of coming first regexp=[0-9]+s colours= magenta count=once ......... regexp=cumulate colours= bold cyan ......... regexp=Provides: colours= bold cyan ......... regexp=Requires: colours= bold blue ......... regexp=Requires$rpmlib$: colours= bold blue ......... regexp=cycle: colours= bold blue ......... regexp=breaking dependency colours= bold cyan ......... regexp=-> colours= bold magenta ......... regexp=Processing files: colours= yellow ......... regexp=Executing$%[A-Za-z]+$: colours= yellow ......... regexp=Preparing packages... colours= yellow ......... regexp=\smake\s colours=yellow count=once ......... regexp=./configure colours=yellow count=once ......... regexp=Patch #[0-9]+ colours=bold yellow count=once ......... regexp=(make)(\[)(\d+)(\]) colours=bold blue,green,bold blue,red count=once ......... # RPMlint warnings regexp= [^\]]*W:[^\[]* colours= bold yellow ......... # RPMlint Errors regexp= [^\]]*E:[^\[]* colours= bold red ......... # Match paths #regexp= \b/.*/[^\b]* regexp= ["']*/[^\s]+ colours= cyan ......... # Match paths regexp= /bin/[^\s"']+ colours= blue ......... # Match paths regexp= /usr/bin/[^\s"']+ colours= blue ......... regexp=[^/\s\"]*\.spec colours= blue ......... regexp=[^/\s\"]*\.rpm colours= green ......... regexp=[^/\s\"]*\.patch colours= blue ......... # match for [ XX/YYY] regexp=(\s*\d+)(/)(\s*\d+) colours= blue,magenta,bold black ......... # match for [ XX/YYY] regexp=(\[)(\s*\d+)(/)(\s*\d+)(\]) colours= bold black,bold black,magenta,bold black,blue ......... # match setters regexp=[-=]{3,} colours= yellow ++++++ quilt-feature-osc-build.patch ++++++ Index: ogrc.conf =================================================================== --- grc.conf +++ grc.conf @@ -81,3 +81,8 @@ conf.mount # df (^|[/\w\.]+/)df\s? conf.df + +# osc build +(^|[/\w\.]+/)osc build\s? +conf.osc +

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2016-05-05 08:12:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2016-03-31 13:03:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2016-05-05 08:12:37.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Apr 21 23:06:02 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 20160422 +* :::+ and ::::+ work like ::: and :::: but links this input source + to the previous input source in a --xapply fashion. Contrary to + --xapply values do not wrap: The shortest input source determines + the length. +* --line-buffer --keep-order now outputs continuously from the + oldest job still running. This is more what you would expect than + the earlier behaviour where --keep-order had no effect with + --line-buffer. +* env_parallel supports tcsh, csh, pdksh. In fish it now supports + arrays. In csh/tcsh it now supports variables, aliases, and + arrays with no special chars. In pdksh it supports aliases, + functions, variables, and arrays. + +------------------------------------------------------------------- Old: ---- parallel-20160322.tar.bz2 parallel-20160322.tar.bz2.sig New: ---- parallel-20160422.tar.bz2 parallel-20160422.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.RHTBwL/_old 2016-05-05 08:12:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RHTBwL/_new 2016-05-05 08:12:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20160322 +Version: 20160422 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0+ ++++++ parallel-20160322.tar.bz2 -> parallel-20160422.tar.bz2 ++++++ ++++ 8020 lines of diff (skipped) ++++++ parallel-20160322.tar.bz2.sig -> parallel-20160422.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20160322.tar.bz2.sig 2016-03-31 13:03:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20160422.tar.bz2.sig 2016-05-05 08:12:37.000000000 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160322.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160422.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQTwBAABCgAGBQJW8aS/AAoJENGrRRaIiIiITKEmn1PN+74+Ojeq3SIe6W2PK0a1 -VoqdfAraZwSavHpcWFFwLVisYmVHROiLDxVr1msfkp0alD4h/Bsu75vIc/8e5UV3 -SyoqHJi9bb5qq1ZwJz9EC++jmms76Tow8MOnkv9nc9836I6b1YdoKXwpU/MVtf22 -rf+OYzIL4WuBxjoZn9ruuKkwgbsm/sQSsi4GrD0FB/Lsydl7N0/qtYwGqniXE2ZS -SwX42nCKpIH0KDNFxmfn7UsWN4TS/x/h5av9xjeI8IY9qGaZwZyaX7ce0QwAs1pS -JS34cr85VDzylEYM8GXePSrehNdlBOsbB0ED2p/4VlKgNNy0tvtm4s5ddkXc5dDJ -qUu+2T9IS9ydVJ0FpFI7WZwOX97DbPQIXDQRRprOf93BXYrDXgjsXpNBBERAS8yD -JtcxXnMUSgWV4a7XnvZ11r4k4j44QoYJP2QuS+lms5fVVlulaCtUAMvhtY7XEhtw -pI0pjz9Dfmm7U72EhG+Zoh+w8S2gU9wV0G2cs05YuSUEQvFNN7JqNcJdBfeb+hwk -QQI2dWEiucvNN/y7p+NGZk+/jqWro3IGYfmieoXS5CTKyB+bWlkq31uxQhmA5SDv -8rF2YIq1HpuVEBm2T5Q4m7n1mVTxocG2pat/pVC0XSYsPgWpYxeTX+970p0q+y4Y -Krn+3olqISVHciOOi0YCio0YsLTdp/KQ5VtPJYq5ST1yEvlkSU6+tYgkIb9YU/tX -iydSswg5C6vg2FxE7+QB7LN65xqBccwCLMt/ekzKqFoH/4X9jAOsx3cKWVdk3E6B -mdxSi1ChHpqUg8F0bOKR/CaykOBhdIkC9kJfM446hhQCrQRB95M38q03dnddIiQh -ztXS7Z+B+abuv2SBqJMVTQEZwOFnl6NJFaO02coxR6vUDDGC9PUx1lV/o+zqPgZC -Mbf2CFOLI0fhLMm7ZbLggBPjSXxTfRu5zfV0G7uXIDnh7Gwi7b4+mf/HeHfGBds/ -q0MTkHNwl+Q+a/nXd+0BUanRBJ/7uN8idI+SzSp0e+cbq9Tp4Kz60P1v7ECxk/TX -mrJTRgvSgD6aQvd+PkdsBBARO10KHW8FxAc7+9jUh9UChOYoQUlafs6c5u4mIJo+ -0pqqq7TBzQB2YbixYrIZ02yZl3MWyu2rjT9f9VmQFPp+ZSu7Qwe9NpiRttOev/Jp -fxwwSSBCxPPEPI79DhW79fXllKb6YSjXFh2TfrtW8FJeib/H+eY/hykVgsmFzsam -mJ/4RwsdWAxomWUrD8rkcuxFdWSsaE8WhaGROKKsPgDOybp7I8iQH0y2hAxbBucg -iCCh28ubuuSfKY8kpgC7q0SYEEzl7d9CSEGCxCtzTa3MY0XeaPXvjXG3VXCh9qXl -agcekDsoiWUWgvmIa+V5sUpdYwQKwkoR8OSlu4KMs9QjkNLxgUrsaEDnaUTjRA3O -sS/QjrZdZbLS262f0E0NeEI2ft9LVRt+cydfCws/P+vgkOxku8m1cncxlBsXsxXj -C6xsjRwsFvQSOyV6BShMmR4vm8DsYeC4M2XqUaZwt11+96AYAskIeeShDq8LKKaW -s+zWDnuY1GcvUroxTChI5Qh1+zNSv0w3vnZr/PQ6qVxIRv94l5B47Y5FjcEuCxA9 -BEAExmR8ns7qai+/s2kMXvkHWg== -=X2Qh +iQTwBAABCgAGBQJXGVUFAAoJENGrRRaIiIiIE7EmoIIrlLxZ0a+wg58gJMLBWpnz +bP3rAp9FYdtvo/yK1Me8xdFFXgV5PbxA71h4NzREn0nZ0f0+mOYdH/BOdCySApKh +Pl37RySm84GBmy+M26x6oqFXniy3/6jwCkIi0rg0D/M+AipBCfyB5mZC6294CCGv +A/5tqZak1smosNtAMjlZaLiJI4fAGmxomyLCJtrW0jnckMNNKPRumvHf7NvfVZu+ +ZHKOekznZrLR/3DRzlNltR4AHUb1YMoz/ybJ3AWPihTVmFHY70BufFEV2nvFGsP5 +UVkuigAFseLpJCYoKatHS0zoR5u6YOIeesUl8Y2r7lw+sTl47LXE3kBv0bYDYL6M +se1dWkCpMJT5l75ABgM3jcE7Yt3sKtNbVfsluist7RazqElFa5KZcMlZ9Tcw4Ajd +oPZy7IAn+gpsHWbevK0upKLbyiGZTOFHfTXLU7vMX87ff4z4BM0JjAGW9Z1NbKeY +V6pg9FTCb87y4Yg+tlHGYy6UJDrEa0S0X9olBicNbT9ZrSfDokZZwaXAoljRjtlC +fYm4pHQIsF1hiu8s2naKg0AnopfqCYQ+FLmGm4QAKDvkubM5t/5+go5Y1QRKzKiX +rAH8JGktV5XHky+nsgPr8zSdmLk1AKFOF2iLDAp6MrohaKUUuF4W+nwf6+DCntNF +CSbUAvdxFcAhKLXN68j4MlTpKmH7420zGOVp6kf263jlUamRCjdA2pmK4rOy2/66 +Nupj6YgHVvHs1563gg5+OFqDfTuJxtM7P7wX2Le1x3KpCMa3YkdBhHg0PiMRF4C6 +dFNZ4Lryg2ShvL4AwDl9L7g2A8D24qkR077Da2vGYyDUfkgfC7Yxsp4HuARe3k4f +UAopONdsRhSFPGeAy68hE3oEyIifeCXSeqjB8GGoTukiHyLAyRms6crkmoDHICae +cdNiGsAtt5K0WDlCKVNfEPGb39y8LqpzlyAdlQlcryec9pZyowHuPcomyOmY3qGJ +t4LuojyUSGG+TW3LNy223oQQs6dbOB1eEMQxMF0PXodrmR1NOrRub1xXXQJ9OxOV +PjoteASAqtYIZPqrJoi501/8e11XOHBtwWgJk2NAYYZ7VjWeX/r6f/CrV1aoWYwq +zVBJNBI81qVJQHrAmkDL1BgX8znRJYMzfbcKj0rNxRiyGT5+BHH5IT946xD2QjA/ +9JhrIcbrKurotl4VazozAZ/B9M4SFUASxcVX9+BNouxgSVXZj/t8YxJg3vn4Zjl6 +4tZOECy+EyjfkLKC75t3CowYeHkC0w5CrnkHs6Mlt7t871hiGAg9NVXwSZlvZiax +hE7ojzZr/x8fjKK60Pk5wpoHpgSrZwg1I6TpiuAgWD6NwL++ib5aUbB1Y1rl1foe +k2mqKcxajzGhj8t2ibekk4Am7y6XoEdKNiU6O5vQLyaD04WeZjSmYG4sMsTwG+Dw +CXlPURSCythJNS02ZVlOqt5Se5Ubl3wDnWgkALapda/EVgJxbu2/rAJxd7fbZ3y8 +ngQyT6/mmJ7OhuSo/p8FOB/g1ibvavsM+8WZD92u2wqcaZHXcc9iHlGktlWLdwH8 +OQ8JknJdpqZNFNXHMXUWt/Z4UVMMivHdgxZZcVZ281h7aTPEHHQuXhsrO61UzNiT +3dDYNQmCG4yUNWjjCOns2aY/cg== +=k1T8 -----END PGP SIGNATURE-----

1 0

commit QCSXCAD for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package QCSXCAD for openSUSE:Factory checked in at 2016-05-05 08:12:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QCSXCAD (Old) and /work/SRC/openSUSE:Factory/.QCSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QCSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/QCSXCAD/QCSXCAD.changes 2015-11-26 17:01:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.QCSXCAD.new/QCSXCAD.changes 2016-05-05 08:12:29.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 21 07:52:31 UTC 2016 - dmitry_r(a)opensuse.org + +- Fix build with VTK 7 + * QCSXCAD-vtk7-support.patch + +------------------------------------------------------------------- New: ---- QCSXCAD-vtk7-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.ud6Ayg/_old 2016-05-05 08:12:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ud6Ayg/_new 2016-05-05 08:12:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package QCSXCAD # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,9 @@ Name: QCSXCAD Version: 0.6.0 +Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} -Release: 0 Summary: Qt-GUI for CSXCAD library License: LGPL-3.0 Group: Productivity/Graphics/CAD @@ -30,6 +30,8 @@ Patch1: QCSXCAD-no-build-date.patch # PATCH-FIX-UPSTREAM QCSXCAD-vtk.patch -- Fix build with VTK 6.3 Patch2: QCSXCAD-vtk.patch +# PATCH-FIX-UPSTREAM QCSXCAD-vtk7-support.patch -- Fix build with VTK 7 +Patch3: QCSXCAD-vtk7-support.patch BuildRequires: CSXCAD-devel BuildRequires: cmake BuildRequires: tinyxml-devel @@ -37,7 +39,7 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xt) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,6 +69,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake ++++++ QCSXCAD-vtk7-support.patch ++++++ Index: QCSXCAD-0.6.0/QVTKStructure.cpp =================================================================== --- QCSXCAD-0.6.0.orig/QVTKStructure.cpp +++ QCSXCAD-0.6.0/QVTKStructure.cpp @@ -311,7 +311,7 @@ void QVTKStructure::RenderGridDir(int di } vtkRectilinearGridGeometryFilter *grid_plane = vtkRectilinearGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Rect_Grid); #else grid_plane->SetInput(m_Rect_Grid); @@ -348,7 +348,7 @@ void QVTKStructure::RenderGridDir(int di vtkStructuredGridGeometryFilter *grid_plane = vtkStructuredGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Struct_Grid); #else grid_plane->SetInput(m_Struct_Grid); Index: QCSXCAD-0.6.0/VTKPrimitives.cpp =================================================================== --- QCSXCAD-0.6.0.orig/VTKPrimitives.cpp +++ QCSXCAD-0.6.0/VTKPrimitives.cpp @@ -52,7 +52,7 @@ #include "vtkDiskSource.h" #include "vtkPLYWriter.h" -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) #include "vtkBooleanOperationPolyDataFilter.h" #endif @@ -192,7 +192,7 @@ void VTKPrimitives::AddCylindricalCube(d return; vtkRotationalExtrusionFilter *extrude = vtkRotationalExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputConnection(PDSource->GetOutputPort()); #else extrude->SetInput(PDSource->GetOutput()); @@ -297,7 +297,7 @@ void VTKPrimitives::AddClosedPoly(double profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -360,7 +360,7 @@ void VTKPrimitives::AddTubePoly(const do vtkTubeFilter* m_profileTubes = vtkTubeFilter::New(); m_profileTubes->SetNumberOfSides(iResolution); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_profileTubes->SetInputData(profile); #else m_profileTubes->SetInput(profile); @@ -404,7 +404,7 @@ void VTKPrimitives::AddCylinder(const do transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -431,7 +431,7 @@ void VTKPrimitives::AddCylindricalShell( // extrude in +z vtkLinearExtrusionFilter *linearExtrusionFilter = vtkLinearExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 linearExtrusionFilter->SetInputConnection( diskSource->GetOutputPort() ); #else linearExtrusionFilter->SetInput( diskSource->GetOutput() ); @@ -484,7 +484,7 @@ void VTKPrimitives::AddSphere(const doub void VTKPrimitives::AddSphericalShell(const double *dCenter, double r_i, double r_o, double *dRGB, double dOpacity, int iResolution, const double* tf_matrix) {//complete -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) vtkSphereSource *Source_o = vtkSphereSource::New(); double center[3]={dCenter[0],dCenter[1],dCenter[2]}; Source_o->SetCenter(center); @@ -540,7 +540,7 @@ void VTKPrimitives::AddArrow(double *dSt transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -563,7 +563,7 @@ void VTKPrimitives::AddLabel(char *cText vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputConnection(text->GetOutputPort()); #else filter->SetInput(text->GetOutput()); @@ -626,7 +626,7 @@ void VTKPrimitives::AddRotationalPoly(co profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -695,7 +695,7 @@ void VTKPrimitives::AddRotationalSolid(c profile->SetPoints(points); profile->SetLines(poly); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputData(profile); #else extrude->SetInput(profile); @@ -768,7 +768,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk { vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(polydata); #else filter->SetInput(polydata); @@ -777,7 +777,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -811,7 +811,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -854,7 +854,7 @@ void VTKPrimitives::WritePolyData2File(c if (scale==1.0) { -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(m_PolyDataCollection->GetOutput()); #else writer->SetInput(m_PolyDataCollection->GetOutput()); @@ -866,7 +866,7 @@ void VTKPrimitives::WritePolyData2File(c vtkTransform *transform = vtkTransform::New(); vtkTransformPolyDataFilter *transformFilter = vtkTransformPolyDataFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputData(m_PolyDataCollection->GetOutput()); #else transformFilter->SetInput(m_PolyDataCollection->GetOutput()); @@ -874,7 +874,7 @@ void VTKPrimitives::WritePolyData2File(c transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -894,7 +894,7 @@ void VTKPrimitives::WritePolyData2STL(co vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -916,7 +916,7 @@ void VTKPrimitives::WritePolyData2STL(co transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -936,7 +936,7 @@ void VTKPrimitives::WritePolyData2PLY(co vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -959,7 +959,7 @@ void VTKPrimitives::WritePolyData2PLY(co transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); Index: QCSXCAD-0.6.0/CMakeLists.txt =================================================================== --- QCSXCAD-0.6.0.orig/CMakeLists.txt +++ QCSXCAD-0.6.0/CMakeLists.txt @@ -121,7 +121,7 @@ else() QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) endif() -if("${VTK_MAJOR_VERSION}" EQUAL 6) +if("${VTK_MAJOR_VERSION}" GREATER 5) set( vtk_LIBS ${VTK_LIBRARIES} ) else() set( vtk_LIBS

1 0

commit installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2016-05-05 08:12:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2016-05-03 09:34:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2016-05-05 08:12:23.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 3 12:38:22 CEST 2016 - snwint(a)suse.com + +- adjust config to new 'hiddenmenu' feature (bsc#976836) +- 14.240 + +------------------------------------------------------------------- Old: ---- installation-images-14.239.tar.xz New: ---- installation-images-14.240.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.lzgUvm/_old 2016-05-05 08:12:24.000000000 +0200 +++ /var/tmp/diff_new_pack.lzgUvm/_new 2016-05-05 08:12:24.000000000 +0200 @@ -43,9 +43,9 @@ %else BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini +%endif BuildRequires: noto-sans-fonts BuildRequires: google-roboto-fonts -%endif %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif @@ -372,7 +372,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.239 +Version: 14.240 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz ++++++ installation-images-14.239.tar.xz -> installation-images-14.240.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.239/VERSION new/installation-images-14.240/VERSION --- old/installation-images-14.239/VERSION 2016-04-28 11:57:01.000000000 +0200 +++ new/installation-images-14.240/VERSION 2016-05-02 15:56:56.000000000 +0200 @@ -1 +1 @@ -14.239 +14.240 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.239/changelog new/installation-images-14.240/changelog --- old/installation-images-14.239/changelog 2016-04-28 11:57:01.000000000 +0200 +++ new/installation-images-14.240/changelog 2016-05-02 15:56:56.000000000 +0200 @@ -1,3 +1,6 @@ +2016-05-02: 14.240 + - adjust config to new 'hiddenmenu' feature (bsc #976836) + 2016-04-28: 14.239 - allow user to switch efi grub2 console to text mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.239/data/boot/grub-aarch64.cfg new/installation-images-14.240/data/boot/grub-aarch64.cfg --- old/installation-images-14.239/data/boot/grub-aarch64.cfg 2016-04-28 11:57:01.000000000 +0200 +++ new/installation-images-14.240/data/boot/grub-aarch64.cfg 2016-05-02 15:56:56.000000000 +0200 @@ -88,7 +88,7 @@ # On EFI systems we can only have graphics *or* serial, so allow the user # to switch between the two -menuentry 'Text mode' --hidden --hotkey 't' { +hiddenentry 'Text mode' --hotkey 't' { set textmode=true terminal_output console } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.239/data/boot/grub.cfg new/installation-images-14.240/data/boot/grub.cfg --- old/installation-images-14.239/data/boot/grub.cfg 2016-04-28 11:57:01.000000000 +0200 +++ new/installation-images-14.240/data/boot/grub.cfg 2016-05-02 15:56:56.000000000 +0200 @@ -95,7 +95,7 @@ # On EFI systems we can only have graphics *or* serial, so allow the user # to switch between the two -menuentry 'Text mode' --hidden --hotkey 't' { +hiddenentry 'Text mode' --hotkey 't' { set textmode=true terminal_output console }

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2016-05-05 08:12:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2016-03-26 15:21:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-05-05 08:12:18.000000000 +0200 @@ -1,0 +2,20 @@ +Mon May 2 13:25:02 UTC 2016 - olaf(a)aepfle.de + +- Remove xen-devel from BuildRequires + required headers are included in grub-2.0.2 + +------------------------------------------------------------------- +Thu Apr 28 09:06:11 UTC 2016 - agraf(a)suse.com + +- Add support for "t" hotkey to switch to text mode (bsc#976836) + * added grub2-SUSE-Add-the-t-hotkey.patch +- Add support for hidden menu entries (bsc#976836) + * added grub2-Add-hidden-menu-entries.patch + +------------------------------------------------------------------- +Tue Apr 19 08:21:24 UTC 2016 - mchang(a)suse.com + +- Correct show user defined comments in menu for snapshots (bsc#956698) + * modified grub2-snapper-plugin.sh + +------------------------------------------------------------------- New: ---- grub2-Add-hidden-menu-entries.patch grub2-SUSE-Add-the-t-hotkey.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.yYQQHb/_old 2016-05-05 08:12:20.000000000 +0200 +++ /var/tmp/diff_new_pack.yYQQHb/_new 2016-05-05 08:12:20.000000000 +0200 @@ -53,9 +53,6 @@ BuildRequires: pesign-obs-integration %endif %endif -%ifarch %{ix86} x86_64 -BuildRequires: xen-devel -%endif %if 0%{?suse_version} >= 1210 # Package systemd services files grub2-once.service BuildRequires: systemd-rpm-macros @@ -203,6 +200,9 @@ # 32bit ARM EFI FDT table pass-through support Patch130: 0001-arm64-Move-firmware-fdt-search-into-global-function.patch Patch131: 0002-arm-efi-Use-fdt-from-firmware-when-available.patch +# Hidden menu entry and hotkey "t" for text console +Patch140: grub2-Add-hidden-menu-entries.patch +Patch141: grub2-SUSE-Add-the-t-hotkey.patch # PPC64 LE support Patch205: grub2-ppc64le-disable-video.patch Patch207: grub2-ppc64le-memory-map.patch @@ -424,6 +424,8 @@ %patch122 -p1 %patch130 -p1 %patch131 -p1 +%patch140 -p1 +%patch141 -p1 %patch205 -p1 %patch207 -p1 %patch233 -p1 @@ -841,6 +843,7 @@ %config %{_sysconfdir}/grub.d/40_custom %config %{_sysconfdir}/grub.d/41_custom %config %{_sysconfdir}/grub.d/90_persistent +%config %{_sysconfdir}/grub.d/95_textmode %{_sbindir}/%{name}-install %{_sbindir}/%{name}-mkconfig %{_sbindir}/%{name}-once ++++++ grub2-Add-hidden-menu-entries.patch ++++++ >From a06004f4c668abd7c760a2818d0a8205da7568e7 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 26 Apr 2016 15:29:25 +0200 Subject: [PATCH v3] Add hidden menu entries The menu infrastructure is quite powerful. It allows you to define menu entries that can contain arbitrary grub commands that can do a lot more than just boot kernel entries. For some of these it makes sense to hide them inside the normal menu though and instead have them available through hotkeys that get advertised differently. My main use case is to switch to the serial console when gfxterm is loaded. So this patch adds support for hidden menu entries that are accessible using hotkeys, but are not accessible in the grub menu. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- v1 -> v2: - fix default entry selection v2 -> v3: - replace "--hidden" parameter with new command "hiddenentry" diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c index dd9d9f1..b282c4f 100644 --- a/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c @@ -133,7 +133,7 @@ legacy_file (const char *filename) args[0] = oldname; grub_normal_add_menu_entry (1, args, NULL, NULL, "legacy", NULL, NULL, - entrysrc, 0); + entrysrc, 0, 0); grub_free (args); entrysrc[0] = 0; grub_free (oldname); @@ -186,7 +186,7 @@ legacy_file (const char *filename) } args[0] = entryname; grub_normal_add_menu_entry (1, args, NULL, NULL, NULL, - NULL, NULL, entrysrc, 0); + NULL, NULL, entrysrc, 0, 0); grub_free (args); } diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c index 58d4dad..b4d6c31 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes, const char *id, const char *users, const char *hotkey, const char *prefix, const char *sourcecode, - int submenu) + int submenu, int hidden) { int menu_hotkey = 0; char **menu_args = NULL; @@ -188,8 +188,11 @@ grub_normal_add_menu_entry (int argc, const char **args, (*last)->args = menu_args; (*last)->sourcecode = menu_sourcecode; (*last)->submenu = submenu; + (*last)->hidden = hidden; + + if (!hidden) + menu->size++; - menu->size++; return GRUB_ERR_NONE; fail: @@ -286,7 +289,8 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args) users, ctxt->state[2].arg, 0, ctxt->state[3].arg, - ctxt->extcmd->cmd->name[0] == 's'); + ctxt->extcmd->cmd->name[0] == 's', + ctxt->extcmd->cmd->name[0] == 'h'); src = args[argc - 1]; args[argc - 1] = NULL; @@ -303,7 +307,8 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args) ctxt->state[0].args, ctxt->state[4].arg, users, ctxt->state[2].arg, prefix, src + 1, - ctxt->extcmd->cmd->name[0] == 's'); + ctxt->extcmd->cmd->name[0] == 's', + ctxt->extcmd->cmd->name[0] == 'h'); src[len - 1] = ch; args[argc - 1] = src; @@ -311,7 +316,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args) return r; } -static grub_extcmd_t cmd, cmd_sub; +static grub_extcmd_t cmd, cmd_sub, cmd_hidden; void grub_menu_init (void) @@ -327,6 +332,13 @@ grub_menu_init (void) | GRUB_COMMAND_FLAG_EXTRACTOR, N_("BLOCK"), N_("Define a submenu."), options); + cmd_hidden = grub_register_extcmd ("hiddenentry", grub_cmd_menuentry, + GRUB_COMMAND_FLAG_BLOCKS + | GRUB_COMMAND_ACCEPT_DASH + | GRUB_COMMAND_FLAG_EXTRACTOR, + N_("BLOCK"), + N_("Define a hidden menu entry."), + options); } void diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c index 719e2fb..2a151fe 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -40,6 +40,8 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu, int nested) = NULL; +#define MENU_INCLUDE_HIDDEN 0x10000 + enum timeout_style { TIMEOUT_STYLE_MENU, TIMEOUT_STYLE_COUNTDOWN, @@ -80,8 +82,20 @@ grub_menu_get_entry (grub_menu_t menu, int no) { grub_menu_entry_t e; - for (e = menu->entry_list; e && no > 0; e = e->next, no--) - ; + if (no & MENU_INCLUDE_HIDDEN) { + no &= ~MENU_INCLUDE_HIDDEN; + + for (e = menu->entry_list; e && no > 0; e = e->next, no--) + ; + } else { + for (e = menu->entry_list; e && no > 0; e = e->next, no--) { + /* Skip hidden entries */ + while (e && e->hidden) + e = e->next; + } + while (e && e->hidden) + e = e->next; + } return e; } @@ -93,10 +107,10 @@ get_entry_index_by_hotkey (grub_menu_t menu, int hotkey) grub_menu_entry_t entry; int i; - for (i = 0, entry = menu->entry_list; i < menu->size; + for (i = 0, entry = menu->entry_list; entry; i++, entry = entry->next) if (entry->hotkey == hotkey) - return i; + return i | MENU_INCLUDE_HIDDEN; return -1; } @@ -510,6 +524,10 @@ get_entry_number (grub_menu_t menu, const char *name) grub_menu_entry_t e = menu->entry_list; int i; + /* Skip hidden entries */ + while (e && e->hidden) + e = e->next; + grub_errno = GRUB_ERR_NONE; for (i = 0; e; i++) @@ -521,6 +539,10 @@ get_entry_number (grub_menu_t menu, const char *name) break; } e = e->next; + + /* Skip hidden entries */ + while (e && e->hidden) + e = e->next; } if (! e) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c index e22bb91..4ac2d6b 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -290,6 +290,10 @@ print_entries (grub_menu_t menu, const struct menu_viewer_data *data) e, data); if (e) e = e->next; + + /* Skip hidden entries */ + while (e && e->hidden) + e = e->next; } grub_term_gotoxy (data->term, diff --git a/include/grub/menu.h b/include/grub/menu.h index ee2b5e9..eb8a86b 100644 --- a/include/grub/menu.h +++ b/include/grub/menu.h @@ -58,6 +58,8 @@ struct grub_menu_entry int submenu; + int hidden; + /* The next element. */ struct grub_menu_entry *next; }; diff --git a/include/grub/normal.h b/include/grub/normal.h index 218cbab..bcb4124 100644 --- a/include/grub/normal.h +++ b/include/grub/normal.h @@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes, const char *id, const char *users, const char *hotkey, const char *prefix, const char *sourcecode, - int submenu); + int submenu, int hidden); grub_err_t grub_normal_set_password (const char *user, const char *password); ++++++ grub2-SUSE-Add-the-t-hotkey.patch ++++++ >From f6be3d41e24e685846dfc90ac1ca447501813687 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 26 Apr 2016 15:59:03 +0200 Subject: [PATCH] SUSE: Add the "t" hotkey While graphical output is fancy and nice, in some environments (EFI) we can only have fancy graphical on frame buffer _or_ ugly serial on any output. To give the user a nicely graphical screen in the default case, but still allow them to get their boot menu on the serial console, let's add a new hidden option "t" that switches the output device back to the firmware default. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- v1 -> v2 - use hiddenentry instead of --hidden diff --git a/Makefile.util.def b/Makefile.util.def index f9caccb..d94de92 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -504,6 +504,12 @@ script = { installdir = grubconf; }; +script = { + name = '95_textmode'; + common = util/grub.d/95_textmode.in; + installdir = grubconf; +}; + program = { mansection = 1; name = grub-mkrescue; diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in index 93a9023..b6ec7e2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -184,6 +184,9 @@ EOF fi fi + if [ -d /sys/firmware/efi ]; then + echo 'echo "Please press 't' to show the boot menu on this console"' + fi cat << EOF set gfxmode=${GRUB_GFXMODE} load_video diff --git a/util/grub.d/95_textmode.in b/util/grub.d/95_textmode.in new file mode 100644 index 0000000..fa48cf9 --- /dev/null +++ b/util/grub.d/95_textmode.in @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -d /sys/firmware/efi ]; then + echo " + # On EFI systems we can only have graphics *or* serial, so allow the user + # to switch between the two + hiddenentry 'Text mode' --hotkey 't' { + set textmode=true + terminal_output console + }" +fi ++++++ grub2-snapper-plugin.sh ++++++ --- /var/tmp/diff_new_pack.yYQQHb/_old 2016-05-05 08:12:20.000000000 +0200 +++ /var/tmp/diff_new_pack.yYQQHb/_new 2016-05-05 08:12:20.000000000 +0200 @@ -70,13 +70,13 @@ # FATE#318101 # Show user defined comments in grub2 menu for snapshots # Use userdata tag "bootloader=[user defined text]" - desc=`xmllint --xpath "/snapshot/userdata[key='bootloader']/value/text()" "${s_dir}/info.xml" 2>/dev/null || echo ""` - test -z "$desc" && desc=`xmllint --xpath '/snapshot/description/text()' "${s_dir}/info.xml" 2>/dev/null || echo ""` + full_desc=`xmllint --xpath "/snapshot/userdata[key='bootloader']/value/text()" "${s_dir}/info.xml" 2>/dev/null || echo ""` + test -z "$full_desc" && desc=`xmllint --xpath '/snapshot/description/text()' "${s_dir}/info.xml" 2>/dev/null || echo ""` # FATE#317972 # If we have a post entry and the description field is empty, # we should use the "Pre" number and add that description to the post entry. - if test -z "$desc" -a "$stype" = "post"; then + if test -z "$full_desc" -a -z "$desc" -a "$stype" = "post"; then pre_num=`xmllint --xpath '/snapshot/pre_num/text()' "${s_dir}/info.xml" 2>/dev/null || echo ""` if test -n "$pre_num"; then if test -f "${snapper_snapshot_path}/${pre_num}/info.xml" ; then @@ -89,11 +89,12 @@ test "$stype" = "single" && stype="" test -z "$stype" || stype=",$stype" test -z "$desc" || desc=",$desc" + test -z "$full_desc" && full_desc="$kernel_ver,$date$stype$desc" if test "${NAME}" = "SLES" -o "${NAME}" = "SLED"; then - title="${important}${NAME}${VERSION} ($kernel_ver,$date$stype$desc)" + title="${important}${NAME}${VERSION} ($full_desc)" else - title="${important}${NAME} ${VERSION} ($kernel_ver,$date$stype$desc)" + title="${important}${NAME} ${VERSION} ($full_desc)" fi cat <<EOF

1 0

commit sonnet for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2016-05-05 08:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sonnet" Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2016-04-12 19:30:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2016-05-05 08:12:13.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 2 14:04:16 UTC 2016 - dimstar(a)opensuse.org + +- Add sonnet-hunspell-1.4.patch: detect hunspell 1.4.x. + +------------------------------------------------------------------- New: ---- sonnet-hunspell-1.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.ELavfN/_old 2016-05-05 08:12:14.000000000 +0200 +++ /var/tmp/diff_new_pack.ELavfN/_new 2016-05-05 08:12:14.000000000 +0200 @@ -43,6 +43,7 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… Source1: baselibs.conf +Patch0: sonnet-hunspell-1.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -92,6 +93,7 @@ %lang_package -n libKF5SonnetCore%sonum %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ sonnet-hunspell-1.4.patch ++++++ >From 19fe077169fc0aa3b43c4d61ed642541d1b12d58 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <dimstar(a)opensuse.org> Date: Mon, 2 May 2016 16:09:32 +0200 Subject: [PATCH] build: detect Hunspell 1.4 branch --- cmake/FindHUNSPELL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake index 26942b5..f028abe 100644 --- a/cmake/FindHUNSPELL.cmake +++ b/cmake/FindHUNSPELL.cmake @@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) -FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) +FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2) # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if # all listed variables are TRUE -- 2.8.1

1 0

commit enchant for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package enchant for openSUSE:Factory checked in at 2016-05-05 08:12:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enchant (Old) and /work/SRC/openSUSE:Factory/.enchant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enchant" Changes: -------- --- /work/SRC/openSUSE:Factory/enchant/enchant.changes 2013-03-28 13:10:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.enchant.new/enchant.changes 2016-05-05 08:12:08.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 2 06:51:04 UTC 2016 - dimstar(a)opensuse.org + +- Add enchant-hunspell-1.4.0.patch: Fix build against + hunspell 1.4.0, where MAXWORDLEN is no longer exported. + +------------------------------------------------------------------- New: ---- enchant-hunspell-1.4.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enchant.spec ++++++ --- /var/tmp/diff_new_pack.YohDnb/_old 2016-05-05 08:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.YohDnb/_new 2016-05-05 08:12:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package enchant # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Url: http://www.abisource.com/ Source: http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.ta… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM enchant-hunspell-1.4.0.patch dimstar(a)opensuse.org -- Fix build against hunspell 1.4.0, where WORDMAXLEN is no longer exported +Patch0: enchant-hunspell-1.4.0.patch BuildRequires: aspell-devel BuildRequires: dbus-1-glib-devel BuildRequires: gcc-c++ @@ -96,6 +98,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --with-pic \ ++++++ enchant-hunspell-1.4.0.patch ++++++ Index: enchant-1.6.0/src/myspell/myspell_checker.cpp =================================================================== --- enchant-1.6.0.orig/src/myspell/myspell_checker.cpp +++ enchant-1.6.0/src/myspell/myspell_checker.cpp @@ -148,6 +148,10 @@ MySpellChecker::~MySpellChecker() g_iconv_close(m_translate_out); } +#ifndef MAXWORDLEN +# define MAXWORDLEN 100 +#endif + bool MySpellChecker::checkWord(const char *utf8Word, size_t len) {

1 0

commit rtkit for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package rtkit for openSUSE:Factory checked in at 2016-05-05 08:12:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rtkit (Old) and /work/SRC/openSUSE:Factory/.rtkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rtkit" Changes: -------- --- /work/SRC/openSUSE:Factory/rtkit/rtkit.changes 2015-01-05 04:44:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rtkit.new/rtkit.changes 2016-05-05 08:12:03.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Apr 18 19:58:57 UTC 2016 - mpluskal(a)suse.com + +- Update to version 0.11+git.20130926: + * Pass uid of caller to polkit + * build-sys: since clock_gettime() moved to libc use mq_open to + check for librt + * systemd: update sd-daemon.[ch] +- Drop upstreamed patches + * rtkit-bnc836939.patch + * rtkit-use-system-sd-daemon.patch +- Add _service +- Cleanup spec file with spec-cleaner +- Drop support for pre systemd ditributions +- Add rc symlink for service +- Use more strict ldflags + +------------------------------------------------------------------- Old: ---- rtkit-0.11_git201205151338.tar.xz rtkit-bnc836939.patch rtkit-use-system-sd-daemon.patch New: ---- rtkit-0.11+git.20130926.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rtkit.spec ++++++ --- /var/tmp/diff_new_pack.ywxJ4w/_old 2016-05-05 08:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ywxJ4w/_new 2016-05-05 08:12:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rtkit # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,86 +17,71 @@ Name: rtkit +Version: 0.11+git.20130926 +Release: 0 Summary: Realtime Policy and Watchdog Daemon License: GPL-3.0+ and BSD-3-Clause Group: System/Base -Version: 0.11_git201205151338 -Release: 0 -# The daemon itself is GPL v3 or later, the reference implementation for the client BSD-3-Clause -Source: %{name}-%{version}.tar.xz +# The daemon itself is GPL v3 or later, the reference implementation for +# the client BSD-3-Clause Url: http://git.0pointer.de/?p=rtkit.git -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: %{name}-%{version}.tar.xz +Patch2: rtkit-no-cpu-controlgroup.patch BuildRequires: automake -BuildRequires: dbus-1-devel >= 1.2 BuildRequires: libcap-devel -BuildRequires: polkit-devel +BuildRequires: pkg-config BuildRequires: xz -Requires: polkit -PreReq: dbus-1 -%if 0%{?suse_version} > 1140 +BuildRequires: pkgconfig(dbus-1) >= 1.2 BuildRequires: pkgconfig(libsystemd-daemon) -%{?systemd_requires} -%define has_systemd 1 -%endif -Patch0: rtkit-use-system-sd-daemon.patch -# PATCH-FIX-UPSTREAM rtkit-bnc836939.patch sreeves(a)suse.com -- use of insecure polkit DBUS API -Patch1: rtkit-bnc836939.patch -Patch2: rtkit-no-cpu-controlgroup.patch +BuildRequires: pkgconfig(polkit-agent-1) +BuildRequires: pkgconfig(polkit-gobject-1) +Requires: polkit +Requires(pre): dbus-1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -RealtimeKit is a D-Bus system service that changes the -scheduling policy of user processes/threads to SCHED_RR (i.e. realtime -scheduling mode) on request. It is intended to be used as a secure -mechanism to allow real-time scheduling to be used by normal user -processes. +RealtimeKit is a D-Bus system service that changes the scheduling policy of +user processes/threads to SCHED_RR (i.e. realtime scheduling mode) on +request. It is intended to be used as a secure mechanism to allow real-time +scheduling to be used by normal user processes. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build autoreconf -fiv -export CFLAGS="$RPM_OPT_FLAGS -fPIE" -export LDFLAGS="-pie" -%configure --disable-silent-rules \ -%if 0%{?has_systemd} ---with-systemdsystemunitdir=%{_unitdir} \ -%endif ---libexecdir=%{_libexecdir}/rtkit +export CFLAGS="%{optflags} -fPIE" +export LDFLAGS="-Wl,-z,relro,-z,now -pie" +%configure \ + --disable-silent-rules \ + --with-systemdsystemunitdir=%{_unitdir} \ + --libexecdir=%{_libexecdir}/rtkit make %{?_smp_mflags} ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml %install -%makeinstall -install -D org.freedesktop.RealtimeKit1.xml $RPM_BUILD_ROOT/%{_datadir}/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml +make %{?_smp_mflags} DESTDIR=%{buildroot} install +ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcrtkit-daemon +install -D -m 0644 org.freedesktop.RealtimeKit1.xml %{buildroot}/%{_datadir}/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml %preun -%if 0%{?has_systemd} %service_del_preun rtkit-daemon.service -%endif %pre groupadd -r rtkit >/dev/null 2>&1 || : -/usr/bin/id rtkit >/dev/null 2>&1 || \ +%{_bindir}/id rtkit >/dev/null 2>&1 || \ useradd -r -g rtkit -c 'RealtimeKit' -s /bin/false -d /proc rtkit -%if 0%{?has_systemd} %service_add_pre rtkit-daemon.service -%endif %post dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || : -%if 0%{?has_systemd} %service_add_post rtkit-daemon.service -%endif %postun -%if 0%{?has_systemd} %service_del_postun rtkit-daemon.service -%endif %files %defattr(0644,root,root,0755) @@ -108,9 +93,8 @@ %{_datadir}/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml %{_datadir}/polkit-1/actions/org.freedesktop.RealtimeKit1.policy %{_sysconfdir}/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf -%{_mandir}/man8/rtkitctl.* -%if 0%{?has_systemd} +%{_mandir}/man8/rtkitctl.8%{ext_man} +%{_sbindir}/rcrtkit-daemon %{_unitdir}/rtkit-daemon.service -%endif %changelog

1 0