August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit tigervnc for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2014-08-29 17:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tigervnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2014-08-20 17:53:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2014-08-29 17:42:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 18 13:58:30 UTC 2014 - sndirsch(a)suse.com + +- use update-alternatives only on openSUSE > 13.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.PHkcSK/_old 2014-08-29 17:42:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PHkcSK/_new 2014-08-29 17:42:56.000000000 +0200 @@ -81,8 +81,10 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.14 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xtrans) >= 1.2.2 +%if 0%{?suse_version} >= 1315 Requires(post): update-alternatives Requires(postun): update-alternatives +%endif Url: http://sourceforge.net/apps/mediawiki/tigervnc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A high-performance, platform-neutral implementation of VNC @@ -223,11 +225,15 @@ install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes +%if 0%{?suse_version} >= 1315 ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.1.gz +%endif %find_lang '%{name}' +%if 0%{?suse_version} >= 1315 + %post %_sbindir/update-alternatives \ --install %{_bindir}/vncviewer vncviewer %{_bindir}/vncviewer-tigervnc 20 \ @@ -238,6 +244,8 @@ "%_sbindir/update-alternatives" --remove vncviewer /usr/bin/vncviewer-tigervnc fi +%endif + %files -f %{name}.lang %defattr(-,root,root,-) %ghost %{_bindir}/vncviewer @@ -247,8 +255,10 @@ %doc README.txt %ghost %_mandir/man1/vncviewer.1.gz %doc %_mandir/man1/vncviewer-tigervnc.1.gz +%if 0%{?suse_version} >= 1315 %ghost %_sysconfdir/alternatives/vncviewer %ghost %_sysconfdir/alternatives/vncviewer.1.gz +%endif %files -n xorg-x11-Xvnc %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2014-08-29 17:42:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2014-08-25 11:03:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2014-08-29 17:42:39.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 27 11:02:26 UTC 2014 - wagner-thomas(a)gmx.at + +- added standard user iodined for the iodine DNS tunnel daemon + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ config ++++++ --- /var/tmp/diff_new_pack.Jops9h/_old 2014-08-29 17:42:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Jops9h/_new 2014-08-29 17:42:43.000000000 +0200 @@ -278,6 +278,7 @@ 'icecream', 'icinga', 'intermezzo', + 'iodined', 'irc', 'jabber', 'jboss', -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsigc++2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package libsigc++2 for openSUSE:Factory checked in at 2014-08-29 17:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsigc++2 (Old) and /work/SRC/openSUSE:Factory/.libsigc++2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsigc++2" Changes: -------- --- /work/SRC/openSUSE:Factory/libsigc++2/libsigc++2.changes 2014-08-20 17:53:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsigc++2.new/libsigc++2.changes 2014-08-29 17:42:37.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 26 20:09:45 UTC 2014 - dimstar(a)opensuse.org + +- Add libsigc++2-includes.patch: Add an include in + limit_reference.h. + +------------------------------------------------------------------- New: ---- libsigc++2-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigc++2.spec ++++++ --- /var/tmp/diff_new_pack.lZgIcH/_old 2014-08-29 17:42:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lZgIcH/_new 2014-08-29 17:42:39.000000000 +0200 @@ -26,6 +26,8 @@ Url: http://libsigc.sourceforge.net/ Source: http://download.gnome.org/sources/libsigc++/2.3/%{_name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libsigc++2-includes.patch dimstar(a)opensuse.org -- Add an include in limit_reference.h, taken from git +Patch0: libsigc++2-includes.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +70,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build # FIXME: Cannot autoreconf, bad templates: ++++++ libsigc++2-includes.patch ++++++ >From df361299c3f9a0922a683e5fa3869764932bb19a Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <kjell.ahlstedt(a)bredband.net> Date: Fri, 8 Aug 2014 12:47:02 +0200 Subject: Add an include in limit_reference.h * sigc++/macros/limit_reference.h.m4: limit_reference.h must include visit_each.h, with the primary definition of template struct visitor. https://mail.gnome.org/archives/libsigc-list/2014-August/msg00001.html diff --git a/sigc++/macros/limit_reference.h.m4 b/sigc++/macros/limit_reference.h.m4 index 802446c..bb4b3b7 100644 --- a/sigc++/macros/limit_reference.h.m4 +++ b/sigc++/macros/limit_reference.h.m4 @@ -137,6 +137,7 @@ divert(0) _FIREWALL([LIMIT_REFERENCE]) +#include <sigc++/visit_each.h> #include <sigc++/type_traits.h> #include <sigc++/trackable.h> -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibc for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2014-08-29 17:42:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2014-08-13 08:50:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2014-08-29 17:42:33.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 26 10:47:31 UTC 2014 - schwab(a)suse.de + +- disable-gconv-translit-modules.patch: Disable gconv transliteration + module loading (CVE-2014-5119, bnc#892073, BZ #17187) + +------------------------------------------------------------------- glibc-utils.changes: same change glibc.changes: same change New: ---- disable-gconv-translit-modules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.j5bJW5/_old 2014-08-29 17:42:36.000000000 +0200 +++ /var/tmp/diff_new_pack.j5bJW5/_new 2014-08-29 17:42:36.000000000 +0200 @@ -290,6 +290,8 @@ Patch2006: ibm93x-redundant-shift-si.patch # PATCH-FIX-UPSTREAM Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype (BZ #15790) Patch2007: pthread-mutexattr-gettype-kind.patch +# PATCH-FIX-UPSTREAM Disable gconv transliteration module loading (BZ #17187) +Patch2008: disable-gconv-translit-modules.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -518,6 +520,7 @@ %patch2005 -p1 %patch2006 -p1 %patch2007 -p1 +%patch2008 -p1 %patch3000 glibc-utils.spec: same change ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.j5bJW5/_old 2014-08-29 17:42:36.000000000 +0200 +++ /var/tmp/diff_new_pack.j5bJW5/_new 2014-08-29 17:42:36.000000000 +0200 @@ -290,6 +290,8 @@ Patch2006: ibm93x-redundant-shift-si.patch # PATCH-FIX-UPSTREAM Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype (BZ #15790) Patch2007: pthread-mutexattr-gettype-kind.patch +# PATCH-FIX-UPSTREAM Disable gconv transliteration module loading (BZ #17187) +Patch2008: disable-gconv-translit-modules.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -518,6 +520,7 @@ %patch2005 -p1 %patch2006 -p1 %patch2007 -p1 +%patch2008 -p1 %patch3000 ++++++ disable-gconv-translit-modules.patch ++++++ 2014-08-21 Florian Weimer <fweimer(a)redhat.com> [BZ #17187] * iconv/gconv_trans.c (struct known_trans, search_tree, lock, trans_compare, open_translit, __gconv_translit_find): Remove module loading code. Index: glibc-2.19/iconv/gconv_trans.c =================================================================== --- glibc-2.19.orig/iconv/gconv_trans.c +++ glibc-2.19/iconv/gconv_trans.c @@ -238,181 +238,11 @@ __gconv_transliterate (struct __gconv_st return __GCONV_ILLEGAL_INPUT; } - -/* Structure to represent results of found (or not) transliteration - modules. */ -struct known_trans -{ - /* This structure must remain the first member. */ - struct trans_struct info; - - char *fname; - void *handle; - int open_count; -}; - - -/* Tree with results of previous calls to __gconv_translit_find. */ -static void *search_tree; - -/* We modify global data. */ -__libc_lock_define_initialized (static, lock); - - -/* Compare two transliteration entries. */ -static int -trans_compare (const void *p1, const void *p2) -{ - const struct known_trans *s1 = (const struct known_trans *) p1; - const struct known_trans *s2 = (const struct known_trans *) p2; - - return strcmp (s1->info.name, s2->info.name); -} - - -/* Open (maybe reopen) the module named in the struct. Get the function - and data structure pointers we need. */ -static int -open_translit (struct known_trans *trans) -{ - __gconv_trans_query_fct queryfct; - - trans->handle = __libc_dlopen (trans->fname); - if (trans->handle == NULL) - /* Not available. */ - return 1; - - /* Find the required symbol. */ - queryfct = __libc_dlsym (trans->handle, "gconv_trans_context"); - if (queryfct == NULL) - { - /* We cannot live with that. */ - close_and_out: - __libc_dlclose (trans->handle); - trans->handle = NULL; - return 1; - } - - /* Get the context. */ - if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames) - != 0) - goto close_and_out; - - /* Of course we also have to have the actual function. */ - trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans"); - if (trans->info.trans_fct == NULL) - goto close_and_out; - - /* Now the optional functions. */ - trans->info.trans_init_fct = - __libc_dlsym (trans->handle, "gconv_trans_init"); - trans->info.trans_context_fct = - __libc_dlsym (trans->handle, "gconv_trans_context"); - trans->info.trans_end_fct = - __libc_dlsym (trans->handle, "gconv_trans_end"); - - trans->open_count = 1; - - return 0; -} - - int internal_function __gconv_translit_find (struct trans_struct *trans) { - struct known_trans **found; - const struct path_elem *runp; - int res = 1; - - /* We have to have a name. */ - assert (trans->name != NULL); - - /* Acquire the lock. */ - __libc_lock_lock (lock); - - /* See whether we know this module already. */ - found = __tfind (trans, &search_tree, trans_compare); - if (found != NULL) - { - /* Is this module available? */ - if ((*found)->handle != NULL) - { - /* Maybe we have to reopen the file. */ - if ((*found)->handle != (void *) -1) - /* The object is not unloaded. */ - res = 0; - else if (open_translit (*found) == 0) - { - /* Copy the data. */ - *trans = (*found)->info; - (*found)->open_count++; - res = 0; - } - } - } - else - { - size_t name_len = strlen (trans->name) + 1; - int need_so = 0; - struct known_trans *newp; - - /* We have to continue looking for the module. */ - if (__gconv_path_elem == NULL) - __gconv_get_path (); - - /* See whether we have to append .so. */ - if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0) - need_so = 1; - - /* Create a new entry. */ - newp = (struct known_trans *) malloc (sizeof (struct known_trans) - + (__gconv_max_path_elem_len - + name_len + 3) - + name_len); - if (newp != NULL) - { - char *cp; - - /* Clear the struct. */ - memset (newp, '\0', sizeof (struct known_trans)); - - /* Store a copy of the module name. */ - newp->info.name = cp = (char *) (newp + 1); - cp = __mempcpy (cp, trans->name, name_len); - - newp->fname = cp; - - /* Search in all the directories. */ - for (runp = __gconv_path_elem; runp->name != NULL; ++runp) - { - cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name), - trans->name, name_len); - if (need_so) - memcpy (cp, ".so", sizeof (".so")); - - if (open_translit (newp) == 0) - { - /* We found a module. */ - res = 0; - break; - } - } - - if (res) - newp->fname = NULL; - - /* In any case we'll add the entry to our search tree. */ - if (__tsearch (newp, &search_tree, trans_compare) == NULL) - { - /* Yickes, this should not happen. Unload the object. */ - res = 1; - /* XXX unload here. */ - } - } - } - - __libc_lock_unlock (lock); - - return res; + /* This function always fails. Transliteration module loading is + not implemented. */ + return 1; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-08-29 17:42:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2014-08-25 12:59:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2014-08-29 17:42:30.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Aug 26 12:15:02 UTC 2014 - schwab(a)suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos(a)suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + +------------------------------------------------------------------- +Thu Aug 21 18:34:59 CEST 2014 - sbrabec(a)suse.cz + +- Remove hacks for format_spec_file and source_validator + (bnc#891152, bnc#891829). +- Use macro defined summary that passes both SLE and openSUSE + check-in QA scripts (invented by Ruediger Oertel). + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- util-linux.preamble util-linux.python-libmount util-linux.util-linux New: ---- util-linux-slash-in-format-string.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Filesystems -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Filesystems -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +213,9 @@ Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Filesystems -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Filesystems Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +335,8 @@ %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +368,8 @@ %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +Group: %group_pl %description -n python-libmount %else @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -630,10 +610,8 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Base -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +213,9 @@ Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Base Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +335,8 @@ %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +368,8 @@ %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +Group: %group_pl %description -n python-libmount %else @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -630,10 +610,8 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Base -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +213,9 @@ Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Base Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +335,8 @@ %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +368,8 @@ %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +Group: %group_pl %description -n python-libmount %else @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -630,10 +610,8 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" ++++++ util-linux-slash-in-format-string.patch ++++++ >From 82233c2a0a4cce89307061bdc7ffdb58c4936d4f Mon Sep 17 00:00:00 2001 From: HUANG Wei <weih(a)opera.com> Date: Wed, 6 Aug 2014 12:20:18 +0800 Subject: [PATCH] hexdump: Fix parse format of "byte count without repetition count" --- text-utils/hexdump-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c index 37e7086..8d14c5b 100644 --- a/text-utils/hexdump-parse.c +++ b/text-utils/hexdump-parse.c @@ -141,7 +141,7 @@ void add_fmt(const char *fmt, struct hexdump *hex) /* Skip slash and trailing white space. */ if (*p == '/') - p = skip_space(p); + p = skip_space(++p); /* byte count */ if (isdigit(*p)) { -- 2.0.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit permissions for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package permissions for openSUSE:Factory checked in at 2014-08-29 17:42:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/permissions (Old) and /work/SRC/openSUSE:Factory/.permissions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "permissions" Changes: -------- --- /work/SRC/openSUSE:Factory/permissions/permissions.changes 2014-08-03 15:35:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.permissions.new/permissions.changes 2014-08-29 17:42:28.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 26 13:00:07 UTC 2014 - meissner(a)suse.com + +- Do not applies permissions from backup files (~ / .rpmsave / .rpmnew) (bnc#893370) +- do not mention SuSEconfig anymore, long dead (bnc#843083) + +------------------------------------------------------------------- Old: ---- permissions-2014.08.01.1324.tar.bz2 New: ---- permissions-2014.08.26.1452.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ permissions.spec ++++++ --- /var/tmp/diff_new_pack.keKqUa/_old 2014-08-29 17:42:30.000000000 +0200 +++ /var/tmp/diff_new_pack.keKqUa/_new 2014-08-29 17:42:30.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: libcap-devel Name: permissions -Version: 2014.08.01.1324 +Version: 2014.08.26.1452 Release: 0 Provides: aaa_base:/etc/permissions PreReq: %fillup_prereq ++++++ permissions-2014.08.01.1324.tar.bz2 -> permissions-2014.08.26.1452.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.08.01.1324/chkstat.c new/permissions-2014.08.26.1452/chkstat.c --- old/permissions-2014.08.01.1324/chkstat.c 2014-08-01 13:24:53.000000000 +0200 +++ new/permissions-2014.08.26.1452/chkstat.c 2014-08-26 14:52:59.000000000 +0200 @@ -351,6 +351,13 @@ char* p; if (!strcmp("..", d->d_name) || !strcmp(".", d->d_name)) continue; + + /* filter out backup files */ + if ((strlen(d->d_name)>2) && (d->d_name[strlen(d->d_name)-1] == '~')) + continue; + if (strstr(d->d_name,".rpmnew") || strstr(d->d_name,".rpmsave")) + continue; + ensure_array((void**)&files, &nfiles); if ((p = strchr(d->d_name, '.'))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.08.01.1324/permissions new/permissions-2014.08.26.1452/permissions --- old/permissions-2014.08.01.1324/permissions 2014-08-01 13:24:53.000000000 +0200 +++ new/permissions-2014.08.26.1452/permissions 2014-08-26 14:52:59.000000000 +0200 @@ -5,8 +5,8 @@ # # Author: Roman Drahtmueller <draht(a)suse.de>, 2001 # -# This file is used by SuSEconfig and chkstat to check or set the modes -# and ownerships of files and directories in the installation. +# This file is used by chkstat (and indirectly by various RPM scripts) +# to check or set the modes and ownerships of files and directories in the installation. # # There is a set of files with similar meaning in a SuSE installation: # /etc/permissions (This file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.08.01.1324/permissions.local new/permissions-2014.08.26.1452/permissions.local --- old/permissions-2014.08.01.1324/permissions.local 2014-08-01 13:24:53.000000000 +0200 +++ new/permissions-2014.08.26.1452/permissions.local 2014-08-26 14:52:59.000000000 +0200 @@ -1,8 +1,9 @@ # # /etc/permissions.local # -# This file is used by SuSEconfig and chkstat to check or set the modes -# and ownerships of files and directories in the installation. +# This file is used by chkstat (and indirectly by various RPM package scripts) +# to check or set the modes and ownerships of files and directories in +# the installation. # # In particular, this file will not be touched during an upgrade of the # installation. It is designed to be a placeholder for local -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Modules for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package Modules for openSUSE:Factory checked in at 2014-08-29 17:42:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Modules (Old) and /work/SRC/openSUSE:Factory/.Modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Modules" Changes: -------- --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2013-08-02 15:25:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2014-08-29 17:42:27.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 26 10:50:58 UTC 2014 - jengelh(a)inai.de + +- Resolve build failure with automake-1.14 +- Use some RPM macros instead of hardcoded paths; + remove redundant %clean section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Modules.spec ++++++ --- /var/tmp/diff_new_pack.i5t0ms/_old 2014-08-29 17:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.i5t0ms/_new 2014-08-29 17:42:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Modules # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,16 +63,31 @@ %patch1 -p1 %build +# Remove overzealous use of "dnl" (+++), which caused +# a broken "configure" (---) being generated. +#@@ -3004,7 +3004,8 @@ to "yes", and re-run configure. +# END +# as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 +# fi +#-fiac_config_headers="$ac_config_headers config.h" +#+fi +#+ac_config_headers="$ac_config_headers config.h" +# +# # Check whether --enable-versioning was given. +# if test "${enable_versioning+set}" = set; then : +# +perl -i -pe 's{dnl\n}{\n}gs' configure.ac + aclocal --force -I config autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \ ./configure \ - --prefix=/usr \ - --with-version-path=/usr/share/modules \ - --with-module-path=/usr/share/modules/modulefiles \ + --prefix="%_prefix" \ + --with-version-path="%_datadir/modules" \ + --with-module-path="%_datadir/modules/modulefiles" \ --mandir=%{_mandir} \ - --with-etc-path=/etc \ - --with-skel-path=/etc/skel \ + --with-etc-path="%_sysconfdir" \ + --with-skel-path="%_sysconfdir/skel" \ --with-tcl=%{_libdir} \ --without-x make @@ -93,9 +108,6 @@ ln -s ../share/Modules/%{version}/bin/modulecmd . popd -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc ChangeLog LICENSE.GPL NEWS README TODO -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreiserfs for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package libreiserfs for openSUSE:Factory checked in at 2014-08-29 17:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreiserfs (Old) and /work/SRC/openSUSE:Factory/.libreiserfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreiserfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libreiserfs/libreiserfs.changes 2014-08-20 17:51:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreiserfs.new/libreiserfs.changes 2014-08-29 17:42:24.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 26 05:47:27 UTC 2014 - jengelh(a)inai.de + +- Resolve build failures with automake-1.14 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreiserfs.spec ++++++ --- /var/tmp/diff_new_pack.3dh5tW/_old 2014-08-29 17:42:27.000000000 +0200 +++ /var/tmp/diff_new_pack.3dh5tW/_new 2014-08-29 17:42:27.000000000 +0200 @@ -120,10 +120,8 @@ %build cp /usr/share/gettext/config.rpath . -libtoolize --force -autoreconf -export CFLAGS="$RPM_OPT_FLAGS" -#CFLAGS+=--with-capabilities +mkdir -p m4 +autoreconf -fi %configure --disable-static --enable-shared make %{?_smp_mflags} @@ -131,8 +129,8 @@ #make check %install -%makeinstall -%{__rm} -f %{buildroot}%{_libdir}/*.la +make install DESTDIR="%buildroot" +rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig ++++++ libreiserfs-autoconf-fixups ++++++ --- /var/tmp/diff_new_pack.3dh5tW/_old 2014-08-29 17:42:27.000000000 +0200 +++ /var/tmp/diff_new_pack.3dh5tW/_new 2014-08-29 17:42:27.000000000 +0200 @@ -1,15 +1,11 @@ --- - configure |15855 ++++++++++++++++++++++++++++-------------------------- - configure.in | 5 - m4/libtool.m4 | 7357 +++++++++++++++++++++++++ - m4/ltoptions.m4 | 368 + - m4/ltsugar.m4 | 123 - m4/ltversion.m4 | 23 - m4/lt~obsolete.m4 | 92 - 7 files changed, 16251 insertions(+), 7572 deletions(-) + configure.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) ---- a/configure.in -+++ b/configure.in +Index: progsreiserfs-0.3.0.5/configure.in +=================================================================== +--- progsreiserfs-0.3.0.5.orig/configure.in ++++ progsreiserfs-0.3.0.5/configure.in @@ -2,6 +2,8 @@ AC_PREREQ(2.50) AC_INIT(include/reiserfs/reiserfs.h) @@ -28,11 +24,3 @@ AC_SYS_LARGEFILE -@@ -109,6 +111,7 @@ AM_PROG_LIBTOOL - dnl Initialize i18n: - ALL_LINGUAS="" - AM_GNU_GETTEXT -+AM_GNU_GETTEXT_VERSION - CFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$datadir/locale\\\"\"" - - dnl if test "$USE_INCLUDED_LIBINTL" = "yes"; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gd for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package gd for openSUSE:Factory checked in at 2014-08-29 17:42:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gd (Old) and /work/SRC/openSUSE:Factory/.gd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd" Changes: -------- --- /work/SRC/openSUSE:Factory/gd/gd.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gd.new/gd.changes 2014-08-29 17:42:21.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 26 05:58:53 UTC 2014 - jengelh(a)inai.de + +- Resolve build failure with automake-1.14 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gd.spec ++++++ --- /var/tmp/diff_new_pack.TKvfCy/_old 2014-08-29 17:42:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TKvfCy/_new 2014-08-29 17:42:23.000000000 +0200 @@ -95,7 +95,7 @@ %patch1 %patch2 %patch3 -%patch4 +%patch4 -p1 %patch5 %build ++++++ gd-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.TKvfCy/_old 2014-08-29 17:42:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TKvfCy/_new 2014-08-29 17:42:23.000000000 +0200 @@ -1,8 +1,21 @@ -Index: configure.ac +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: libgd-2.1.0/configure.ac =================================================================== ---- configure.ac.orig 2013-12-18 12:58:25.906977199 +0100 -+++ configure.ac 2013-12-18 12:59:36.671840317 +0100 -@@ -53,6 +53,9 @@ +--- libgd-2.1.0.orig/configure.ac ++++ libgd-2.1.0/configure.ac +@@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE) + FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON" + AC_SUBST(FEATURES) + +-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror]) ++AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall]) + AC_CONFIG_HEADERS([src/config.h:src/config.hin]) + + dnl newer automake wants this, but we still want to work with older +@@ -53,6 +53,9 @@ m4_ifndef([AM_PROG_AR],[m4_define([AM_PR AM_PROG_AR AC_PROG_CC_STDC -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ncurses for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '14

29 Aug '14

Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2014-08-29 17:42:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2014-08-20 10:50:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2014-08-29 17:42:15.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Aug 25 13:48:27 UTC 2014 - werner(a)suse.de + +- Make pkgconfig files work for all current versions that is + abi 5, abi wide 5, abi 6, and abi wide 6 +- Change patch ncurses-5.9.dif to enable gen-pkgconfig to do this + +------------------------------------------------------------------- +Mon Aug 25 09:50:03 UTC 2014 - werner(a)suse.de + +- Add ncurses patch 20140823 + + fix special case where double-width character overwrites a single- + width character in the first column (report by Egmont Koblinger, + cf: 20050813). + +------------------------------------------------------------------- +Fri Aug 22 13:34:00 UTC 2014 - mmarek(a)suse.cz + +- Install pkg-config files into %_libdir + +------------------------------------------------------------------- +Fri Aug 22 10:59:18 UTC 2014 - mmarek(a)suse.cz + +- Install pkg-config files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.wRu0zD/_old 2014-08-29 17:42:17.000000000 +0200 +++ /var/tmp/diff_new_pack.wRu0zD/_new 2014-08-29 17:42:17.000000000 +0200 @@ -19,6 +19,7 @@ Name: ncurses #!BuildIgnore: terminfo BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: screen %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel @@ -452,7 +453,9 @@ --disable-widec \ --disable-tic-depends \ --with-cxx-shared \ - --with-ticlib=tic + --with-ticlib=tic \ + --enable-pc-files \ + --with-pkg-config-libdir=%{_libdir}/pkgconfig kill $pid # # The configure line @@ -509,7 +512,13 @@ # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} +%if %abi >= 6 + sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config +%else sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config +%endif + mkdir pc + mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ # # Check for tack program on base of above ncurses # @@ -537,6 +546,7 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} + sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncurses@" misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncurses libdir=%{_libdir}/ncurses6 ln -sf %{_incdir}/ncurses6/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses6/ @@ -544,6 +554,13 @@ pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd + for pc in %{root}%{_libdir}/pkgconfig/*.pc + do + test -e "$pc" || break + base=${pc%%.pc} + base=${base##*/} + mv -f $pc pc/${base}6.pc + done %endif make clean # @@ -565,10 +582,19 @@ make %{?_smp_mflags} # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} +%if %abi >= 6 + sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config + pushd man + sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 + popd +%else sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd +%endif + rm -f %{root}%{_libdir}/pkgconfig/ti*.pc + mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ %if %abi < 6 make clean # @@ -582,12 +608,21 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} + sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncursesw@" misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncursesw libdir=%{_libdir}/ncurses6 sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncursesw -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 popd + rm -f %{root}%{_libdir}/pkgconfig/ti*.pc + for pc in %{root}%{_libdir}/pkgconfig/*.pc + do + test -e "$pc" || break + base=${pc%%.pc} + base=${base##*/} + mv -f $pc pc/${base}6.pc + done %endif %install @@ -767,6 +802,7 @@ grep -v -F -x -f default.list \ > extension.list rm -f %{buildroot}%{_prefix}/lib/terminfo + mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ %if %abi < 6 %post -n libncurses5 -p /sbin/ldconfig @@ -836,6 +872,7 @@ %{_libdir}/lib*.so %{_libdir}/ncurses6/lib*.a %{_libdir}/ncurses6/lib*.so +%{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man1/*-config.1.gz %doc %{_mandir}/man1/captoinfo.1.gz %doc %{_mandir}/man1/infocmp.1.gz ++++++ ncurses-5.9-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-5.9-20140823.patch new/patches/ncurses-5.9-20140823.patch --- old/patches/ncurses-5.9-20140823.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-5.9-20140823.patch 2014-08-25 11:48:39.000000000 +0200 @@ -0,0 +1,226 @@ +# ncurses 5.9 - patch - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 5.9 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 5.9 are in the subdirectory +# ftp://invisible-island.net/ncurses/5.9 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20140823.patch.gz +# patch by Thomas E. Dickey <dickey(a)invisible-island.net> +# created Sun Aug 24 00:42:29 UTC 2014 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# dist.mk | 4 ++-- +# ncurses/tty/tty_update.c | 28 ++++++++++++++++++++-------- +# package/debian-mingw/changelog | 4 ++-- +# package/debian-mingw64/changelog | 4 ++-- +# package/debian/changelog | 4 ++-- +# package/mingw-ncurses.nsi | 4 ++-- +# package/mingw-ncurses.spec | 2 +- +# package/ncurses.spec | 2 +- +# 9 files changed, 38 insertions(+), 21 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.2260 +--- ncurses-5.9-20140816+/NEWS 2014-08-16 23:28:26.000000000 +0000 ++++ ncurses-5.9-20140823/NEWS 2014-08-23 19:28:39.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2260 2014/08/16 23:28:26 tom Exp $ ++-- $Id: NEWS,v 1.2262 2014/08/23 19:28:39 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20140823 ++ + fix special case where double-width character overwrites a single- ++ width character in the first column (report by Egmont Koblinger, ++ cf: 20050813). ++ + 20140816 + + fix colors in ncurses 'b' test which did not work after changing + it to put the test-strings in subwindows (cf: 20140705). +Index: dist.mk +Prereq: 1.1001 +--- ncurses-5.9-20140816+/dist.mk 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/dist.mk 2014-08-23 16:35:54.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1001 2014/08/14 07:59:48 tom Exp $ ++# $Id: dist.mk,v 1.1002 2014/08/23 16:35:54 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20140816 ++NCURSES_PATCH = 20140823 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/tty/tty_update.c +Prereq: 1.279 +--- ncurses-5.9-20140816+/ncurses/tty/tty_update.c 2014-07-12 23:16:30.000000000 +0000 ++++ ncurses-5.9-20140823/ncurses/tty/tty_update.c 2014-08-23 19:25:18.000000000 +0000 +@@ -82,7 +82,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: tty_update.c,v 1.279 2014/07/12 23:16:30 tom Exp $") ++MODULE_ID("$Id: tty_update.c,v 1.280 2014/08/23 19:25:18 tom Exp $") + + /* + * This define controls the line-breakout optimization. Every once in a +@@ -628,6 +628,7 @@ + int first, int last) + { + int i, j, same; ++ int rc; + + TR(TRACE_CHARPUT, ("PutRange(%p, %p, %p, %d, %d, %d)", + (void *) SP_PARM, +@@ -655,9 +656,11 @@ + * Always return 1 for the next GoTo() after a PutRange() if we found + * identical characters at end of interval + */ +- return (same == 0 ? i : 1); ++ rc = (same == 0 ? i : 1); ++ } else { ++ rc = EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1); + } +- return EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1); ++ return rc; + } + + /* leave unbracketed here so 'indent' works */ +@@ -1492,9 +1495,17 @@ + if (oLastChar < nLastChar) { + int m = max(nLastNonblank, oLastNonblank); + #if USE_WIDEC_SUPPORT +- while (isWidecExt(newLine[n + 1]) && n) { +- --n; +- --oLastChar; ++ if (n) { ++ while (isWidecExt(newLine[n + 1]) && n) { ++ --n; ++ --oLastChar; /* increase cost */ ++ } ++ } else if (n >= firstChar && ++ isWidecBase(newLine[n])) { ++ while (isWidecExt(newLine[n + 1])) { ++ ++n; ++ ++oLastChar; /* decrease cost */ ++ } + } + #endif + GoTo(NCURSES_SP_ARGx lineno, n + 1); +@@ -1514,8 +1525,9 @@ + if (DelCharCost(SP_PARM, oLastChar - nLastChar) + > SP_PARM->_el_cost + nLastNonblank - (n + 1)) { + if (PutRange(NCURSES_SP_ARGx oldLine, newLine, lineno, +- n + 1, nLastNonblank)) +- GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1); ++ n + 1, nLastNonblank)) { ++ GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1); ++ } + ClrToEOL(NCURSES_SP_ARGx blank, FALSE); + } else { + /* +Index: package/debian-mingw/changelog +--- ncurses-5.9-20140816+/package/debian-mingw/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian-mingw/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey(a)invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-5.9-20140816+/package/debian-mingw64/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian-mingw64/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey(a)invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-5.9-20140816+/package/debian/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey(a)invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.56 +--- ncurses-5.9-20140816+/package/mingw-ncurses.nsi 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/mingw-ncurses.nsi 2014-08-23 16:35:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.56 2014/08/14 07:59:48 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.57 2014/08/23 16:35:54 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "5" + !define VERSION_MINOR "9" + !define VERSION_YYYY "2014" +-!define VERSION_MMDD "0816" ++!define VERSION_MMDD "0823" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-5.9-20140816+/package/mingw-ncurses.spec 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/mingw-ncurses.spec 2014-08-23 16:35:54.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 5.9 +-Release: 20140816 ++Release: 20140823 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-5.9-20140816+/package/ncurses.spec 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/ncurses.spec 2014-08-23 16:35:54.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 5.9 +-Release: 20140816 ++Release: 20140823 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz ++++++ ncurses-5.9.dif ++++++ --- /var/tmp/diff_new_pack.wRu0zD/_old 2014-08-29 17:42:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wRu0zD/_new 2014-08-29 17:42:21.000000000 +0200 @@ -338,6 +338,55 @@ The \fBncurses\fR library permits manipulation of data structures, called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. +--- misc/gen-pkgconfig.in ++++ misc/gen-pkgconfig.in 2014-08-25 11:52:06.262235364 +0000 +@@ -69,7 +69,7 @@ else + CFLAGS="-I\${includedir}" + fi + +-if test "$libdir" = "/usr/lib" ; then ++if test "$libdir" = "/usr/lib" -o "$libdir" = "/usr/lib64" ; then + LDFLAGS= + else + LDFLAGS="-L\${libdir}" +@@ -80,6 +80,7 @@ do + name="${name}" + + desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" ++ deps= + reqs= + + if test $name = $MAIN_LIBRARY ; then +@@ -88,9 +89,11 @@ do + desc="$desc terminal interface library" + elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then + reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY" ++ deps="-l$PANEL_LIBRARY -l$MENU_LIBRARY -l$FORM_LIBRARY -l$MAIN_LIBRARY" + desc="$desc add-on library" + else + reqs="$MAIN_LIBRARY" ++ deps="-l$MAIN_LIBRARY" + desc="$desc add-on library" + fi + +@@ -98,6 +101,8 @@ do + if test $name != $TINFO_NAME ; then + test -n "$reqs" && reqs="$reqs, " + reqs="${reqs}${SUB_LIBRARY}" ++ test -n "$deps" && deps="$deps " ++ deps="${deps}-l${SUB_LIBRARY}" + fi + fi + +@@ -115,7 +120,7 @@ Description: $desc + Version: \${version} + URL: http://invisible-island.net/ncurses + Requires.private: $reqs +-Libs: $LDFLAGS -l$name ++Libs: $LDFLAGS -l$name $deps + Libs.private: @LIBS@ + Cflags: $CFLAGS + EOF --- misc/ncurses-config.in +++ misc/ncurses-config.in 2011-11-17 12:46:49.000000000 +0000 @@ -98,7 +98,7 @@ while test $# -gt 0; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0