openSUSE Commits June 2017

commit@lists.opensuse.org

1 participants
2052 discussions

commit spec-cleaner for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2017-06-30 18:42:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spec-cleaner" Fri Jun 30 18:42:30 2017 rev:44 rq:507043 version:0.9.8 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2017-06-12 15:36:19.627396124 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2017-06-30 18:43:37.903416227 +0200 @@ -1,0 +2,8 @@ +Thu Jun 29 11:29:02 UTC 2017 - tchvatal(a)suse.com + +- Version update to 0.9.8 bsc#1046652: + * Various fixes as reported on github + * Remove defattr as default from new rpm should be enough + * Remove buildroot as new rpms do not need it at all + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.9.7.tar.gz New: ---- spec-cleaner-0.9.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.AhH0lM/_old 2017-06-30 18:43:39.119245214 +0200 +++ /var/tmp/diff_new_pack.AhH0lM/_new 2017-06-30 18:43:39.123244651 +0200 @@ -20,7 +20,7 @@ # This is used for Fedora, we need to sync this %{!?py3_ver: %define py3_ver %{python3_version}} Name: spec-cleaner -Version: 0.9.7 +Version: 0.9.8 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.9.7.tar.gz -> spec-cleaner-0.9.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/RELEASE.md new/spec-cleaner-spec-cleaner-0.9.8/RELEASE.md --- old/spec-cleaner-spec-cleaner-0.9.7/RELEASE.md 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/RELEASE.md 2017-06-29 13:01:10.000000000 +0200 @@ -5,5 +5,5 @@ 1. check that the version bump was done in spec_cleaner/__init__.py 2. run `make` to verify the generated data are up-to-date 3. tag the new release: `git tag -s spec-cleaner-X.Y.Z` -4. verify travis did upload new version to to pypi +4. upload new version to to pypi `python3 setup.py sdist upload` 5. post release version bump in spec_cleaner/__init__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.9.8/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.9.7/data/excludes-bracketing.txt 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/data/excludes-bracketing.txt 2017-06-29 13:01:10.000000000 +0200 @@ -69,6 +69,7 @@ make_jobs makeinstall mime_database_post[^\s]* +_mingw32_configure nagios_command_user_group_add nagios_user_group_add __os_install_post diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/__init__.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/__init__.py 2017-06-29 13:01:10.000000000 +0200 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.9.7' +__version__ = '0.9.8' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/dependency_parser.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/dependency_parser.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/dependency_parser.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/dependency_parser.py 2017-06-29 13:01:10.000000000 +0200 @@ -26,9 +26,9 @@ r')' ) -re_name = re.compile(r'[-A-Za-z0-9_~():;.+/*\[\]]+') +re_name = re.compile(r'[-A-Za-z0-9_~(){}@:;.+/*\[\]]+') re_version = re.compile(r'[-A-Za-z0-9_~():.+]+') -re_spaces = re.compile(r'\s+') +re_spaces = re.compile(r'(\s+|\s*,\s*)') re_macro_unbraced = re.compile('%[A-Za-z0-9_]{3,}') re_version_operator = re.compile('(>=|<=|=>|=<|>|<|=)') @@ -103,7 +103,7 @@ chunk_type = 'operator' rest = string[1:] - elif string[0].isspace(): + elif string[0].isspace() or string[0] == ',': chunk = '' chunk_type = 'space' rest = consume_chars(re_spaces, string)[1] @@ -125,11 +125,6 @@ chunk, rest = read_boolean(string) chunk_type = 'macro' - elif string[0] == ',': - chunk = '' - chunk_type = 'space' - rest = string[1:] - else: chunk, rest = consume_chars(re_name, string) chunk_type = 'text' @@ -146,7 +141,7 @@ def parse(self): # adding comma will cause flush in the end of line - self.string = self.line + "," + self.string = self.line + ", " self.parsed = [] self.token = [] self.state = 'start' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmcheck.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmcheck.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmcheck.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmcheck.py 2017-06-29 13:01:10.000000000 +0200 @@ -12,15 +12,12 @@ def add(self, line): line = self._complete_cleanup(line) - # smp_mflags for jobs - if not self.reg.re_comment.match(line) and \ - not self.minimal: - line = self.embrace_macros(line) + # smp_mflags for jobs macro replacement line = self.reg.re_jobs.sub('%{?_smp_mflags}', line) # add jobs if we have just make call on line # if user want single thread he should specify -j1 - if not self.minimal and line.startswith('make'): + if not self.minimal and self.reg.re_make.match(line): # if there are no smp_flags or jobs spec if line.find('%{?_smp_mflags}') == -1 and line.find('-j') == -1: # Don't append %_smp_mflags if the line ends with a backslash, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmfiles.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmfiles.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmfiles.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmfiles.py 2017-06-29 13:01:10.000000000 +0200 @@ -17,7 +17,9 @@ line = self._remove_doc_on_man(line) if not self.minimal: - self._add_defattr(line) + # prune obsolete defattr that is default + if self.reg.re_defattr.match(line): + return line = self._set_man_compression(line) # toss out empty lines if there are more than one in succession @@ -26,23 +28,6 @@ Section.add(self, line) - def _add_defattr(self, line): - """ - Add defattr with default values if there is none - Also be aware of comments that could've been put on top - """ - if self.comment_present and not line.startswith('#'): - self.comment_present = False - if not line.startswith('%defattr'): - self.lines.insert(1, '%defattr(-,root,root)') - - if self.previous_line and \ - self.reg.re_spec_files.match(self.previous_line): - if line.startswith('#'): - self.comment_present = True - elif not line.startswith('%defattr'): - self.lines.append('%defattr(-,root,root)') - def _remove_doc_on_man(self, line): """ Remove all %doc %_mandir to -> %_mandir as it is pointless to do twice diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmpreamble.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmpreamble.py 2017-06-29 13:01:10.000000000 +0200 @@ -111,6 +111,7 @@ 'packager': self.reg.re_packager, 'debugpkg': self.reg.re_debugpkg, 'prefix': self.reg.re_preamble_prefix, + 'buildroot': self.reg.re_buildroot, } def start_subparagraph(self): @@ -375,6 +376,32 @@ self._add_line_to('bconds', line) return + elif self.reg.re_mingw.match(line): + self._add_line_to('define', line) + return + + elif self.reg.re_requires_eq.match(line): + match = self.reg.re_requires_eq.match(line) + if match.group(1): + # if we were wrapped in curly definiton we need to remove + # the trailing curly bracket + value = match.group(2)[:-1] + else: + value = match.group(2) + self._add_line_value_to('requires_eq', value) + return + + elif self.reg.re_requires_ge.match(line): + match = self.reg.re_requires_ge.match(line) + if match.group(1): + # if we were wrapped in curly definiton we need to remove + # the trailing curly bracket + value = match.group(2)[:-1] + else: + value = match.group(2) + self._add_line_value_to('requires_ge', value) + return + elif self.reg.re_define.match(line) or self.reg.re_global.match(line) or self.reg.re_onelinecond.match(line): if line.endswith('\\'): self.multiline = True @@ -386,17 +413,12 @@ self._add_line_to('define', line) # catch "modname" for use in pypi url rewriting - define, name, value = line.split(None, 2) - if name == "modname": + if line.find("modname") >= 0: + define, name, value = line.split(None, 2) self.modname = value return - elif self.reg.re_requires_eq.match(line): - match = self.reg.re_requires_eq.match(line) - self._add_line_value_to('requires_eq', match.group(1)) - return - elif self.reg.re_prereq.match(line): match = self.reg.re_prereq.match(line) self._add_line_value_to('prereq', match.group(1)) @@ -418,12 +440,6 @@ self._add_line_value_to('provides_obsoletes', match.group(1), key='Obsoletes') return - elif self.reg.re_buildroot.match(line): - # we only are fine with buildroot only once - if len(self.paragraph.items['buildroot']) == 0: - self._add_line_value_to('buildroot', '%{_tmppath}/%{name}-%{version}-build') - return - elif self.reg.re_license.match(line): # first convert the license string to proper format and then append match = self.reg.re_license.match(line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmpreambleelements.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmpreambleelements.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmpreambleelements.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmpreambleelements.py 2017-06-29 13:01:10.000000000 +0200 @@ -28,13 +28,13 @@ 'prereq': 'PreReq', 'requires': 'Requires', 'requires_eq': '%requires_eq', + 'requires_ge': '%requires_ge', 'recommends': 'Recommends', 'suggests': 'Suggests', 'enhances': 'Enhances', 'supplements': 'Supplements', # Provides/Obsoletes cannot be part of this since we want to keep them # mixed, so we'll have to specify the key when needed - 'buildroot': 'BuildRoot', 'buildarch': 'BuildArch', 'exclusivearch': 'ExclusiveArch', 'excludearch': 'ExcludeArch', @@ -59,6 +59,7 @@ 'buildignores', 'requires', 'requires_eq', + 'requires_ge', 'prereq', 'requires_phase', # this is Requires(pre/post/...) 'recommends', @@ -67,7 +68,6 @@ 'supplements', 'conflicts', 'provides_obsoletes', - 'buildroot', 'buildarch', 'exclusivearch', 'excludearch', @@ -84,6 +84,7 @@ 'prereq', 'requires', 'requires_eq', + 'requires_ge', 'requires_phase', 'recommends', 'suggests', @@ -126,7 +127,7 @@ # if this is a list then all items except last are comment or whitespace key = str(a[-1]) else: - raise RpmException('Unknown type during sort: %s' % t) + raise RpmException('Unknown type during sort: %s' % a) # Special case is the category grouping where we have to get the number in # after the value @@ -225,6 +226,9 @@ continue # search already stored content for index, item in enumerate(results): + # if item is string we didn't match + if not isinstance(item, RpmRequiresToken): + continue # names and prefix must always match if item.name == element.name and item.prefix == element.prefix: # do we have full match on everything diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmregexp.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmregexp.py 2017-06-29 13:01:10.000000000 +0200 @@ -66,12 +66,14 @@ re_bcond_with = re.compile(r'^\s*%bcond_with(out)?\s*(.*)', re.IGNORECASE) re_autoreqprov = re.compile(r'^\s*AutoReqProv:.*$', re.IGNORECASE) re_debugpkg = re.compile(r'^%{?(debug_package|___debug_install_post)}?\s*$', re.IGNORECASE) + re_mingw = re.compile(r'^\s*%{?_mingw.*$', re.IGNORECASE) re_tail_macros = re.compile(r'^%{?python_subpackages}?') re_preamble_prefix = re.compile(r'^Prefix:\s*(.*)', re.IGNORECASE) # here we need to grab all submacros with rpm calls so just match almost # everything re_rpm_command = re.compile(r'%$.*$') - re_requires_eq = re.compile(r'^\s*%requires_eq\s*(.*)') + re_requires_eq = re.compile(r'^\s*(%{\?requires_eq:\s*)?%requires_eq\s*(.*)') + re_requires_ge = re.compile(r'^\s*(%{\?requires_ge:\s*)?%requires_ge\s*(.*)') re_onelinecond = re.compile(r'^\s*%{!?[^?]*\?[^:]+:[^}]+}') # Special bracketed deps dection re_brackety_requires = re.compile(r'(pkgconfig|cmake|perl|tex|rubygem)$') @@ -82,7 +84,7 @@ # rpmbuild re_jobs = re.compile(r'%{?(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}?') - re_make = re.compile(r'(^|(.*\s)?)make($|(\s.*)?)') + re_make = re.compile(r'(^|(.*\s)?)make(\s.*|)$') re_optflags_quotes = re.compile(r'=\s*\${?RPM_OPT_FLAGS}?\s*$') re_optflags = re.compile(r'\${?RPM_OPT_FLAGS}?') re_suseupdateconfig = re.compile(r'(%{?suse_update_config|${?\?suse_update_config:)') @@ -114,6 +116,7 @@ # rpmfiles re_compression = re.compile(r'\.(gz|\*)$') + re_defattr = re.compile(r'^\s*%defattr\s*\(\s*(-|(0)?644)\s*,\s*root\s*,\s*root\s*(,\s*(-|(0)?755)\s*)?$\s*') # patches/sources re_ptch = re.compile(r'%{P:(\d+)}') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmrequirestoken.py new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmrequirestoken.py --- old/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/rpmrequirestoken.py 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/spec_cleaner/rpmrequirestoken.py 2017-06-29 13:01:10.000000000 +0200 @@ -43,9 +43,9 @@ self.name = self._format_name(self.name) if not self.prefix: - raise RpmException('No defined prefix in RequiresToken') + raise RpmException('No defined prefix in RequiresToken: prefix "{0}" name "{1}" operator "{2}" version "{3}"'.format(self.prefix, self.name, self.operator, self.version)) if not self.name: - raise RpmException('No defined name in RequiresToken') + raise RpmException('No defined name in RequiresToken: prefix "{0}" name "{1}" operator "{2}" version "{3}"'.format(self.prefix, self.name, self.operator, self.version)) string = self.prefix + self.name if self.version and not self.operator: raise RpmException('Have defined version and no operator %s' % self.version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/conflicts.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/conflicts.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/conflicts.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/conflicts.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,2 +1,3 @@ Conflicts: d Conflicts: z a +Conflicts: openais <= 0.89, openais-devel <= 0.89 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/defattr.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/defattr.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/defattr.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/defattr.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,11 @@ +%files +%defattr(-,root,root) +%defattr(0644, root, root,0755) +%defattr(0644,root,root) +%defattr(-,root,root,-) +%defattr(-, root, root, -) +%defattr (644,root,root,755) +%defattr(644, root,root) +%doc ChangeLog + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/enhances.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/enhances.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/enhances.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/enhances.spec 2017-06-29 13:01:10.000000000 +0200 @@ -4,4 +4,5 @@ Summary: Feed entropy into random pool License: GPLv2 or later Group: System/Daemons +Supplements: packageand(%{name}:nautilus} Enhances: smtp_daemon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/macros.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/macros.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/macros.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,3 +1,4 @@ +%define _prefix=/opt/kde3 %define useful_macro() ( echo 'Useful macro has been used with arg %1' ) %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/mingw32-clutter.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/mingw32-clutter.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/mingw32-clutter.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/mingw32-clutter.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,125 @@ +# +# spec file for package mingw32-clutter +# +# 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 +# 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: mingw32-clutter +Version: 1.6.20 +Release: 0 +Summary: The clutter library +License: LGPL-2.1+ +Group: Development/Libraries +Url: http://clutter-project.org/ +Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.b… +Patch0: clutter-1.6.14-windows.patch +Patch1: clutter-1.6.20-ldl.patch +# Native version for glib-genmarshal +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: glib2-devel +#!BuildIgnore: post-build-checks +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: mingw32-atk-devel +BuildRequires: mingw32-cairo-devel +BuildRequires: mingw32-cross-binutils +BuildRequires: mingw32-cross-gcc +BuildRequires: mingw32-cross-pkg-config +BuildRequires: mingw32-filesystem +BuildRequires: mingw32-gdk-pixbuf-devel +BuildRequires: mingw32-glib2-devel +BuildRequires: mingw32-json-glib-devel +BuildRequires: mingw32-libtool +BuildRequires: mingw32-pango-devel +BuildRequires: mingw32-win_iconv-devel +Requires: %{name}-lang = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%_mingw32_package_header_debug +BuildArch: noarch + +%description +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package -n mingw32-libclutter-win32-1_0-0 +Summary: MinGW Windows port of the Clutter library +Group: System/Libraries +Obsoletes: mingw32-clutter +Provides: mingw32-clutter + +%description -n mingw32-libclutter-win32-1_0-0 +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package devel +Summary: The clutter library (Development) +Group: Development/Libraries +Requires: mingw32-glee-devel + +%description devel +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +files for development. + +%_mingw32_debug_package + +%lang_package + +%prep +%setup -q -n clutter-%{version} + +%patch0 -p1 -b .windows +%patch1 -p1 -b .ldl + +%build +libtoolize --force --copy --install +autoreconf -f -i +echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache} +PATH="%{_mingw32_bindir}:$PATH" \ +%{_mingw32_configure} \ + --disable-static --enable-shared \ + --with-flavour=win32 \ + --disable-glibtest --disable-conformance +make %{?_smp_mflags} || make + +%install +make DESTDIR=%{buildroot} install %{?_smp_mflags} + +%find_lang clutter-1.0 + +%files -n mingw32-libclutter-win32-1_0-0 +%defattr(-,root,root) +%{_mingw32_bindir}/libclutter-win32-1.0-0.dll + +%files lang -f clutter-1.0.lang +%defattr(-,root,root) + +%files devel +%defattr(-,root,root) +%{_mingw32_includedir}/clutter-1.0 +%{_mingw32_libdir}/libclutter-win32-1.0.dll.a +%{_mingw32_libdir}/pkgconfig/clutter-win32-1.0.pc +%{_mingw32_libdir}/pkgconfig/cally-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-gl-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-1.0.pc +%{_mingw32_libdir}/pkgconfig/clutter-1.0.pc +%{_mingw32_datadir}/gtk-doc/html/cally +%{_mingw32_datadir}/gtk-doc/html/clutter +%{_mingw32_datadir}/gtk-doc/html/cogl + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/providesobsoletes.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/providesobsoletes.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/providesobsoletes.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/providesobsoletes.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,7 +1,13 @@ %package -n %libname +Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) +Obsoletes: NetworkManager-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) # remove the old non-versioned package (built in the bs for instance) Provides: libwpd = %version Obsoletes: libwpd < %version Provides: sysvinit:/sbin/init +# yes this is bogus and typo +Provides: lib{name}-devel = %{version} +Obsoletes: lib{name}-devel < %{version} +Provides: sgpio:/{%{_bindir}}/ledctl Summary: Library for Importing WordPerfect (tm) Documents Group: System/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/rpmcmd.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/rpmcmd.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/rpmcmd.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,4 +1,5 @@ %define version %(rpm -q --qf '%{VERSION}' kernel-source) +%{?requires_ge:%requires_ge libapr1} %requires_eq vlc Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/slowparse.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/slowparse.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/slowparse.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/slowparse.spec 2017-06-29 13:01:10.000000000 +0200 @@ -9,4 +9,5 @@ Provides: locale(rw;sa;se;si;sid;sk;sl;so;sp;sq;sr) Provides: locale(ss;st;sw;syr;ta;te;tg;th;ti;tig;tk;tl;tr;tt;ug;uk;ur;urd;uz) Provides: locale(ve;ven;vi;wa;wal;wo;xh;yi;yo;zu) +Provides: locale(af;ar;bg;be;bn;bs;ca;cs;cy;da;de;el;en_GB;en_US;eo;es;et;fi;fr;gl;gu;he;hi;hr;hu;id;it;ja;ka;km;ko;lo;lt;mk;mr;nb;nl;pa;pl;pt;ro;ru;si;sk;sl;sr;sr@Latn;sv;ta;tr;uk;vi;wa;xh;zh_CN;zh_TW;zu) Source0: README.other diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/in/whitespace-build.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/in/whitespace-build.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/in/whitespace-build.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/in/whitespace-build.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,5 @@ +%build +pushd bulshit + ./configure + make +popd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/buildignore.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/buildignore.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/buildignore.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/buildignore.spec 2017-06-29 13:01:10.000000000 +0200 @@ -4,6 +4,5 @@ #!BuildIgnore: xml-commons #!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-resolver -BuildRoot: %{_tmppath}/%{name}-%{version}-build %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/cleansection.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/cleansection.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/cleansection.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/cleansection.spec 2017-06-29 13:01:10.000000000 +0200 @@ -3,7 +3,6 @@ %ifarch x86 %files -n something -%defattr(-,root,root) /bin/bla %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/conditions.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/conditions.spec 2017-06-29 13:01:10.000000000 +0200 @@ -13,7 +13,6 @@ BuildRequires: pkgconfig BuildRequires: python Requires: insserv -BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifpython2 Release: 0 %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/conflicts.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/conflicts.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/conflicts.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/conflicts.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,5 +1,7 @@ Conflicts: a Conflicts: d +Conflicts: openais <= 0.89 +Conflicts: openais-devel <= 0.89 Conflicts: z %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/defattr.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/defattr.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/defattr.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/defattr.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,4 @@ +%files +%doc ChangeLog + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/enhances.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/enhances.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/enhances.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/enhances.spec 2017-06-29 13:01:10.000000000 +0200 @@ -5,5 +5,6 @@ License: GPL-2.0+ Group: System/Daemons Enhances: smtp_daemon +Supplements: packageand(%{name}:nautilus} %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/excludes-bracketing.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/excludes-bracketing.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/excludes-bracketing.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/excludes-bracketing.spec 2017-06-29 13:01:10.000000000 +0200 @@ -29,7 +29,6 @@ %fdupes %files -%defattr(-,root,root) %files_fontsconf_file %fillup_[^\s]* %find_gconf_schemas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/filesattr.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/filesattr.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/filesattr.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/filesattr.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,6 +1,5 @@ %files ########################################################### -%defattr(-,root,root) %doc %lang(en) %{_prefix}/bla %dir %attr(0710,root,lp) %{_var}/spool/cups %dir %attr(1770,root,lp) %{_var}/spool/cups/tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/fileswhitespace.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/fileswhitespace.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/fileswhitespace.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/fileswhitespace.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,5 +1,4 @@ %files -%defattr(-,root,root) %{_bindir}/test # some comment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/macros.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/macros.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/macros.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,3 +1,4 @@ +%define _prefix=/opt/kde3 %define useful_macro() ( echo 'Useful macro has been used with arg %{1}' ) %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/mandirs.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/mandirs.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/mandirs.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/mandirs.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,5 +1,4 @@ %files -%defattr(-,root,root) %{_mandir}/man3/%{name}.3%{ext_man} %{_mandir}/man5/%{name}.5%{ext_man} %{_infodir}/%{name}.info%{ext_info} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/mingw32-clutter.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/mingw32-clutter.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/mingw32-clutter.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/mingw32-clutter.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,131 @@ +# +# spec file for package mingw32-clutter +# +# 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 +# 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/ +# + + +%{_mingw32_package_header_debug} +Name: mingw32-clutter +Version: 1.6.20 +Release: 0 +Summary: The clutter library +License: LGPL-2.1+ +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Group: Development/Libraries +Url: http://clutter-project.org/ +Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.b… +Patch0: clutter-1.6.14-windows.patch +Patch1: clutter-1.6.20-ldl.patch +# Native version for glib-genmarshal +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: mingw32-atk-devel +BuildRequires: mingw32-cairo-devel +BuildRequires: mingw32-cross-binutils +BuildRequires: mingw32-cross-gcc +BuildRequires: mingw32-cross-pkg-config +BuildRequires: mingw32-filesystem +BuildRequires: mingw32-gdk-pixbuf-devel +BuildRequires: mingw32-glib2-devel +BuildRequires: mingw32-json-glib-devel +BuildRequires: mingw32-libtool +BuildRequires: mingw32-pango-devel +BuildRequires: mingw32-win_iconv-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gmodule-no-export-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk-doc) +#!BuildIgnore: post-build-checks +Requires: %{name}-lang = %{version} +BuildArch: noarch + +%description +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package -n mingw32-libclutter-win32-1_0-0 +Summary: MinGW Windows port of the Clutter library +Group: System/Libraries +Obsoletes: mingw32-clutter +Provides: mingw32-clutter + +%description -n mingw32-libclutter-win32-1_0-0 +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package devel +Summary: The clutter library (Development) +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Group: Development/Libraries +Requires: mingw32-glee-devel + +%description devel +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +files for development. + +%{_mingw32_debug_package} + +%lang_package + +%prep +%setup -q -n clutter-%{version} + +%patch0 -p1 -b .windows +%patch1 -p1 -b .ldl + +%build +libtoolize --force --copy --install +autoreconf -f -i +echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache} +PATH="%{_mingw32_bindir}:$PATH" \ +%_mingw32_configure \ + --disable-static --enable-shared \ + --with-flavour=win32 \ + --disable-glibtest --disable-conformance +make %{?_smp_mflags} || make + +%install +%make_install + +%find_lang clutter-1.0 + +%files -n mingw32-libclutter-win32-1_0-0 +%{_mingw32_bindir}/libclutter-win32-1.0-0.dll + +%files lang -f clutter-1.0.lang + +%files devel +%{_mingw32_includedir}/clutter-1.0 +%{_mingw32_libdir}/libclutter-win32-1.0.dll.a +%{_mingw32_libdir}/pkgconfig/clutter-win32-1.0.pc +%{_mingw32_libdir}/pkgconfig/cally-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-gl-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-1.0.pc +%{_mingw32_libdir}/pkgconfig/clutter-1.0.pc +%{_mingw32_datadir}/gtk-doc/html/cally +%{_mingw32_datadir}/gtk-doc/html/clutter +%{_mingw32_datadir}/gtk-doc/html/cogl + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/providesobsoletes.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/providesobsoletes.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/providesobsoletes.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/providesobsoletes.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,9 +1,15 @@ %package -n %{libname} Summary: Library for Importing WordPerfect (tm) Documents Group: System/Libraries +Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) +Obsoletes: NetworkManager-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) # remove the old non-versioned package (built in the bs for instance) Provides: libwpd = %{version} Obsoletes: libwpd < %{version} Provides: sysvinit:/sbin/init +# yes this is bogus and typo +Provides: lib{name}-devel = %{version} +Obsoletes: lib{name}-devel < %{version} +Provides: sgpio:/{%{_bindir}}/ledctl %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpathreplacement.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpathreplacement.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpathreplacement.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpathreplacement.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,5 +1,4 @@ %files -%defattr(-,root,root) %doc ChangeLog README COPYING %{_prefix}/name/ %{_prefix}/lib/name/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpmcmd.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpmcmd.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpmcmd.spec 2017-06-29 13:01:10.000000000 +0200 @@ -12,6 +12,7 @@ # FIXME: Use %requires_eq macro instead Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) %requires_eq vlc +%requires_ge libapr1 Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/rpmpreamble.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/rpmpreamble.spec 2017-06-29 13:01:10.000000000 +0200 @@ -42,7 +42,6 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libtasn1) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run @@ -127,11 +126,9 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %files -n %{libmicrohttpd} -%defattr(-,root,root) %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root) %doc ChangeLog %{_includedir}/microhttpd.h %{_libdir}/%{name}.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/scriptletline.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/scriptletline.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/scriptletline.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/scriptletline.spec 2017-06-29 13:01:10.000000000 +0200 @@ -2,7 +2,6 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/a %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/slowparse.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/slowparse.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/slowparse.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/slowparse.spec 2017-06-29 13:01:10.000000000 +0200 @@ -9,6 +9,7 @@ Provides: locale(rw;sa;se;si;sid;sk;sl;so;sp;sq;sr) Provides: locale(ss;st;sw;syr;ta;te;tg;th;ti;tig;tk;tl;tr;tt;ug;uk;ur;urd;uz) Provides: locale(ve;ven;vi;wa;wal;wo;xh;yi;yo;zu) +Provides: locale(af;ar;bg;be;bn;bs;ca;cs;cy;da;de;el;en_GB;en_US;eo;es;et;fi;fr;gl;gu;he;hi;hr;hu;id;it;ja;ka;km;ko;lo;lt;mk;mr;nb;nl;pa;pl;pt;ro;ru;si;sk;sl;sr;sr@Latn;sv;ta;tr;uk;vi;wa;xh;zh_CN;zh_TW;zu) BuildArch: noarch %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/spec-cleaner.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/spec-cleaner.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/spec-cleaner.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/spec-cleaner.spec 2017-06-29 13:01:10.000000000 +0200 @@ -28,7 +28,6 @@ Requires: python-base Provides: obs-service-format_spec_file = %{version} Obsoletes: obs-service-format_spec_file < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} > 01220 BuildRequires: python3 @@ -55,7 +54,6 @@ SITEDIR=%{python_sitelib} \ %files -%defattr(-, root, root) %{_bindir}/%{name} %dir %{_libexecdir}/obs/ %dir %{_libexecdir}/obs/service/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/sysusers.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/sysusers.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/sysusers.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/sysusers.spec 2017-06-29 13:01:10.000000000 +0200 @@ -11,7 +11,6 @@ %pre -n system-user-uucp -f uucp.pre %files -n system-user-uucp -%defattr(-,root,root) %dir %attr(0750,uucp,uucp) %{_sysconfdir}/uucp %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/whitespace-build.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/whitespace-build.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/whitespace-build.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/whitespace-build.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,8 @@ +%build +pushd bulshit +# FIXME: you should use the %%configure macro + ./configure + make %{?_smp_mflags} +popd + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out/whitespace.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out/whitespace.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out/whitespace.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out/whitespace.spec 2017-06-29 13:01:10.000000000 +0200 @@ -11,7 +11,6 @@ file formats, audio and video codecs, and subtitle types. %files -%defattr(-,root,root) # justcomment %doc LICENSE Copyright README.md etc/example.conf etc/encoding-example-profiles.conf etc/input.conf %{_bindir}/%{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/buildignore.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/buildignore.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/buildignore.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/buildignore.spec 2017-06-29 13:01:10.000000000 +0200 @@ -4,6 +4,5 @@ #!BuildIgnore: xml-commons #!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-resolver -BuildRoot: %{_tmppath}/%{name}-%{version}-build %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/conditions.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/conditions.spec 2017-06-29 13:01:10.000000000 +0200 @@ -13,7 +13,6 @@ BuildRequires: pkgconfig BuildRequires: python Requires: insserv -BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifpython2 Release: 0 %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/conflicts.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/conflicts.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/conflicts.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/conflicts.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,5 +1,7 @@ Conflicts: a Conflicts: d +Conflicts: openais <= 0.89 +Conflicts: openais-devel <= 0.89 Conflicts: z %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/defattr.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/defattr.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/defattr.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/defattr.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,11 @@ +%files +%defattr(-,root,root) +%defattr(0644, root, root,0755) +%defattr(0644,root,root) +%defattr(-,root,root,-) +%defattr(-, root, root, -) +%defattr (644,root,root,755) +%defattr(644, root,root) +%doc ChangeLog + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/enhances.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/enhances.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/enhances.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/enhances.spec 2017-06-29 13:01:10.000000000 +0200 @@ -5,5 +5,6 @@ License: GPL-2.0+ Group: System/Daemons Enhances: smtp_daemon +Supplements: packageand(%{name}:nautilus} %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/macros.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/macros.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/macros.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,3 +1,4 @@ +%define _prefix=/opt/kde3 %define useful_macro() ( echo 'Useful macro has been used with arg %1' ) %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/mingw32-clutter.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/mingw32-clutter.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/mingw32-clutter.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/mingw32-clutter.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,132 @@ +# +# spec file for package mingw32-clutter +# +# 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 +# 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/ +# + + +%_mingw32_package_header_debug +Name: mingw32-clutter +Version: 1.6.20 +Release: 0 +Summary: The clutter library +License: LGPL-2.1+ +Group: Development/Libraries +Url: http://clutter-project.org/ +Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.b… +Patch0: clutter-1.6.14-windows.patch +Patch1: clutter-1.6.20-ldl.patch +# Native version for glib-genmarshal +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: mingw32-atk-devel +BuildRequires: mingw32-cairo-devel +BuildRequires: mingw32-cross-binutils +BuildRequires: mingw32-cross-gcc +BuildRequires: mingw32-cross-pkg-config +BuildRequires: mingw32-filesystem +BuildRequires: mingw32-gdk-pixbuf-devel +BuildRequires: mingw32-glib2-devel +BuildRequires: mingw32-json-glib-devel +BuildRequires: mingw32-libtool +BuildRequires: mingw32-pango-devel +BuildRequires: mingw32-win_iconv-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gmodule-no-export-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk-doc) +#!BuildIgnore: post-build-checks +Requires: %{name}-lang = %{version} +BuildArch: noarch + +%description +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package -n mingw32-libclutter-win32-1_0-0 +Summary: MinGW Windows port of the Clutter library +Group: System/Libraries +Obsoletes: mingw32-clutter +Provides: mingw32-clutter + +%description -n mingw32-libclutter-win32-1_0-0 +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +shared library. + +%package devel +Summary: The clutter library (Development) +Group: Development/Libraries +Requires: mingw32-glee-devel + +%description devel +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. This package contain the +files for development. + +%_mingw32_debug_package + +%lang_package + +%prep +%setup -q -n clutter-%{version} + +%patch0 -p1 -b .windows +%patch1 -p1 -b .ldl + +%build +libtoolize --force --copy --install +autoreconf -f -i +echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache} +PATH="%{_mingw32_bindir}:$PATH" \ +%{_mingw32_configure} \ + --disable-static --enable-shared \ + --with-flavour=win32 \ + --disable-glibtest --disable-conformance +make %{?_smp_mflags} || make + +%install +make DESTDIR=%{buildroot} install %{?_smp_mflags} + +%find_lang clutter-1.0 + +%files -n mingw32-libclutter-win32-1_0-0 +%defattr(-,root,root) +%{_mingw32_bindir}/libclutter-win32-1.0-0.dll + +%files lang -f clutter-1.0.lang +%defattr(-,root,root) + +%files devel +%defattr(-,root,root) +%{_mingw32_includedir}/clutter-1.0 +%{_mingw32_libdir}/libclutter-win32-1.0.dll.a +%{_mingw32_libdir}/pkgconfig/clutter-win32-1.0.pc +%{_mingw32_libdir}/pkgconfig/cally-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-gl-1.0.pc +%{_mingw32_libdir}/pkgconfig/cogl-1.0.pc +%{_mingw32_libdir}/pkgconfig/clutter-1.0.pc +%{_mingw32_datadir}/gtk-doc/html/cally +%{_mingw32_datadir}/gtk-doc/html/clutter +%{_mingw32_datadir}/gtk-doc/html/cogl + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/providesobsoletes.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/providesobsoletes.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/providesobsoletes.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/providesobsoletes.spec 2017-06-29 13:01:10.000000000 +0200 @@ -1,9 +1,15 @@ %package -n %libname Summary: Library for Importing WordPerfect (tm) Documents Group: System/Libraries +Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) +Obsoletes: NetworkManager-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) # remove the old non-versioned package (built in the bs for instance) Provides: libwpd = %version Obsoletes: libwpd < %version Provides: sysvinit:/sbin/init +# yes this is bogus and typo +Provides: lib{name}-devel = %{version} +Obsoletes: lib{name}-devel < %{version} +Provides: sgpio:/{%{_bindir}}/ledctl %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/rpmcmd.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/rpmcmd.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/rpmcmd.spec 2017-06-29 13:01:10.000000000 +0200 @@ -6,6 +6,7 @@ Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) %requires_eq vlc +%requires_ge libapr1 Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/rpmpreamble.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/rpmpreamble.spec 2017-06-29 13:01:10.000000000 +0200 @@ -42,7 +42,6 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libtasn1) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/slowparse.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/slowparse.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/slowparse.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/slowparse.spec 2017-06-29 13:01:10.000000000 +0200 @@ -9,6 +9,7 @@ Provides: locale(rw;sa;se;si;sid;sk;sl;so;sp;sq;sr) Provides: locale(ss;st;sw;syr;ta;te;tg;th;ti;tig;tk;tl;tr;tt;ug;uk;ur;urd;uz) Provides: locale(ve;ven;vi;wa;wal;wo;xh;yi;yo;zu) +Provides: locale(af;ar;bg;be;bn;bs;ca;cs;cy;da;de;el;en_GB;en_US;eo;es;et;fi;fr;gl;gu;he;hi;hr;hu;id;it;ja;ka;km;ko;lo;lt;mk;mr;nb;nl;pa;pl;pt;ro;ru;si;sk;sl;sr;sr@Latn;sv;ta;tr;uk;vi;wa;xh;zh_CN;zh_TW;zu) BuildArch: noarch %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/spec-cleaner.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/spec-cleaner.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/spec-cleaner.spec 2017-06-11 20:26:23.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/spec-cleaner.spec 2017-06-29 13:01:10.000000000 +0200 @@ -28,7 +28,6 @@ Requires: python-base Provides: obs-service-format_spec_file = %{version} Obsoletes: obs-service-format_spec_file < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} > 01220 BuildRequires: python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/whitespace-build.spec new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/whitespace-build.spec --- old/spec-cleaner-spec-cleaner-0.9.7/tests/out-minimal/whitespace-build.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.8/tests/out-minimal/whitespace-build.spec 2017-06-29 13:01:10.000000000 +0200 @@ -0,0 +1,7 @@ +%build +pushd bulshit + ./configure + make +popd + +%changelog ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.AhH0lM/_old 2017-06-30 18:43:39.391206961 +0200 +++ /var/tmp/diff_new_pack.AhH0lM/_new 2017-06-30 18:43:39.391206961 +0200 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 0.9.7-1 +Version: 0.9.8-1 Binary: spec-cleaner Maintainer: Přemysl Janouch <pjanouch(a)suse.com> Architecture: all

4 years, 2 months

commit emacs-auctex for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package emacs-auctex for openSUSE:Factory checked in at 2017-06-30 18:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-auctex (Old) and /work/SRC/openSUSE:Factory/.emacs-auctex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs-auctex" Fri Jun 30 18:42:27 2017 rev:34 rq:506982 version:11.90 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-auctex/emacs-auctex.changes 2016-09-30 15:33:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs-auctex.new/emacs-auctex.changes 2017-06-30 18:43:36.767575990 +0200 @@ -1,0 +2,75 @@ +Thu Jun 29 09:00:16 UTC 2017 - werner(a)suse.de + +- Update to 11.90 + * In addition to the completion performed by 'TeX-complete-symbol', + AUCTeX now also supports the new Emacs standard completion-at-point + facility (see the Emacs command 'completion-at-point'). This also + means that modern completion UIs like company-mode work out of the + box in TeX and LaTeX buffers. + * Completion is now aware of being inside a math environment and then + completes math macros. + * AUCTeX is able to display several levels of super- and subscripts, + each one raised above and a bit smaller than its basis. For this + feature, have a look at the customize options + 'font-latex-fontify-script' (especially the new values + 'multi-level' and 'invisible') and + 'font-latex-fontify-script-max-level'. Also, the script characters + '^' and '_' are also fontified with a special face named + 'font-latex-script-char-face'. + * Parsing of format specification in various tabular environments has + been improved. The function 'LaTeX-insert-item' ('C-c <LFD>') + inserts suitable number of ampersands for '*{num}{cols}' + constructs. Style files for LaTeX packages 'tabularx', 'tabulary', + 'longtable', 'dcolumn' and 'siunitx' are adapted to take advantage + of this improvement. + * AUCTeX has a new Ispell dictionary 'tex-ispell.el' for macros and + environments which will be skipped during spell checking. The + activiation of this feature is controlled by a new customize option + 'TeX-ispell-extend-skip-list', which is set to 't' and activated by + default. + * AUCTeX has a new customize option 'TeX-raise-frame-function' that + is currently only used by Evince and Atril inverse search to raise + the Emacs frame. + * When inserting a new float, AUCTeX will now prompt for a + short-caption if the length of the caption provided is greater than + a certain size. This size is controlled via a new user option + 'LaTeX-short-caption-prompt-length'. + * Parsing of the compilation log has been reworked. You should + encounter fewer mistaken files while navigating through errors and + warnings. + * Two new user options, 'TeX-ignore-warnings' and + 'TeX-suppress-ignored-warnings', allow ignoring certain warnings + after compilation of the document. + * A new option, 'TeX-PDF-from-DVI', controls if and how to produce a + PDF file by converting a DVI file. This supersedes + 'TeX-PDF-via-dvips-ps2pdf' which is still recognized but marked as + obsolete and may be removed in future releases. + * Support for a number of external viewers has been added + * A new function, 'TeX-documentation-texdoc', for reading + documentation with 'texdoc' has been added. 'TeX-doc' is still + available but now 'C-c ?' runs 'TeX-documentation-texdoc'. + * AUCTeX has a new custom option + 'LaTeX-reftex-cite-format-auto-activate' which controls the + automatic activation of citation formats provided by RefTeX when a + style file is loaded and RefTeX is enabled. Currently, + 'biblatex.el', 'harvard.el', 'jurabib.el' and 'natbib.el' use this + feature. If you have customized 'reftex-cite-format' and want to + use your settings, you should set this variable to 'nil'. + * AUCTeX now has limited support for the TikZ package. For the + moment, this includes some basic support for prompting the user of + arguments to the '\draw' macro. + * The style 'graphicx.el' went through a bigger overhaul. The + optional argument of command '\includegraphics' now supports + key-val query; keys can independently be chosen anytime by pressing + the <,> key. As a side effect, the variable + 'LaTeX-includegraphics-options-alist' is now no-op and is removed + from 'tex-style.el'. You can safely remove any customization of it + from your init file. The mandatory argument of '\includegraphics' + knows about image file extensions supported by the used engine and + offers them for inclusion. + * Support for other LaTeX packages was improved, and style files for + several new packages were added. + * Many bugs were crushed along the way. +- Remove patch 0001-Fix_bug_in_subfigure_style_filee.patch as now upstream + +------------------------------------------------------------------- Old: ---- 0001-Fix_bug_in_subfigure_style_filee.patch auctex-11.89.tar.gz New: ---- auctex-11.90.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-auctex.spec ++++++ --- /var/tmp/diff_new_pack.VakyGV/_old 2017-06-30 18:43:37.327497234 +0200 +++ /var/tmp/diff_new_pack.VakyGV/_new 2017-06-30 18:43:37.331496671 +0200 @@ -1,7 +1,7 @@ # # spec file for package emacs-auctex # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -35,7 +35,7 @@ BuildRequires: texlive-tex BuildRequires: texlive-texinfo %endif -Version: 11.89 +Version: 11.90 Release: 0 Summary: AUC TeX: An Emacs Extension License: GPL-2.0+ @@ -45,8 +45,6 @@ # Allows to select printer instance # PATCH-FEATURE-UPSTREAM dvips.patch Patch0: dvips.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix_bug_in_subfigure_style_filee.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -70,7 +68,6 @@ %prep %setup -n auctex-%{version} %patch0 -%patch1 -p1 %build unset ${!LC_*} @@ -147,7 +144,7 @@ %files %defattr(-, root, root) -%doc README COPYING doc/*.pdf CHANGES ChangeLog +%doc README COPYING doc/*.pdf CHANGES %dir %{_sitedir}/ %dir %{_aucdir}/ %dir %{_aucdir}/auto/ ++++++ auctex-11.89.tar.gz -> auctex-11.90.tar.gz ++++++ ++++ 59916 lines of diff (skipped) ++++++ dvips.patch ++++++ --- /var/tmp/diff_new_pack.VakyGV/_old 2017-06-30 18:43:37.615456730 +0200 +++ /var/tmp/diff_new_pack.VakyGV/_new 2017-06-30 18:43:37.619456167 +0200 @@ -1,6 +1,6 @@ ---- tex.el.orig 2015-11-14 12:07:48.063461445 +0200 +--- tex.el +++ tex.el 2015-11-14 12:10:30.386677534 +0200 -@@ -339,7 +339,7 @@ +@@ -341,7 +341,7 @@ ;; TeX-print-command. (defcustom TeX-print-command

4 years, 2 months

commit debootstrap for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package debootstrap for openSUSE:Factory checked in at 2017-06-30 18:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/debootstrap (Old) and /work/SRC/openSUSE:Factory/.debootstrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "debootstrap" Fri Jun 30 18:42:23 2017 rev:19 rq:506978 version:1.0.90 Changes: -------- --- /work/SRC/openSUSE:Factory/debootstrap/debootstrap.changes 2016-03-07 13:29:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.debootstrap.new/debootstrap.changes 2017-06-30 18:43:35.523750940 +0200 @@ -1,0 +2,39 @@ +Wed Jun 28 13:38:35 UTC 2017 - mchandras(a)suse.de + +- Version bump to 1.0.90 + * Add (Ubuntu) artful as a symlink to gutsy. + * Improve /dev/ptmx handling (deb#817236) + * Add autopkgtest support to test various scenarios. + * Uniformize COMPONENTS/USE_COMPONENTS handling. + * Strip the arch-qualifier (deb#836525) + * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps (deb#844221) + * remove scratchbox2 support (deb#796189) + * Reword split_inline_sig (deb#842591) + * Add support for downloading and validating InRelease files, by splitting + up detached signature from signed data. + * Switch default mirror to deb.debian.org. + * Add (Ubuntu) zesty as a symlink to gutsy. + * Add jessie-kfreebsd to merged-/usr blacklist. + * No longer Build-Depend on makedev. The code using it was already + removed in debootstrap 1.0.82. + * Do not use `tar -k` for older releases which might have file + conflicts between the packages to be installed. (deb#838388) + * Error out when seeing short options. (deb#548880) + * Add oldoldstable -> sid script symlink. (deb#792734) + * Add buster -> sid and bullseye -> sid script symlinks. + * Only unpack and configure the base system when there are actually + packages to install. (deb#825034) + * debootstrap.8: Use stretch instead of wheezy in examples. + * Enable merged-/usr by default. (deb#839046) + * Add support for xz-compressed Packages indices. (deb#837649) + * functions: Validate that the requested suite is listed in the + Release file's Suite or Codename field. (deb#837075) + * Add support for merged-/usr, enabled by a new --merged-usr option (deb#810301) + Feign install of dpkg in second stage. This avoids problems when + using dpkg-deb together with busybox' tar. (deb#837185) + * Excise all devices.tar.gz code. (deb#830869) + * Add (Ubuntu) yakkety as a symlink to gutsy. + * scripts/gutsy: Support kfreebsd & hurd arches on Ubuntu targets (deb#818748) +- Remove obsolete devices.tar.gz file + +------------------------------------------------------------------- Old: ---- debootstrap_1.0.79.tar.gz devices.tar.gz New: ---- debootstrap_1.0.90.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ debootstrap.spec ++++++ --- /var/tmp/diff_new_pack.RYeQ5j/_old 2017-06-30 18:43:36.095670497 +0200 +++ /var/tmp/diff_new_pack.RYeQ5j/_new 2017-06-30 18:43:36.095670497 +0200 @@ -1,7 +1,7 @@ # # spec file for package debootstrap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Frank Lichtenheld <frank(a)lichtenheld.de> # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,13 @@ Name: debootstrap -Version: 1.0.79 +Version: 1.0.90 Release: 0 Summary: Bootstrap a basic Debian system License: MIT Group: Development/Tools/Other Url: https://packages.debian.org/debootstrap Source0: http://httpredir.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.t… -Source1: devices.tar.gz Patch0: %{name}-norootforbuild.patch %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -43,7 +42,6 @@ %prep %setup -q %patch0 -p1 -cp -f %{SOURCE1} . %build # Nothing to build. ++++++ debootstrap-norootforbuild.patch ++++++ --- /var/tmp/diff_new_pack.RYeQ5j/_old 2017-06-30 18:43:36.119667122 +0200 +++ /var/tmp/diff_new_pack.RYeQ5j/_new 2017-06-30 18:43:36.119667122 +0200 @@ -1,7 +1,8 @@ -diff -ur debootstrap.orig/Makefile debootstrap/Makefile ---- debootstrap.orig/Makefile 2011-08-10 13:59:34.000000000 +0200 -+++ debootstrap/Makefile 2011-08-12 21:57:41.329074862 +0200 -@@ -19,14 +19,13 @@ +diff --git a/Makefile b/Makefile +index 8516803..21a9a39 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,8 +11,7 @@ install: mkdir -p $(DESTDIR)/usr/sbin cp -a scripts/* $(DSDIR)/scripts/ @@ -11,10 +12,3 @@ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap chmod 0755 $(DESTDIR)/usr/sbin/debootstrap - - ifeq ($(shell uname),Linux) -- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ -+ install -m 0644 devices.tar.gz $(DSDIR)/ - endif - - devices.tar.gz: ++++++ debootstrap_1.0.79.tar.gz -> debootstrap_1.0.90.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/Makefile new/debootstrap-1.0.90/Makefile --- old/debootstrap-1.0.79/Makefile 2015-07-10 05:01:20.000000000 +0200 +++ new/debootstrap-1.0.90/Makefile 2016-10-21 05:01:55.000000000 +0200 @@ -1,18 +1,9 @@ # avoid dpkg-dev dependency; fish out the version with sed VERSION := $(shell sed 's/.*($.*$).*/\1/; q' debian/changelog) -DATE := $(shell sed -n '/^ -- /{s/.*> $.*$/\1/p;q;}' debian/changelog) -MAKEDEV ?= /sbin/MAKEDEV - -ifeq ($(shell uname),Linux) -all: devices.tar.gz -else all: -endif clean: - rm -f devices.tar.gz - rm -rf dev DSDIR=$(DESTDIR)/usr/share/debootstrap install: @@ -25,20 +16,3 @@ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap chown root:root $(DESTDIR)/usr/sbin/debootstrap chmod 0755 $(DESTDIR)/usr/sbin/debootstrap - -ifeq ($(shell uname),Linux) - install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ -endif - -devices.tar.gz: - rm -rf dev - mkdir -p dev - chown 0:0 dev - chmod 755 dev - (cd dev && $(MAKEDEV) std ptmx fd consoleonly) - tar --mtime="$(DATE)" -cf - dev | gzip -9n >devices.tar.gz - @if [ "$$(tar tvf devices.tar.gz | wc -l)" -lt 2 ]; then \ - echo " ** devices.tar.gz is empty!" >&2; \ - exit 1; \ - fi - rm -rf dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/README new/debootstrap-1.0.90/README --- old/debootstrap-1.0.79/README 2011-01-19 05:36:02.000000000 +0100 +++ new/debootstrap-1.0.90/README 2016-10-21 05:01:55.000000000 +0200 @@ -10,19 +10,29 @@ can be useful if you want a quick way to make a Debian chroot on another system, or if you are testing modifications to debootstrap. -First, get the source. +First, get the source. * Either by using git - git clone git://git.debian.org/d-i/debootstrap.git + git clone https://anonscm.debian.org/git/d-i/debootstrap.git -* Or by visiting <http://packages.debian.org/source/sid/debootstrap> +* Or by visiting <https://packages.debian.org/source/sid/debootstrap> and downloading the tar.gz file -Then as root, in the debootstrap source directory: +Then in the debootstrap source directory: -make devices.tar.gz -export DEBOOTSTRAP_DIR=`pwd` -debootstrap sid sid + export DEBOOTSTRAP_DIR=`pwd` + sudo ./debootstrap stable my-stable-dir + +If you are running a multi-stage boot strap (for example for a QEMU +rootfs) you don't even need root: + + export DEBOOTSTRAP_DIR=`pwd` + fakeroot ./debootstrap --foreign --arch=armhf testing my-testing-dir http://deb.debian.org/debian + +Of course you will need to execute the second stage as root to finish the bootstrap: + + (on foreign hardware) + /debootstrap/debootstrap --second-stage Future @@ -31,7 +41,7 @@ * Cross-strap support - so you can bootstrap a filesystem to the point where it will successfully boot, and finish installing itself without having to be running the target architecture or OS yourself. - This means you should be able to run + This means you should be able to run debootstrap --arch powerpc sarge ./sarge-ppc-chroot ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/TODO new/debootstrap-1.0.90/TODO --- old/debootstrap-1.0.79/TODO 2011-04-09 03:00:31.000000000 +0200 +++ new/debootstrap-1.0.90/TODO 2016-10-21 05:01:55.000000000 +0200 @@ -7,5 +7,3 @@ -- versus command line -- support for sources (vs mirrors) -- faux-pinning for packages - - ++ makedev in second stage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/changelog new/debootstrap-1.0.90/debian/changelog --- old/debootstrap-1.0.79/debian/changelog 2016-02-19 07:23:59.000000000 +0100 +++ new/debootstrap-1.0.90/debian/changelog 2017-04-24 06:49:33.000000000 +0200 @@ -1,3 +1,124 @@ +debootstrap (1.0.90) unstable; urgency=medium + + [ Mattia Rizzolo ] + * Add (Ubuntu) artful as a symlink to gutsy. + + -- Christian Perrier <bubulle(a)debian.org> Mon, 24 Apr 2017 06:49:33 +0200 + +debootstrap (1.0.89) unstable; urgency=medium + + [ Simon McVittie ] + * Instead of creating a /dev/ptmx → pts/ptmx symlink unconditionally, + try mknod with “c 5 2” parameters first, and fall back to a symlink + only if it fails. This should help with various tools like pbuilder, + sbuild, and schroot (Closes: #817236). + * Add autopkgtest support to test various scenarios. + + [ Cyril Brulebois ] + * Uniformize COMPONENTS/USE_COMPONENTS handling. + + -- Cyril Brulebois <kibi(a)debian.org> Fri, 10 Mar 2017 13:10:56 +0100 + +debootstrap (1.0.88) unstable; urgency=high + + [ Sven Joachim ] + * Strip the arch-qualifier (Closes: #836525) + + -- Steve McIntyre <93sam(a)debian.org> Wed, 08 Feb 2017 23:53:10 +0000 + +debootstrap (1.0.87) unstable; urgency=high + + [ Julien Cristau ] + * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps + (closes: #844221). + + [ Riku Voipio ] + * remove scratchbox2 support (closes: #796189) + + -- Christian Perrier <bubulle(a)debian.org> Wed, 16 Nov 2016 06:47:27 +0100 + +debootstrap (1.0.86) unstable; urgency=high + + * Rework split_inline_sig by using shell built-ins instead of trying to + mix sed and tr together, which might work on regular systems but not + from inside the Debian Installer (Closes: #842591). Thanks to Ansgar + Burchardt for the proof of concept! + + -- Cyril Brulebois <kibi(a)debian.org> Sun, 30 Oct 2016 23:35:45 +0100 + +debootstrap (1.0.85) unstable; urgency=medium + + [ Julien Cristau ] + * Add support for downloading and validating InRelease files, by splitting + up detached signature from signed data. + * Switch default mirror to deb.debian.org. + + [ Colin Watson ] + * Add (Ubuntu) zesty as a symlink to gutsy. + + [ Ansgar Burchardt ] + * Add jessie-kfreebsd to merged-/usr blacklist. + * No longer Build-Depend on makedev. The code using it was already + removed in debootstrap 1.0.82. + * Do not use `tar -k` for older releases which might have file + conflicts between the packages to be installed. (Closes: #838388) + * Error out when seeing short options. (Closes: #548880) + * Add oldoldstable -> sid script symlink. (Closes: #792734) + * Add buster -> sid and bullseye -> sid script symlinks. + * Only unpack and configure the base system when there are actually + packages to install. (Closes: #825034) + * debootstrap.8: Use stretch instead of wheezy in examples. + + [ Marco d'Itri ] + * Enable merged-/usr by default. (Closes: #839046) + + -- Julien Cristau <jcristau(a)debian.org> Fri, 21 Oct 2016 20:22:49 +0200 + +debootstrap (1.0.84) unstable; urgency=medium + + [ Ansgar Burchardt ] + * Add support for xz-compressed Packages indices. (Closes: #837649) + + -- Christian Perrier <bubulle(a)debian.org> Thu, 06 Oct 2016 06:59:38 +0200 + +debootstrap (1.0.83) unstable; urgency=medium + + [ Ansgar Burchardt ] + * functions: Validate that the requested suite is listed in the + Release file's Suite or Codename field. (Closes: #837075) + * Add support for merged-/usr, enabled by a new --merged-usr option. + (Closes: #810301) + * Feign install of dpkg in second stage. This avoids problems when + using dpkg-deb together with busybox' tar. (Closes: #837185) + * README: Use https://. + + [ Steve McIntyre ] + * Update Standards-Version to 3.9.8 (no changes needed) + + -- Steve McIntyre <93sam(a)debian.org> Tue, 13 Sep 2016 13:16:41 +0100 + +debootstrap (1.0.82) unstable; urgency=medium + + [ Alex Bennée ] + * Excise all devices.tar.gz code. Closes: #830869 + + -- Christian Perrier <bubulle(a)debian.org> Thu, 08 Sep 2016 07:09:56 +0200 + +debootstrap (1.0.81) unstable; urgency=medium + + [ Luca Falavigna ] + * Add (Ubuntu) yakkety as a symlink to gutsy. + + -- Christian Perrier <bubulle(a)debian.org> Tue, 03 May 2016 06:51:57 +0200 + +debootstrap (1.0.80) unstable; urgency=medium + + [ Jon Boden ] + * scripts/gutsy: Support kfreebsd & hurd arches on Ubuntu targets + (closes: #818748) + + -- Christian Perrier <bubulle(a)debian.org> Tue, 22 Mar 2016 19:27:45 +0100 + debootstrap (1.0.79) unstable; urgency=medium [ Samuel Thibault ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/control new/debootstrap-1.0.90/debian/control --- old/debootstrap-1.0.79/debian/control 2016-01-30 05:03:04.000000000 +0100 +++ new/debootstrap-1.0.90/debian/control 2016-10-21 05:01:55.000000000 +0200 @@ -3,8 +3,8 @@ Priority: extra Maintainer: Debian Install System Team <debian-boot(a)lists.debian.org> Uploaders: Junichi Uekawa <dancer(a)debian.org>, Colin Watson <cjwatson(a)debian.org>, Christian Perrier <bubulle(a)debian.org>, Steve McIntyre <93sam(a)debian.org> -Build-Depends: debhelper (>= 9), makedev (>= 2.3.1-69) [linux-any] -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/d-i/debootstrap.git Vcs-Git: https://anonscm.debian.org/git/d-i/debootstrap.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/control new/debootstrap-1.0.90/debian/tests/control --- old/debootstrap-1.0.79/debian/tests/control 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/control 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,10 @@ +Tests: debian-testing +Depends: + debootstrap, + libdistro-info-perl, + libdpkg-perl, + libipc-run-perl, + perl, + systemd [linux-any], + systemd-container [linux-any], +Restrictions: allow-stderr, needs-root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/debian-testing new/debootstrap-1.0.90/debian/tests/debian-testing --- old/debootstrap-1.0.79/debian/tests/debian-testing 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/debian-testing 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,278 @@ +#!/usr/bin/perl +# Verify that debootstrap'ing Debian testing produces a usable chroot, +# and in particular that using it with early 2017 versions of schroot and +# pbuilder results in working pseudo-terminals (#817236) +# +# Copyright © 2017 Simon McVittie +# SPDX-License-Identifier: MIT +# (see debian/copyright) + +use strict; +use warnings; + +use Cwd qw(getcwd); +use Debian::DistroInfo; +use Dpkg::Version; +use IPC::Run qw(run); +use Test::More; + +my $srcdir = getcwd; + +sub verbose_run { + my $argv = shift; + diag("Running: @{$argv}"); + return run($argv, @_); +} + +sub capture { + my $output; + my $argv = shift; + ok(verbose_run($argv, '>', \$output), "@{$argv}"); + chomp $output; + return $output; +} + +sub check_fake_schroot { + my %params = @_; + my $reference = $params{reference}; + my $version = $params{version} || '1.6.10-3'; + my $extra_argv = $params{extra_argv} || []; + + # Use unshare -m to make sure the /dev mount gets cleaned up on exit, even + # on failures + my $response = capture([qw(unshare -m), + "$srcdir/debian/tests/fake/schroot-$version", @{$extra_argv}, + $params{chroot}, + qw(runuser -u nobody --), + qw(script -q -c), 'cat /etc/debian_version', '/dev/null']); + $response =~ s/\r//g; + is($response, $reference, 'script(1) should work under (fake) schroot'); +} + +sub check_fake_pbuilder { + my %params = @_; + my $reference = $params{reference}; + my $version = $params{version} || '0.228.4-1'; + + my $response = capture([qw(unshare -m), + "$srcdir/debian/tests/fake/pbuilder-$version", $params{chroot}, + qw(runuser -u nobody --), + qw(script -q -c), 'cat /etc/debian_version', '/dev/null']); + $response =~ s/\r//g; + is($response, $reference, + 'script(1) should work under (fake) pbuilder'); +} + +sub check_chroot { + my %params = @_; + my $chroot = $params{chroot}; + my $response; + + ok(-f "$chroot/etc/debian_version", + 'chroot should have /etc/debian_version'); + ok(-x "$chroot/usr/bin/env", + 'chroot should have /usr/bin/env which is Essential'); + ok(-x "$chroot/usr/bin/hello", 'chroot should have /usr/bin/hello due to --include'); + ok(-d "$chroot/usr/share/doc", 'chroot should have /usr/share/doc'); + + ok(-c "$chroot/dev/full", '/dev/full should be a character device'); + is(capture(['/usr/bin/stat', '--printf=%t %T %a', "$chroot/dev/full"]), + '1 7 666', '/dev/full should be device 1,7 with 0666 permissions'); + ok(-c "$chroot/dev/null"); + is(capture(['/usr/bin/stat', '--printf=%t %T %a', "$chroot/dev/null"]), + '1 3 666', '/dev/null should be device 1,3 with 0666 permissions'); + + my $did_mknod_ptmx; + + if (-l "$chroot/dev/ptmx") { + # Necessary if debootstrap is run inside some containers, see + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236#77 + diag("/dev/ptmx is a symbolic link"); + like(readlink("$chroot/dev/ptmx"), qr{(?:/dev/)?pts/ptmx}, + 'if /dev/ptmx is a symlink it should be to /dev/pts/ptmx'); + $did_mknod_ptmx = 0; + } + else { + diag("/dev/ptmx is not a symbolic link"); + ok(-c "$chroot/dev/ptmx", + 'if /dev/pts is not a symlink it should be a character device'); + is(capture(['/usr/bin/stat', '--printf=%t %T %a', + "$chroot/dev/ptmx"]), '5 2 666', + 'if /dev/pts is a device node it should be 5,2 with 0666 permissions'); + $did_mknod_ptmx = 1; + } + + if ($params{can_mknod_ptmx}) { + ok($did_mknod_ptmx, 'able to mknod ptmx so should have done so'); + } + + my $reference = capture(['cat', "$chroot/etc/debian_version"]); + + is(capture([qw(chroot chroot.d runuser -u nobody -- + cat /etc/debian_version)]), + $reference); + + check_fake_schroot(%params, reference => $reference); + check_fake_schroot(%params, reference => $reference, version => 'proposed'); + check_fake_schroot(%params, reference => $reference, version => 'proposed', + extra_argv => ['--sbuild']); + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236 + if (Dpkg::Version->new($params{kernel}) < Dpkg::Version->new('4.7') && + defined $params{container} && $params{container} eq 'lxc') { + TODO: { + local $TODO = "schroot --sbuild doesn't work in lxc on older ". + "kernels"; + check_fake_schroot(%params, reference => $reference, + extra_argv => ['--sbuild']); + } + } + elsif (! $params{can_mknod_ptmx}) { + TODO: { + local $TODO = "schroot --sbuild doesn't work when /dev/ptmx is ". + "a symlink to /dev/pts/ptmx"; + check_fake_schroot(%params, reference => $reference, + extra_argv => ['--sbuild']); + } + } + else { + check_fake_schroot(%params, reference => $reference, + extra_argv => ['--sbuild']); + } + + check_fake_pbuilder(%params, reference => $reference, + version => 'proposed'); + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236 + if (! $params{can_mknod_ptmx}) { + TODO: { + local $TODO = "schroot --sbuild doesn't work when /dev/ptmx is ". + "a symlink to /dev/pts/ptmx"; + check_fake_pbuilder(%params, reference => $reference); + } + } + else { + check_fake_pbuilder(%params, reference => $reference); + } +} + +my $mirror = 'http://deb.debian.org/debian'; +my $tmp = $ENV{AUTOPKGTEST_TMP} || $ENV{ADTTMP}; +die "no autopkgtest temporary directory specified" unless $tmp; +chdir $tmp or die "chdir $tmp: $!"; + +$ENV{LC_ALL} = 'C.UTF-8'; + +# Try to inherit a Debian mirror from the host +foreach my $file ('/etc/apt/sources.list', + glob('/etc/apt/sources.list.d/*.list')) { + open(my $fh, '<', $file); + while (<$fh>) { + if (m{^deb\s+(http://[-a-zA-Z0-9.:]+/debian)\s}) { + $mirror = $1; + last; + } + } + close $fh; +} + +if (run(['ischroot'], '>&2')) { + diag("In a chroot according to ischroot(1)"); +} +else { + diag("Not in a chroot according to ischroot(1)"); +} + +my $virtualization; +if ($^O ne 'linux') { + diag("Cannot use systemd-detect-virt on non-Linux"); +} +elsif (run(['systemd-detect-virt', '--vm'], '>', \$virtualization)) { + chomp $virtualization; + diag("Virtualization: $virtualization"); +} +else { + $virtualization = undef; + diag("Virtualization: (not in a virtual machine)"); +} + +my $in_container = 0; +my $container; +if ($^O ne 'linux') { + diag("Cannot use systemd-detect-virt on non-Linux"); +} +elsif (run(['systemd-detect-virt', '--container'], '>', \$container)) { + $in_container = 1; + chomp $container; + diag("Container: $container"); +} +else { + $container = undef; + diag("Container: (not in a container)"); +} + +my $kernel = capture([qw(uname -r)]); +chomp $kernel; + +open(my $fh, '<', '/proc/self/mountinfo'); +while (<$fh>) { + chomp; + diag("mountinfo: $_"); +} +close $fh; + +my $can_mknod_ptmx; +if (run([qw(mknod -m000 ptmx c 5 2)], '&>', '/dev/null')) { + diag("mknod ptmx succeeded"); + $can_mknod_ptmx = 1; +} +else { + diag("mknod ptmx failed, are we in a container?"); + $can_mknod_ptmx = 0; +} + +my $distro_info = DebianDistroInfo->new; +my $testing = $distro_info->testing; + +if (!verbose_run(['debootstrap', + '--include=debootstrap,debian-archive-keyring,gnupg,hello', + '--variant=minbase', + $testing, 'chroot.d', $mirror], '>&2')) { + BAIL_OUT("debootstrap failed: $?"); +} + +check_chroot(chroot => 'chroot.d', can_mknod_ptmx => $can_mknod_ptmx, + kernel => $kernel, container => $container); + +if ($^O ne 'linux') { + diag("Cannot use systemd-nspawn on non-Linux"); +} +elsif ($in_container) { + diag('in a container according to systemd --container, not trying to '. + 'use systemd-nspawn'); +} +elsif (! -d '/run/systemd/system') { + diag('systemd not booted, not trying to use systemd-nspawn'); +} +else { + if (!verbose_run(['systemd-nspawn', '-D', 'chroot.d', + "--bind=$ENV{ADTTMP}:/mnt", + '--bind-ro=/usr/sbin/debootstrap', + '--bind-ro=/usr/share/debootstrap', + '--', + 'debootstrap', '--include=hello', '--variant=minbase', + $testing, '/mnt/from-nspawn.d', $mirror], '>&2')) { + BAIL_OUT("debootstrap wrapped in systemd-nspawn failed: $?"); + } + + check_chroot(chroot => 'from-nspawn.d', can_mknod_ptmx => 0, + kernel => $kernel, container => "nspawn"); +} + +if (!run([qw(rm -fr --one-file-system chroot.d)], '>&2')) { + BAIL_OUT('Unable to remove chroot.d'); +} + +done_testing; + +# vim:set sw=4 sts=4 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/fake/pbuilder-0.228.4-1 new/debootstrap-1.0.90/debian/tests/fake/pbuilder-0.228.4-1 --- old/debootstrap-1.0.79/debian/tests/fake/pbuilder-0.228.4-1 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/fake/pbuilder-0.228.4-1 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,31 @@ +#!/bin/sh +# fake/pbuilder-0.228.4-1 -- emulate how pbuilder/0.228.4-1 would chroot. +# It mounts /dev/pts, without explicitly requesting a new instance or a +# usable /dev/pts/ptmx. +# (There is of course a lot more that it does, but these are the parts that +# affect pty users like script(1).) +# +# Copyright © 2017 Simon McVittie +# SPDX-License-Identifier: MIT +# (see debian/copyright) + +set -e + +chroot="$1" +shift +if test -z "$chroot" || test -z "$1"; then + echo "Usage: $0 CHROOT COMMAND...">&2 + exit 2 +fi + +mkdir -p "$chroot/dev/pts" +mount -t devpts none "$chroot/dev/pts" -onoexec,nosuid,gid=5,mode=620 + +ls -l "$chroot/dev/ptmx" | sed -e 's/^/# fake-pbuilder: /' >&2 +ls -l "$chroot/dev/pts/ptmx" | sed -e 's/^/# fake-pbuilder: /' >&2 + +e=0 +chroot "$chroot" "$@" || e=$? + +umount "$chroot/dev/pts" +exit "$e" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/fake/pbuilder-proposed new/debootstrap-1.0.90/debian/tests/fake/pbuilder-proposed --- old/debootstrap-1.0.79/debian/tests/fake/pbuilder-proposed 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/fake/pbuilder-proposed 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,54 @@ +#!/bin/sh +# fake/pbuilder-proposed -- emulate how pbuilder is proposed to chroot in +# future. +# +# Copyright © 2017 Simon McVittie +# SPDX-License-Identifier: MIT +# (see debian/copyright) + +set -e + +BUILDPLACE="$1" +shift +if test -z "$BUILDPLACE" || test -z "$1"; then + echo "Usage: $0 CHROOT COMMAND...">&2 + exit 2 +fi + +devpts_options="noexec,nosuid,gid=5,mode=620" + +mkdir -p "$BUILDPLACE/dev/pts" +if ! mount -t devpts none "$BUILDPLACE/dev/pts" -o "$devpts_options,newinstance,ptmxmode=666"; then + mount -t devpts none "$BUILDPLACE/dev/pts" -o "$devpts_options" +fi + +mounted_ptmx=no + +if [ -e "$BUILDPLACE/dev/pts/ptmx" ] && \ + ! [ -L "$BUILDPLACE/dev/ptmx" ]; then + chmod 666 "$BUILDPLACE/dev/pts/ptmx" + mount --bind "$BUILDPLACE/dev/pts/ptmx" "$BUILDPLACE/dev/ptmx" + mounted_ptmx=yes +fi + +mounted_console=no + +if stdin_tty="$(tty)"; then + if [ ! -e "$BUILDPLACE/dev/console" ]; then + mknod -m700 "$BUILDPLACE/dev/console" c 5 1 + fi + + mount --bind "$stdin_tty" "$BUILDPLACE/dev/console" + mounted_console=yes +fi + +ls -l "$BUILDPLACE/dev/ptmx" | sed -e 's/^/# fake-pbuilder: /' >&2 +ls -l "$BUILDPLACE/dev/pts/ptmx" | sed -e 's/^/# fake-pbuilder: /' >&2 + +e=0 +chroot "$BUILDPLACE" "$@" || e=$? + +[ "$mounted_console" = no ] || umount "$BUILDPLACE/dev/console" +[ "$mounted_ptmx" = no ] || umount "$BUILDPLACE/dev/ptmx" +umount "$BUILDPLACE/dev/pts" +exit "$e" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/fake/schroot-1.6.10-3 new/debootstrap-1.0.90/debian/tests/fake/schroot-1.6.10-3 --- old/debootstrap-1.0.79/debian/tests/fake/schroot-1.6.10-3 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/fake/schroot-1.6.10-3 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,47 @@ +#!/bin/sh +# fake/schroot-1.6.10-3 -- emulate how schroot/1.6.10-3 would chroot. +# It bind-mounts /dev/pts and maybe /dev from the host system. +# (There is of course a lot more that it does, but these are the parts that +# affect pty users like script(1).) +# +# Copyright © 2017 Simon McVittie +# SPDX-License-Identifier: MIT +# (see debian/copyright) + +set -e + +# /etc/schroot/default/fstab +bind_dev=yes + +while true; do + case "$1" in + (--sbuild) + shift + # /etc/schroot/sbuild/fstab + bind_dev=no + ;; + (*) + break + esac +done + +chroot="$1" +shift +if test -z "$chroot" || test -z "$1"; then + echo "Usage: $0 CHROOT COMMAND...">&2 + exit 2 +fi + +[ "$bind_dev" = no ] || mount --bind /dev "$chroot/dev" +mount --bind /dev/pts "$chroot/dev/pts" + +ls -l "$chroot/dev/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 +ls -l "$chroot/dev/pts/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 + +e=0 +chroot "$chroot" "$@" || e=$? + +umount "$chroot/dev/pts" +[ "$bind_dev" = no ] || umount "$chroot/dev" + +exit "$e" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debian/tests/fake/schroot-proposed new/debootstrap-1.0.90/debian/tests/fake/schroot-proposed --- old/debootstrap-1.0.79/debian/tests/fake/schroot-proposed 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/debian/tests/fake/schroot-proposed 2017-03-11 05:01:25.000000000 +0100 @@ -0,0 +1,68 @@ +#!/bin/sh +# fake/schroot-proposed -- emulate proposed mount behaviour for schroot +# +# Copyright © 2017 Simon McVittie +# SPDX-License-Identifier: MIT +# (see debian/copyright) + +set -e + +# /etc/schroot/default/fstab +bind_dev=yes + +while true; do + case "$1" in + (--sbuild) + shift + # /etc/schroot/sbuild/fstab + bind_dev=no + ;; + (*) + break + esac +done + +CHROOT_PATH="$1" +shift +if test -z "$CHROOT_PATH" || test -z "$1"; then + echo "Usage: $0 CHROOT COMMAND...">&2 + exit 2 +fi + +[ "$bind_dev" = no ] || mount --bind /dev "$CHROOT_PATH/dev" +mount -t devpts -o rw,newinstance,ptmxmode=666,mode=620,gid=5 /dev/pts "$CHROOT_PATH/dev/pts" + +ls -l "$CHROOT_PATH/dev/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 +ls -l "$CHROOT_PATH/dev/pts/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 + +mounted_ptmx=no + +if [ -e "$CHROOT_PATH/dev/pts/ptmx" ] && \ + ! [ -L "$CHROOT_PATH/dev/ptmx" ]; then + mount --bind "$CHROOT_PATH/dev/pts/ptmx" "$CHROOT_PATH/dev/ptmx" + mounted_ptmx=yes +fi + +mounted_console=no + +if stdin_tty="$(tty)"; then + if [ ! -e "$CHROOT_PATH/dev/console" ]; then + mknod -m700 "$CHROOT_PATH/dev/console" c 5 1 + fi + + mount --bind "$stdin_tty" "$CHROOT_PATH/dev/console" + mounted_console=yes +fi + +ls -l "$CHROOT_PATH/dev/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 +ls -l "$CHROOT_PATH/dev/pts/ptmx" | sed -e 's/^/# fake-schroot: /' >&2 + +e=0 +chroot "$CHROOT_PATH" "$@" || e=$? + +[ "$mounted_console" = no ] || umount "$CHROOT_PATH/dev/console" +[ "$mounted_ptmx" = no ] || umount "$CHROOT_PATH/dev/ptmx" +umount "$CHROOT_PATH/dev/pts" +[ "$bind_dev" = no ] || umount "$CHROOT_PATH/dev" + +exit "$e" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debootstrap new/debootstrap-1.0.90/debootstrap --- old/debootstrap-1.0.79/debootstrap 2015-11-09 05:01:25.000000000 +0100 +++ new/debootstrap-1.0.90/debootstrap 2016-11-14 05:01:52.000000000 +0100 @@ -18,8 +18,6 @@ fi fi -DEVICES_TARGZ=$DEBOOTSTRAP_DIR/devices.tar.gz - . $DEBOOTSTRAP_DIR/functions exec 4>&1 @@ -29,6 +27,7 @@ DISABLE_KEYRING="" FORCE_KEYRING="" VARIANT="" +MERGED_USR="no" ARCH="" HOST_ARCH="" HOST_OS="" @@ -47,8 +46,8 @@ CHECKCERTIF="" PRIVATEKEY="" -DEF_MIRROR="http://httpredir.debian.org/debian" -DEF_HTTPS_MIRROR="https://mirrors.kernel.org/debian" +DEF_MIRROR="http://deb.debian.org/debian" +DEF_HTTPS_MIRROR="https://deb.debian.org/debian" export LANG USE_COMPONENTS umask 022 @@ -101,7 +100,8 @@ archive --variant=X use variant X of the bootstrap scripts (currently supported variants: buildd, fakechroot, - scratchbox, minbase) + minbase) + --merged-usr make /{bin,sbin,lib}/ symlinks to /usr/ --keyring=K check Release files against keyring K --no-check-gpg avoid checking Release file signatures --force-check-gpg force checking Release file signatures @@ -304,6 +304,14 @@ error 1 NEEDARG "option requires an argument %s" "$1" fi ;; + --merged-usr) + MERGED_USR=yes + shift + ;; + --no-merged-usr) + MERGED_USR=no + shift + ;; --keyring|--keyring=?*) if ! gpgv --version >/dev/null 2>&1; then error 1 NEEDGPGV "gpgv not installed, but required for Release verification" @@ -352,7 +360,7 @@ CHECKCERTIF="--no-check-certificate" shift ;; - --*) + -*) error 1 BADARG "unrecognized or invalid option %s" "$1" ;; *) @@ -456,16 +464,6 @@ if [ "$TARGET" = "/" ]; then CHROOT_CMD="" -elif doing_variant scratchbox; then - for config in ~/.scratchbox2/*/sb2.config; - do - export `grep ^SBOX_TARGET_ROOT= $config` - if [ "x$SBOX_TARGET_ROOT" = "x$TARGET" ]; then - SB2_TARGET=$(basename $(dirname $config)) - fi - done - [ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET" - CHROOT_CMD="sb2 -eR -t $SB2_TARGET" else CHROOT_CMD="chroot $TARGET" fi @@ -635,7 +633,6 @@ if ! am_doing_phase second_stage; then cp "$0" "$TARGET/debootstrap/debootstrap" cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions" - cp $DEBOOTSTRAP_DIR/devices.tar.gz "$TARGET/debootstrap/devices.tar.gz" cp $SCRIPT "$TARGET/debootstrap/suite-script" echo "$ARCH" >"$TARGET/debootstrap/arch" echo "$SUITE" >"$TARGET/debootstrap/suite" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/debootstrap.8 new/debootstrap-1.0.90/debootstrap.8 --- old/debootstrap-1.0.79/debootstrap.8 2015-05-15 05:01:24.000000000 +0200 +++ new/debootstrap-1.0.90/debootstrap.8 2016-11-14 05:01:52.000000000 +0100 @@ -26,7 +26,7 @@ .PP The .I SUITE -may be a release code name (eg, sid, jessie, wheezy) +may be a release code name (eg, sid, stretch, jessie) or a symbolic name (eg, unstable, testing, stable, oldstable) .PP Notice that file:/ URLs are translated to file:/// (correct scheme as @@ -71,19 +71,24 @@ rely on this option. With this option set, this behaviour is disabled. .IP -.IP "\fB\-\-variant=minbase|buildd|fakechroot|scratchbox\fP" +.IP "\fB\-\-variant=minbase|buildd|fakechroot\fP" Name of the bootstrap script variant to use. Currently, the variants supported are minbase, which only includes essential packages and apt; buildd, which installs the build-essential packages into .IR TARGET ; and fakechroot, which installs the packages without root privileges. -Finally there is variant scratchbox, which is for creating targets -for scratchbox usage. The default, with no \fB\-\-variant=X\fP argument, is to create a base Debian installation in .IR TARGET . .IP +.IP "\fB\-\-merged-usr\fP" +Create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. +.IP +.IP "\fB\-\-no-merged-usr\fP" +Do not create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. +(Default.) +.IP .IP "\fB\-\-keyring=KEYRING\fP" Override the default keyring for the distribution being bootstrapped, and use @@ -160,16 +165,16 @@ .SH EXAMPLES . .PP -To setup a \fIwheezy\fR system: +To setup a \fIstretch\fR system: .PP - debootstrap wheezy ./wheezy-chroot http://httpredir.debian.org/debian + debootstrap stretch ./stretch-chroot http://deb.debian.org/debian .PP - debootstrap wheezy ./wheezy-chroot file:///LOCAL_MIRROR/debian + debootstrap stretch ./stretch-chroot file:///LOCAL_MIRROR/debian .PP Full process to create a complete Debian installation of \fIsid\fR (unstable) in a chroot: .PP - main # debootstrap sid sid-root http://httpredir.debian.org/debian/ + main # debootstrap sid sid-root http://deb.debian.org/debian/ [ ... watch it download the whole system ] main # echo "proc sid-root/proc proc defaults 0 0" >> /etc/fstab main # mount proc sid-root/proc -t proc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/functions new/debootstrap-1.0.90/functions --- old/debootstrap-1.0.79/functions 2016-02-18 05:01:23.000000000 +0100 +++ new/debootstrap-1.0.90/functions 2017-03-11 05:01:25.000000000 +0100 @@ -331,6 +331,7 @@ local iters=0 case "$typ" in + xz) from="$1.xz"; dest="$2.xz" ;; bz2) from="$1.bz2"; dest="$2.bz2" ;; gz) from="$1.gz"; dest="$2.gz" ;; *) from="$1"; dest="$2" ;; @@ -358,6 +359,7 @@ case "$typ" in gz) gunzip "$dest" ;; bz2) bunzip2 "$dest" ;; + xz) unxz "$dest" ;; esac return 0 else @@ -512,18 +514,86 @@ fi } -download_release_sig () { - local m1="$1" +CODENAME="" +validate_suite () { + local reldest="$1" + + CODENAME=$(sed -n "s/^Codename: *//p" "$reldest") + local suite=$(sed -n "s/^Suite: *//p" "$reldest") + + if [ "$SUITE" != "$suite" ] && [ "$SUITE" != "$CODENAME" ]; then + error 1 WRONGSUITE "Asked to install suite %s, but got %s (codename: %s) from mirror" "$SUITE" "$suite" "$CODENAME" + fi +} + +split_inline_sig () { + local inreldest="$1" local reldest="$2" local relsigdest="$3" + # Note: InRelease files are fun since one needs to remove the + # last newline from the PGP SIGNED MESSAGE part, while keeping + # the PGP SIGNATURE part intact. This shell implementation + # should work on most if not all systems, instead of trying to + # sed/tr/head, etc. + rm -f "$reldest" "$relsigdest" + nl="" + state=pre-begin + while IFS= read -r line; do + case "${state}" in + pre-begin) + if [ "x${line}" = "x-----BEGIN PGP SIGNED MESSAGE-----" ]; then + state=begin + fi + ;; + begin) + if [ "x${line}" = "x" ]; then + state=data + fi + ;; + data) + if [ "x${line}" = "x-----BEGIN PGP SIGNATURE-----" ]; then + printf "%s\n" "${line}" > "$relsigdest" + state=signature + else + printf "${nl}%s" "${line}" >> "$reldest" + nl="\n" + fi + ;; + signature) + printf "%s\n" "${line}" >> "$relsigdest" + if [ "x${line}" = "x-----END PGP SIGNATURE-----" ]; then + break + fi + esac + done < "$inreldest" +} + +download_release_sig () { + local m1="$1" + local inreldest="$2" + local reldest="$3" + local relsigdest="$4" + + progress 0 100 DOWNREL "Downloading Release file" + progress_next 100 + if get "$m1/dists/$SUITE/InRelease" "$inreldest" nocache; then + split_inline_sig "$inreldest" "$reldest" "$relsigdest" + progress 100 100 DOWNREL "Downloading Release file" + else + get "$m1/dists/$SUITE/Release" "$reldest" nocache || + error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release" + progress 100 100 DOWNREL "Downloading Release file" + fi if [ -n "$KEYRING" ] && [ -z "$DISABLE_KEYRING" ]; then progress 0 100 DOWNRELSIG "Downloading Release file signature" - progress_next 50 - get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache || - error 1 NOGETRELSIG "Failed getting release signature file %s" \ - "$m1/dists/$SUITE/Release.gpg" - progress 50 100 DOWNRELSIG "Downloading Release file signature" + if ! [ -f "$relsigdest" ]; then + progress_next 50 + get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache || + error 1 NOGETRELSIG "Failed getting release signature file %s" \ + "$m1/dists/$SUITE/Release.gpg" + progress 50 100 DOWNRELSIG "Downloading Release file signature" + fi info RELEASESIG "Checking Release signature" # Don't worry about the exit status from gpgv; parsing the output will @@ -536,22 +606,20 @@ download_release_indices () { local m1="${MIRRORS%% *}" + local inreldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/InRelease")" local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release")" - local relsigdest - progress 0 100 DOWNREL "Downloading Release file" - progress_next 100 - get "$m1/dists/$SUITE/Release" "$reldest" nocache || - error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release" - relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")" - progress 100 100 DOWNREL "Downloading Release file" + local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")" - download_release_sig "$m1" "$reldest" "$relsigdest" + download_release_sig "$m1" "$inreldest" "$reldest" "$relsigdest" + + validate_suite "$reldest" extract_release_components $reldest local totalpkgs=0 for c in $COMPONENTS; do local subpath="$c/binary-$ARCH/Packages" + local xzi="`get_release_checksum "$reldest" "$subpath.xz"`" local bz2i="`get_release_checksum "$reldest" "$subpath.bz2"`" local gzi="`get_release_checksum "$reldest" "$subpath.gz"`" local normi="`get_release_checksum "$reldest" "$subpath"`" @@ -560,6 +628,8 @@ i="$normi" elif in_path bunzip2 && [ "$bz2i" != "" ]; then i="$bz2i" + elif in_path unxz && [ "$xzi" != "" ]; then + i="$xzi" elif in_path gunzip && [ "$gzi" != "" ]; then i="$gzi" fi @@ -577,6 +647,7 @@ for c in $COMPONENTS; do local subpath="$c/binary-$ARCH/Packages" local path="dists/$SUITE/$subpath" + local xzi="`get_release_checksum "$reldest" "$subpath.xz"`" local bz2i="`get_release_checksum "$reldest" "$subpath.bz2"`" local gzi="`get_release_checksum "$reldest" "$subpath.gz"`" local normi="`get_release_checksum "$reldest" "$subpath"`" @@ -586,6 +657,10 @@ ext="$ext $normi ." i="$normi" fi + if in_path unxz && [ "$xzi" != "" ]; then + ext="$ext $xzi xz" + i="${i:-$xzi}" + fi if in_path bunzip2 && [ "$bz2i" != "" ]; then ext="$ext $bz2i bz2" i="${i:-$bz2i}" @@ -795,6 +870,7 @@ ################################################################ extraction EXTRACTORS_SUPPORTED="dpkg-deb ar" +EXTRACT_DEB_TAR_OPTIONS= # Native dpkg-deb based extractors extract_dpkg_deb_field () { @@ -807,7 +883,7 @@ extract_dpkg_deb_data () { local pkg="$1" - dpkg-deb --fsys-tarfile "$pkg" | tar -xf - + dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf - } # Raw .deb extractors @@ -845,7 +921,7 @@ esac if type $cat_cmd >/dev/null 2>&1; then - ar -p "$pkg" "$tarball" | $cat_cmd | tar -xf - + ar -p "$pkg" "$tarball" | $cat_cmd | tar $EXTRACT_DEB_TAR_OPTIONS -xf - else error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd" fi @@ -958,11 +1034,9 @@ setup_apt_sources () { mkdir -p "$TARGET/etc/apt" - # Cope with the foreign case where COMPONENTS would be empty: - sources_components="${COMPONENTS:-$USE_COMPONENTS}" for m in "$@"; do local cs="" - for c in $sources_components; do + for c in ${COMPONENTS:-$USE_COMPONENTS}; do local path="dists/$SUITE/$c/binary-$ARCH/Packages" local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")" if [ -e "$pkgdest" ]; then cs="$cs $c"; fi @@ -1065,13 +1139,7 @@ hurd*) ;; *) - if true; then - setup_devices_simple - elif [ -e "$DEVICES_TARGZ" ]; then - zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -) - else - error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ" - fi + setup_devices_simple ;; esac } @@ -1103,7 +1171,12 @@ mknod -m 666 $TARGET/dev/urandom c 1 9 mknod -m 666 $TARGET/dev/tty c 5 0 mkdir $TARGET/dev/pts/ $TARGET/dev/shm/ - ln -s pts/ptmx $TARGET/dev/ptmx + # Inside a container, we might not be allowed to create /dev/ptmx. + # If not, do the next best thing. + if ! mknod -m 666 $TARGET/dev/ptmx c 5 2; then + warning MKNOD "Could not create /dev/ptmx, falling back to symlink. This chroot will require /dev/pts mounted with ptmxmode=666" + ln -s pts/ptmx $TARGET/dev/ptmx + fi ln -s /proc/self/fd $TARGET/dev/fd ln -s /proc/self/fd/0 $TARGET/dev/stdin ln -s /proc/self/fd/1 $TARGET/dev/stdout @@ -1128,6 +1201,43 @@ esac } +# Find out where the runtime dynamic linker and the shared libraries +# can be installed on each architecture: native, multilib and multiarch. +# This data can be verified by checking the files in the debian/sysdeps/ +# directory of the glibc package. +# +# This function must be updated to support any new architecture which +# either installs the RTLD in a directory different from /lib or builds +# multilib library packages. +setup_merged_usr() { + if [ "$MERGED_USR" = "no" ]; then return 0; fi + + local link_dir + case $ARCH in + hurd-*) return 0 ;; + amd64) link_dir="lib32 lib64 libx32" ;; + i386) link_dir="lib64 libx32" ;; + mips|mipsel) + link_dir="lib32 lib64" ;; + mips64*|mipsn32*) + link_dir="lib32 lib64 libo32" ;; + powerpc) link_dir="lib64" ;; + ppc64) link_dir="lib32 lib64" ;; + ppc64el) link_dir="lib64" ;; + s390x) link_dir="lib32" ;; + sparc) link_dir="lib64" ;; + sparc64) link_dir="lib32 lib64" ;; + x32) link_dir="lib32 lib64 libx32" ;; + esac + link_dir="bin sbin lib $link_dir" + + local dir + for dir in $link_dir; do + ln -s usr/$dir $TARGET/$dir + mkdir -p $TARGET/usr/$dir + done +} + ################################################################ pkgdetails # NOTE @@ -1229,6 +1339,7 @@ for $d (split /\s*,\s*/, $1) { $d =~ s/\s*[|].*$//; $d =~ s/\s*[(].*[)]\s*//; + $d =~ s/:.*//; push @d, $d; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/aequorea new/debootstrap-1.0.90/scripts/aequorea --- old/debootstrap-1.0.79/scripts/aequorea 2016-02-18 05:01:23.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/aequorea 2016-11-14 05:01:52.000000000 +0100 @@ -1,7 +1,7 @@ mirror_style release download_style apt finddebs_style from-indices -variants - buildd fakechroot minbase scratchbox +variants - buildd fakechroot minbase keyring /usr/share/keyrings/tanglu-archive-keyring.gpg default_mirror http://archive.tanglu.org/tanglu @@ -26,7 +26,7 @@ # we want the Tanglu minimal dependency set to be installed base="$base tanglu-minimal" - elif doing_variant buildd || doing_variant scratchbox; then + elif doing_variant buildd; then base="apt build-essential" elif doing_variant minbase; then base="apt" @@ -91,8 +91,6 @@ if doing_variant fakechroot; then setup_proc_fakechroot - elif doing_variant scratchbox; then - true else setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/artful new/debootstrap-1.0.90/scripts/artful --- old/debootstrap-1.0.79/scripts/artful 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/artful 2017-06-30 18:43:36.419624930 +0200 @@ -0,0 +1 @@ +symbolic link to gutsy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/bullseye new/debootstrap-1.0.90/scripts/bullseye --- old/debootstrap-1.0.79/scripts/bullseye 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/bullseye 2017-06-30 18:43:36.395628306 +0200 @@ -0,0 +1 @@ +symbolic link to sid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/buster new/debootstrap-1.0.90/scripts/buster --- old/debootstrap-1.0.79/scripts/buster 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/buster 2017-06-30 18:43:36.515611430 +0200 @@ -0,0 +1 @@ +symbolic link to sid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/gutsy new/debootstrap-1.0.90/scripts/gutsy --- old/debootstrap-1.0.79/scripts/gutsy 2016-02-18 05:01:23.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/gutsy 2016-03-21 05:01:24.000000000 +0100 @@ -28,6 +28,8 @@ case $ARCH in alpha|ia64) LIBC="libc6.1" ;; + kfreebsd-*) LIBC="libc0.1" ;; + hurd-*) LIBC="libc0.3" ;; *) LIBC="libc6" ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/oldoldstable new/debootstrap-1.0.90/scripts/oldoldstable --- old/debootstrap-1.0.79/scripts/oldoldstable 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/oldoldstable 2017-06-30 18:43:36.363632807 +0200 @@ -0,0 +1 @@ +symbolic link to sid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/sid new/debootstrap-1.0.90/scripts/sid --- old/debootstrap-1.0.79/scripts/sid 2016-02-18 05:01:23.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/sid 2016-11-14 05:01:52.000000000 +0100 @@ -1,7 +1,7 @@ mirror_style release download_style apt finddebs_style from-indices -variants - buildd fakechroot minbase scratchbox +variants - buildd fakechroot minbase keyring /usr/share/keyrings/debian-archive-keyring.gpg if doing_variant fakechroot; then @@ -22,7 +22,7 @@ #required="$required $(get_debs Priority: important)" # ^^ should be getting debconf here somehow maybe base="$(get_debs Priority: important)" - elif doing_variant buildd || doing_variant scratchbox; then + elif doing_variant buildd; then base="apt build-essential" elif doing_variant minbase; then base="apt" @@ -41,6 +41,14 @@ } first_stage_install () { + case "$CODENAME" in + etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;; + *) + EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" + setup_merged_usr + ;; + esac + extract $required mkdir -p "$TARGET/var/lib/dpkg" @@ -54,11 +62,15 @@ fi setup_devices +} + +second_stage_install () { + setup_dynamic_devices x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" - local ver="$(extract_deb_field "$TARGET/$deb" Version)" + local ver="$(in_target dpkg-deb -f "$deb" Version)" mkdir -p "$TARGET/var/lib/dpkg/info" @@ -72,10 +84,6 @@ } x_feign_install dpkg -} - -second_stage_install () { - setup_dynamic_devices x_core_install () { smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") @@ -87,8 +95,6 @@ if doing_variant fakechroot; then setup_proc_fakechroot - elif doing_variant scratchbox; then - true else setup_proc in_target /sbin/ldconfig @@ -186,17 +192,19 @@ done_predeps="$done_predeps $predep" done - smallyes '' | - (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING + if [ -n "$base" ]; then + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING + fi mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" rm -f "$TARGET/usr/sbin/policy-rc.d" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/yakkety new/debootstrap-1.0.90/scripts/yakkety --- old/debootstrap-1.0.79/scripts/yakkety 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/yakkety 2017-06-30 18:43:36.359633370 +0200 @@ -0,0 +1 @@ +symbolic link to gutsy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.79/scripts/zesty new/debootstrap-1.0.90/scripts/zesty --- old/debootstrap-1.0.79/scripts/zesty 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.90/scripts/zesty 2017-06-30 18:43:36.371631681 +0200 @@ -0,0 +1 @@ +symbolic link to gutsy

4 years, 2 months

commit alac for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package alac for openSUSE:Factory checked in at 2017-06-30 18:42:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alac (Old) and /work/SRC/openSUSE:Factory/.alac.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alac" Fri Jun 30 18:42:21 2017 rev:3 rq:506971 version:0.0+git.20160511 Changes: -------- --- /work/SRC/openSUSE:Factory/alac/alac.changes 2016-10-20 23:10:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alac.new/alac.changes 2017-06-30 18:43:34.447902266 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 08:39:33 UTC 2017 - tchvatal(a)suse.com + +- Fix obvious typo where we had missing % in provides/obsoletes + +------------------------------------------------------------------- New: ---- _servicedata ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alac.spec ++++++ --- /var/tmp/diff_new_pack.qegORr/_old 2017-06-30 18:43:35.095811133 +0200 +++ /var/tmp/diff_new_pack.qegORr/_new 2017-06-30 18:43:35.099810571 +0200 @@ -1,7 +1,7 @@ # # spec file for package alac # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -56,8 +56,8 @@ Summary: Apple Lossless Audio Codec Group: Development/Libraries/C and C++ Requires: lib%{name}%{sover} = %{version} -Provides: lib{name}-devel = %{version} -Obsoletes: lib{name}-devel < %{version} +Provides: lib%{name}-devel = %{version} +Obsoletes: lib%{name}-devel < %{version} %description devel The Apple Lossless Audio Codec (ALAC) is an audio codec developed by Apple and ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/macosforge/alac.git</param> <param name="changesrevision">c38887c5c5e64a4b31108733bd79ca9b2496d987</param></service></servicedata>

4 years, 2 months

commit deadbeef for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package deadbeef for openSUSE:Factory checked in at 2017-06-30 18:42:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deadbeef (Old) and /work/SRC/openSUSE:Factory/.deadbeef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deadbeef" Fri Jun 30 18:42:19 2017 rev:2 rq:506723 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deadbeef/deadbeef.changes 2017-03-31 15:07:52.770024677 +0200 +++ /work/SRC/openSUSE:Factory/.deadbeef.new/deadbeef.changes 2017-06-30 18:43:33.544029400 +0200 @@ -1,0 +2,11 @@ +Tue Jun 27 21:32:39 UTC 2017 - olaf(a)aepfle.de + +- buildconditional for mad and mpg123 + +------------------------------------------------------------------- +Thu May 11 09:27:18 UTC 2017 - sor.alexei(a)meowr.ru + +- Enable building with libmpg123 and libmad for newer openSUSE + releases even outside of Packman. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deadbeef.spec ++++++ --- /var/tmp/diff_new_pack.EmxwsI/_old 2017-06-30 18:43:34.247930393 +0200 +++ /var/tmp/diff_new_pack.EmxwsI/_new 2017-06-30 18:43:34.251929830 +0200 @@ -16,6 +16,8 @@ # +%bcond_without mpg123 +%bcond_with mad %bcond_with restricted Name: deadbeef Version: 0.7.2 @@ -31,13 +33,13 @@ Patch1: %{name}-compiler-warnings.patch # PATCH-FEATURE-UPSTREAM deadbeef-add-appdata.patch -- Add a translateable AppStream metadata file, https://github.com/Alexey-Yakovenko/deadbeef/pull/1705 Patch2: %{name}-add-appdata.patch -BuildRequires: automake BuildRequires: autoconf -BuildRequires: libtool +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libjpeg-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xorg-x11-libs @@ -63,10 +65,14 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(wavpack) Recommends: %{name}-lang -%if %{with restricted} -BuildRequires: libfaad-devel +%if %{with mpg123} BuildRequires: pkgconfig(libmpg123) +%endif +%if %{with mad} BuildRequires: pkgconfig(mad) +%endif +%if %{with restricted} +BuildRequires: libfaad-devel Requires: %{name}-plugins-extra = %{version} %else Recommends: %{name}-plugins-extra = %{version} @@ -173,6 +179,9 @@ %{_libdir}/%{name}/converter.so* %{_libdir}/%{name}/dsp_libsrc.so* %{_libdir}/%{name}/m3u.so* +%if %{with mpg123} +%{_libdir}/%{name}/mp3.so* +%endif %{_libdir}/%{name}/vfs_zip.so* %{_libdir}/%{name}/ddb_dumb.so* %{_libdir}/%{name}/ddb_mono2stereo.so* @@ -198,8 +207,10 @@ %files plugins-extra %defattr(-,root,root) %{_libdir}/%{name}/aac.so* -%{_libdir}/%{name}/mp3.so* %{_libdir}/%{name}/ddb_ao.so* +%if %{with mpg123} +%{_libdir}/%{name}/mp3.so* +%endif %endif %files devel

4 years, 2 months

commit qmmp for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2017-06-30 18:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qmmp" Fri Jun 30 18:42:15 2017 rev:51 rq:506722 version:1.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2017-03-31 15:07:42.603461992 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2017-06-30 18:43:30.372475498 +0200 @@ -1,0 +2,24 @@ +Tue Jun 27 21:36:34 UTC 2017 - olaf(a)aepfle.de + +- build conditional for mad + +------------------------------------------------------------------- +Sat Jun 3 11:48:21 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 1.1.9: + * Use relative skin path for configuration portability. + * Improve WASAPI support. + * Fix cursors support in the skinned user interface. + * Fix freezing when using DirectSound output. + * Fix an issue with the "jump to track" dialogue when single + click activation is enabled. + * Fix tray icon tooltip. + * Fix FLAC bitrate calculation. + * Fix segmentation fault in the ffmpeg plugin. + * Fix documentation. + * Update French and Russian translations. +- Enable building with libmad for newer openSUSE releases even + outside of Packman. +- Add qmmp-fix-openmpt.patch: fix OpenMPT compatibility. + +------------------------------------------------------------------- Old: ---- qmmp-1.1.8.tar.bz2 New: ---- qmmp-1.1.9.tar.bz2 qmmp-fix-openmpt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.Zq9E6o/_old 2017-06-30 18:43:31.928256668 +0200 +++ /var/tmp/diff_new_pack.Zq9E6o/_new 2017-06-30 18:43:31.932256106 +0200 @@ -21,7 +21,7 @@ %bcond_with mad %bcond_with restricted Name: qmmp -Version: 1.1.8 +Version: 1.1.9 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0+ @@ -35,6 +35,8 @@ Patch1: %{name}-default-pulse.patch # PATCH-FIX-OPENSUSE qmmp-taglib-1.9.patch -- Extend TagLib support to 1.9. Patch2: %{name}-taglib-1.9.patch +# PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility. +Patch3: %{name}-fix-openmpt.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -144,6 +146,7 @@ %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake \ ++++++ qmmp-1.1.8.tar.bz2 -> qmmp-1.1.9.tar.bz2 ++++++ ++++ 14253 lines of diff (skipped) ++++++ qmmp-fix-openmpt.patch ++++++ --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -29,7 +29,6 @@ #include <QSettings> #include <math.h> #include <libmodplug/stdafx.h> -#include <libmodplug/it_defs.h> #include <libmodplug/sndfile.h> #include <qmmp/buffer.h> #include <qmmp/output.h> --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -25,7 +25,6 @@ #include <QStringList> #include <QRegExp> #include <libmodplug/stdafx.h> -#include <libmodplug/it_defs.h> #include <libmodplug/sndfile.h> #include "settingsdialog.h" #include "modplugmetadatamodel.h" --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -21,7 +21,6 @@ #include <QFile> #include <stdint.h> #include <libmodplug/stdafx.h> -#include <libmodplug/it_defs.h> #include <libmodplug/sndfile.h> #include <libmodplug/modplug.h> #include "archivereader.h" --- a/src/plugins/Input/modplug/settingsdialog.cpp +++ b/src/plugins/Input/modplug/settingsdialog.cpp @@ -22,7 +22,6 @@ #include <QDir> #include <libmodplug/stdafx.h> -#include <libmodplug/it_defs.h> #include <libmodplug/sndfile.h> #include "decoder_modplug.h"

4 years, 2 months

commit sfml2 for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package sfml2 for openSUSE:Factory checked in at 2017-06-30 18:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sfml2 (Old) and /work/SRC/openSUSE:Factory/.sfml2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sfml2" Fri Jun 30 18:42:04 2017 rev:7 rq:507268 version:2.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sfml2/sfml2.changes 2017-03-03 17:43:51.462872735 +0100 +++ /work/SRC/openSUSE:Factory/.sfml2.new/sfml2.changes 2017-06-30 18:43:25.429170803 +0200 @@ -1,0 +2,7 @@ +Thu Jun 29 13:07:59 UTC 2017 - mlin(a)suse.com + +- Add dont-try-to-runtime-detect-sse2-on-gcc.diff from stb upstream + * Give up trying to runtime-detect SSE2 on GCC, this fixes build + failure in 42.3 + +------------------------------------------------------------------- New: ---- dont-try-to-runtime-detect-sse2-on-gcc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfml2.spec ++++++ --- /var/tmp/diff_new_pack.NtoZkK/_old 2017-06-30 18:43:26.828973912 +0200 +++ /var/tmp/diff_new_pack.NtoZkK/_new 2017-06-30 18:43:26.828973912 +0200 @@ -26,6 +26,9 @@ Url: http://www.sfml-dev.org/ Source0: https://github.com/SFML/SFML/archive/%{version}/SFML-%{version}.tar.gz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM Give up trying to runtime-detect SSE2 on GCC - patch is +# from stb upstream commit 3e175448 and 7a694bdc +Patch0: dont-try-to-runtime-detect-sse2-on-gcc.diff BuildRequires: cmake BuildRequires: dos2unix BuildRequires: doxygen @@ -94,7 +97,8 @@ %prep %setup -q -n SFML-%{version} -dos2unix license.txt +%patch0 -p1 +dos2unix --keepdate license.txt %build %cmake -DSFML_BUILD_DOC=TRUE \ ++++++ dont-try-to-runtime-detect-sse2-on-gcc.diff ++++++ Index: SFML-2.3.2/extlibs/headers/stb_image/stb_image.h =================================================================== --- SFML-2.3.2.orig/extlibs/headers/stb_image/stb_image.h +++ SFML-2.3.2/extlibs/headers/stb_image/stb_image.h @@ -624,15 +624,18 @@ typedef unsigned char validate_uint32[si #define STBI_FREE(p) free(p) #endif -#if defined(__GNUC__) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) // gcc doesn't support sse2 intrinsics unless you compile with -msse2, -// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; -// this is just broken and gcc are jerks for not fixing it properly -// http://www.virtualdub.org/blog/pivot/entry.php?id=363 ) +//which in turn means it gets to use SSE2 everywhere. This is unfortunate, +// but previous attempts to provide the SSE2 functions with runtime +// detection caused numerous issues. The way architecture extensions are +// exposed in GCC/Clang is, sadly, not really suited for one-file libs. +// New behavior: if compiled with -msse2, we use SSE2 without any +// detection; if not, we don't use it at all. #define STBI_NO_SIMD #endif -#if !defined(STBI_NO_SIMD) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)) +#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) #define STBI_SSE2 #include <emmintrin.h> @@ -671,14 +674,10 @@ static int stbi__sse2_available() static int stbi__sse2_available() { -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later - // GCC 4.8+ has a nice way to do this - return __builtin_cpu_supports("sse2"); -#else - // portable way to do this, preferably without using GCC inline ASM? - // just bail for now. - return 0; -#endif + // If we're even attempting to compile this on GCC/Clang, that means + // -msse2 is on, which means the compiler is allowed to use SSE2 + // instructions at will, and so are we. + return 1; } #endif #endif

4 years, 2 months

commit enlightenment for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package enlightenment for openSUSE:Factory checked in at 2017-06-30 18:42:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment (Old) and /work/SRC/openSUSE:Factory/.enlightenment.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enlightenment" Fri Jun 30 18:42:02 2017 rev:26 rq:507036 version:0.21.8 Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment/enlightenment.changes 2017-03-12 20:04:19.826951431 +0100 +++ /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment.changes 2017-06-30 18:43:23.581430698 +0200 @@ -1,0 +2,25 @@ +Wed Jun 28 07:59:52 UTC 2017 - simonf.lees(a)suse.com + +- fix feature-wizard-auto-lang.patch to work again +- fix update-alternatives usage. +- Remove systemd handling not needed for user services + +------------------------------------------------------------------- +Wed May 24 10:27:39 UTC 2017 - sflees(a)suse.de + +- Update to 0.21.8 Fixing a number of issues including the following + * T3144 + * T5262 + * T5288 + * T5340 + * T5348 + * T5418 + * T5444 + * T5464 + +------------------------------------------------------------------- +Wed May 17 14:19:33 UTC 2017 - fvogt(a)suse.com + +- Use update-alternatives to create default.desktop xsession (boo#1030873) + +------------------------------------------------------------------- Old: ---- enlightenment-0.21.7.tar.xz New: ---- enlightenment-0.21.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment.spec ++++++ --- /var/tmp/diff_new_pack.U42kGZ/_old 2017-06-30 18:43:24.957237183 +0200 +++ /var/tmp/diff_new_pack.U42kGZ/_new 2017-06-30 18:43:24.957237183 +0200 @@ -21,7 +21,7 @@ %define enable_wayland (0%{?suse_version} > 1320) %define generate_manpages 0 Name: enlightenment -Version: 0.21.7 +Version: 0.21.8 Release: 0 Summary: The window manager License: BSD-2-Clause @@ -99,6 +99,8 @@ # older e17.3 users will update but anyone who manually installs e17.6 will stay Obsoletes: e17 Provides: e17 > 0.17.4 +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %if %{enable_wayland} @@ -288,33 +290,28 @@ # remove files from not wanted place rm %{buildroot}%{_datadir}/enlightenment/{COPYING,AUTHORS} -%if %{systemd_present} -%pre -%if !0%{?fedora} -%service_add_pre enlightenment.service -%endif +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + %post -%if !0%{?fedora} -%service_add_post enlightenment.service -%endif +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop 20 -%preun -%if !0%{?fedora} -%service_del_preun enlightenment.service -%endif %postun -%if !0%{?fedora} -%service_del_postun enlightenment.service -%endif -%endif +if [ ! -f %{_datadir}/xsessions/enlightenment.desktop ] ; then + %{_sbindir}/update-alternatives --remove default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop +fi %files -f enlightenment.lang %defattr(-,root,root) %doc COPYING README AUTHORS %exclude %{_docdir}/%{name}/html %{_datadir}/xsessions/enlightenment.desktop +%{_datadir}/xsessions/default.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/enlightenment/ %{_datadir}/applications/*.desktop %{_libdir}/enlightenment ++++++ enlightenment-0.21.7.tar.xz -> enlightenment-0.21.8.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment/enlightenment-0.21.7.tar.xz /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment-0.21.8.tar.xz differ: char 27, line 1 ++++++ feature-wizard-auto-lang.patch ++++++ --- /var/tmp/diff_new_pack.U42kGZ/_old 2017-06-30 18:43:25.037225932 +0200 +++ /var/tmp/diff_new_pack.U42kGZ/_new 2017-06-30 18:43:25.037225932 +0200 @@ -1,60 +1,60 @@ -commit 92c5d6600449be6646ec746d3845fc1917141308 -Author: Simon Lees (SUSE) <sflees(a)suse.de> -Date: Tue Nov 29 14:12:14 2016 +1030 +commit ef1b8cb6f8830cee2cfc4f371e8a0d2d894d48a7 +Author: Simon Lees <sflees(a)suse.de> +Date: Wed Jun 28 12:58:55 2017 +0930 - feature-wizard-auto-lang + auto set language to system lang + + If the system language is set this is likely because a user has + already selected it in a distro's installer and doesn't want to + set it again so rather then telling a user which language they + selected as there default just set the language without showing + the wizard page. diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c -index 120953b..a9549d6 100644 +index 120953be1..337215bca 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c -@@ -1,6 +1,6 @@ - /* Language chooser */ - #include "e_wizard.h" +@@ -171,17 +171,11 @@ _lang_content_get(E_Intl_Pair *pair, Evas_Object *obj, const char *part) + static char * + _lang_text_get(E_Intl_Pair *pair, Evas_Object *obj EINA_UNUSED, const char *part) + { +- char buf[4096]; - -+#include <eina_log.h> - typedef struct _E_Intl_Pair E_Intl_Pair; + if (!eina_streq(part, "elm.text")) return NULL; + if (!pair) + return strdup(_("System Default")); - static int _basic_lang_list_sort(const void *data1, const void *data2); -@@ -209,6 +209,41 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) - }, +- if ((!e_intl_language_get()) || (!eina_streq(pair->locale_key, e_intl_language_get()))) +- return strdup(_(pair->locale_translation)); +- +- snprintf(buf, sizeof(buf), "System Default [%s]", pair->locale_translation); +- return strdup(buf); ++ return strdup(_(pair->locale_translation)); + } + + static void +@@ -210,6 +204,24 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) .version = ELM_GENLIST_ITEM_CLASS_VERSION }; -+ FILE *locale_inf; -+ char line[32]; -+ char layout[128]; -+ int i = 0; -+ -+ locale_inf = popen("locale", "r"); -+ if (locale_inf) + ++ /* If we can determine the system language just use it and don't show the page */ ++ if (e_intl_language_get()) + { -+ while (fscanf(locale_inf, "%[^\n]\n", line) == 1) ++ int i = 0; ++ while (basic_language_predefined_pairs[i].locale_key) + { -+ if (sscanf (line, "LC_CTYPE=%127s", layout)) ++ if (eina_streq(basic_language_predefined_pairs[i].locale_key, e_intl_language_get())) + { -+ if (layout) -+ { -+ i = 0; -+ while (basic_language_predefined_pairs[i].locale_key) -+ { -+ if (!strncmp -+ (basic_language_predefined_pairs[i].locale_key, -+ layout, -+ strlen(basic_language_predefined_pairs[i].locale_key))) -+ { -+ lang = basic_language_predefined_pairs[i].locale_key; -+ eina_stringshare_replace(&e_config->language, lang); -+ e_intl_language_set(e_config->language); -+ e_wizard_labels_update(); -+ return 0; -+ } -+ i++; -+ } -+ } ++ lang = basic_language_predefined_pairs[i].locale_key; ++ eina_stringshare_replace(&e_config->language, lang); ++ e_intl_language_set(e_config->language); ++ e_wizard_labels_update(); ++ return 0; + } ++ i++; + } -+ pclose(locale_inf); + } - ++ e_wizard_title_set(_("Language")); of = elm_frame_add(e_comp->elm); + elm_object_text_set(of, _("Select one"));

4 years, 2 months

commit MozillaThunderbird for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2017-06-30 18:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Fri Jun 30 18:41:32 2017 rev:182 rq:507003 version:52.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2017-06-20 10:59:28.683307502 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2017-06-30 18:42:34.936272923 +0200 @@ -1,0 +2,13 @@ +Wed Jun 28 13:57:13 UTC 2017 - guillaume(a)opensuse.org + +- mozilla-disable-neon-option.patch has been dropped silently, so + remove the --disable-neon option as it is not available anymore. + +------------------------------------------------------------------- +Sun Jun 25 06:55:13 UTC 2017 - wr(a)rosenauer.org + +- update to Thunderbird 52.2.1 + * Problems with Gmail fixed (folders not showing, repeated email + download, etc.) introduced in version 52.2.0. (boo#1045895) + +------------------------------------------------------------------- Old: ---- l10n-52.2.tar.xz thunderbird-52.2-source.tar.xz New: ---- l10n-52.2.1.tar.xz thunderbird-52.2.1-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.P0uw29/_old 2017-06-30 18:43:21.373741223 +0200 +++ /var/tmp/diff_new_pack.P0uw29/_new 2017-06-30 18:43:21.373741223 +0200 @@ -17,9 +17,9 @@ # -%define mainversion 52.2 +%define mainversion 52.2.1 %define update_channel release -%define releasedate 201706120000 +%define releasedate 201706250000 %bcond_without mozilla_tb_kde4 %bcond_with mozilla_tb_valgrind @@ -289,10 +289,6 @@ %if ! %crashreporter ac_add_options --disable-crashreporter %endif -# Disable neon for arm as it does not build correctly -%ifarch %arm -ac_add_options --disable-neon -%endif %if %{with mozilla_tb_valgrind} ac_add_options --disable-jemalloc ac_add_options --enable-valgrind ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.P0uw29/_old 2017-06-30 18:43:21.513721534 +0200 +++ /var/tmp/diff_new_pack.P0uw29/_new 2017-06-30 18:43:21.513721534 +0200 @@ -2,8 +2,8 @@ CHANNEL="esr52" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_52_2_0_RELEASE" -VERSION="52.2" +RELEASE_TAG="THUNDERBIRD_52_2_1_RELEASE" +VERSION="52.2.1" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-52.2.tar.xz -> l10n-52.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-52.2.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-52.2.1.tar.xz differ: char 27, line 1 ++++++ thunderbird-52.2-source.tar.xz -> thunderbird-52.2.1-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-52.2-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-52.2.1-source.tar.xz differ: char 26, line 1

4 years, 2 months

commit ceph for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package ceph for openSUSE:Factory checked in at 2017-06-30 18:41:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ceph" Fri Jun 30 18:41:25 2017 rev:14 rq:506876 version:12.1.0+git.1498654198.20d6a47cc9 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2017-06-24 08:34:24.676753851 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes 2017-06-30 18:42:27.781279314 +0200 @@ -1,0 +2,36 @@ +Wed Jun 28 13:33:48 UTC 2017 - ncutler(a)suse.com + +- Update to version 12.1.0+git.1498654198.20d6a47cc9: + + build/ops: rpm: put mgr python build dependencies in make_check bcond + N.B. this effectively eliminates the following build dependencies: + python-Babel python-beautifulsoup4 python-CherryPy python-coverage + python-flup python-Genshi python-html5lib python-logutils python-nose + python-Paste python-PasteDeploy python-PasteDeploy python-pecan + python-pyquery python-singledispatch python-waitress python-WebOb + python-WebTest python-Werkzeug python-WSGIProxy2 pytyhon-python-openid + +------------------------------------------------------------------- +Mon Jun 26 13:52:31 UTC 2017 - ncutler(a)suse.com + +- spec file: + + removed BR libatomic_ops-devel as upstream replaced it with std:atomic + + removed defattr as they are no longer needed on sle12 and newer + +------------------------------------------------------------------- +Mon Jun 26 12:25:57 UTC 2017 - ncutler(a)suse.com + +- Update to version 12.1.0+git.1498478524.117b171715: + + include 12.1.0 tag to make "ceph --version" happy + + tests: drop hadoop-s3a tests + +------------------------------------------------------------------- +Sat Jun 24 20:17:48 UTC 2017 - ncutler(a)suse.com + +- Update to version 12.1.0+git.1498309403.f4fc02fff4: + + upstream 12.1.0 release; for details, see + http://ceph.com/releases/v12-1-0-luminous-rc-released/ + + revert several pre-release commits that are no longer needed + because the issues have been fixed upstream in the meantime + + build/ops: rpm: sane packaging of %{_docdir}/ceph directory + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-12.0.3+git.1498202776.b806032985.tar.bz2 New: ---- ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.em82bp/_old 2017-06-30 18:42:31.600742085 +0200 +++ /var/tmp/diff_new_pack.em82bp/_new 2017-06-30 18:42:31.604741522 +0200 @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1498202776.b806032985 +Version: 12.1.0+git.1498654198.20d6a47cc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -116,6 +116,17 @@ BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif +%if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python-cherrypy +BuildRequires: python-werkzeug +%endif +%if 0%{?suse_version} +BuildRequires: python-CherryPy +BuildRequires: python-Werkzeug +%endif +BuildRequires: python-pecan +%endif BuildRequires: bc BuildRequires: gperf BuildRequires: cmake @@ -129,7 +140,6 @@ BuildRequires: jq BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel -BuildRequires: libatomic_ops-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libudev-devel @@ -149,6 +159,7 @@ BuildRequires: udev BuildRequires: util-linux BuildRequires: valgrind-devel +BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet @@ -171,7 +182,6 @@ BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel -BuildRequires: python-CherryPy BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx @@ -188,7 +198,6 @@ BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython -BuildRequires: python-cherrypy BuildRequires: python-prettytable BuildRequires: python-sphinx %endif @@ -503,7 +512,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf -chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config +install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -538,8 +547,6 @@ %py3_compile %{buildroot}%{python3_sitelib} %endif -rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf -rm -rf %{buildroot}%{_docdir}/ceph/sample.fetch_config rm -rf %{buildroot}%{_bindir}/crushtool rm -rf %{buildroot}%{_bindir}/monmaptool rm -rf %{buildroot}%{_bindir}/osdmaptool @@ -577,6 +584,10 @@ rm -rf %{buildroot}%{_mandir}/man8/crushtool.8* rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8* rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8* +rm -rf %{buildroot}%doc +rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf +rm -rf %{buildroot}%doc +rm -rf %{buildroot}%{_docdir}/ceph/COPYING rm -rf %{buildroot}%{_bindir}/ceph rm -rf %{buildroot}%{_bindir}/ceph-authtool rm -rf %{buildroot}%{_bindir}/ceph-conf @@ -868,7 +879,6 @@ %endif %if 0%{with ceph_test_package} %files -n ceph-test -%defattr(-,root,root,-) %{_bindir}/ceph-client-debug %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench ++++++ ceph.spec ++++++ --- /var/tmp/diff_new_pack.em82bp/_old 2017-06-30 18:42:31.624738710 +0200 +++ /var/tmp/diff_new_pack.em82bp/_new 2017-06-30 18:42:31.628738147 +0200 @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1498202776.b806032985 +Version: 12.1.0+git.1498654198.20d6a47cc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -110,6 +110,17 @@ BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif +%if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python-cherrypy +BuildRequires: python-werkzeug +%endif +%if 0%{?suse_version} +BuildRequires: python-CherryPy +BuildRequires: python-Werkzeug +%endif +BuildRequires: python-pecan +%endif BuildRequires: bc BuildRequires: gperf BuildRequires: cmake @@ -123,7 +134,6 @@ BuildRequires: jq BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel -BuildRequires: libatomic_ops-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libudev-devel @@ -143,6 +153,7 @@ BuildRequires: udev BuildRequires: util-linux BuildRequires: valgrind-devel +BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet @@ -165,7 +176,6 @@ BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel -BuildRequires: python-CherryPy BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx @@ -182,7 +192,6 @@ BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython -BuildRequires: python-cherrypy BuildRequires: python-prettytable BuildRequires: python-sphinx %endif @@ -333,13 +342,14 @@ %if 0%{?fedora} || 0%{?rhel} Requires: python-cherrypy Requires: python-werkzeug +Requires: pyOpenSSL %endif %if 0%{?suse_version} Requires: python-CherryPy Requires: python-Werkzeug +Requires: python-pyOpenSSL %endif Requires: python-pecan -Requires(post): openssl %description mgr ceph-mgr enables python modules that provide services (such as the REST module derived from Calamari) and expose CLI hooks. ceph-mgr gathers @@ -926,7 +936,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf -chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config +install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -970,11 +980,6 @@ %files %files base -%defattr(-,root,root,-) -%docdir %{_docdir} -%dir %{_docdir}/ceph -%{_docdir}/ceph/sample.ceph.conf -%{_docdir}/ceph/sample.fetch_config %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool @@ -1078,7 +1083,9 @@ fi %files common -%defattr(-,root,root,-) +%dir %{_docdir}/ceph +%doc %{_docdir}/ceph/sample.ceph.conf +%doc %{_docdir}/ceph/COPYING %{_bindir}/ceph %{_bindir}/ceph-authtool %{_bindir}/ceph-conf @@ -1227,13 +1234,6 @@ %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr %post mgr -CERT="%{_sysconfdir}/ceph/ceph-mgr-restful.crt" -PKEY="%{_sysconfdir}/ceph/ceph-mgr-restful.key" -if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then - openssl req -new -nodes -x509 \ - -subj "/O=IT/CN=ceph-mgr-restful" \ - -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca -fi %if 0%{?suse_version} if [ $1 -eq 1 ] ; then /usr/bin/systemctl preset ceph-mgr(a)\*.service ceph-mgr.target >/dev/null 2>&1 || : @@ -1328,7 +1328,6 @@ fi %files fuse -%defattr(-,root,root,-) %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* %{_sbindir}/mount.fuse.ceph @@ -1336,12 +1335,10 @@ %{_unitdir}/ceph-fuse.target %files -n rbd-fuse -%defattr(-,root,root,-) %{_bindir}/rbd-fuse %{_mandir}/man8/rbd-fuse.8* %files -n rbd-mirror -%defattr(-,root,root,-) %{_bindir}/rbd-mirror %{_mandir}/man8/rbd-mirror.8* %{_unitdir}/ceph-rbd-mirror@.service @@ -1390,12 +1387,10 @@ fi %files -n rbd-nbd -%defattr(-,root,root,-) %{_bindir}/rbd-nbd %{_mandir}/man8/rbd-nbd.8* %files radosgw -%defattr(-,root,root,-) %{_bindir}/radosgw %{_bindir}/radosgw-token %{_bindir}/radosgw-es @@ -1510,7 +1505,6 @@ %if %{with ocf} %files resource-agents -%defattr(0755,root,root,-) %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/ceph @@ -1519,7 +1513,6 @@ %endif %files -n librados2 -%defattr(-,root,root,-) %{_libdir}/librados.so.* %dir %{_libdir}/ceph %{_libdir}/ceph/libceph-common.so* @@ -1532,7 +1525,6 @@ %postun -n librados2 -p /sbin/ldconfig %files -n librados-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/librados.h %{_includedir}/rados/librados.hpp @@ -1552,17 +1544,14 @@ %{_mandir}/man8/librados-config.8* %files -n python-rados -%defattr(-,root,root,-) %{python_sitearch}/rados.so %{python_sitearch}/rados-*.egg-info %files -n python%{python3_pkgversion}-rados -%defattr(-,root,root,-) %{python3_sitearch}/rados.cpython*.so %{python3_sitearch}/rados-*.egg-info %files -n libradosstriper1 -%defattr(-,root,root,-) %{_libdir}/libradosstriper.so.* %post -n libradosstriper1 -p /sbin/ldconfig @@ -1570,14 +1559,12 @@ %postun -n libradosstriper1 -p /sbin/ldconfig %files -n libradosstriper-devel -%defattr(-,root,root,-) %dir %{_includedir}/radosstriper %{_includedir}/radosstriper/libradosstriper.h %{_includedir}/radosstriper/libradosstriper.hpp %{_libdir}/libradosstriper.so %files -n librbd1 -%defattr(-,root,root,-) %{_libdir}/librbd.so.* %if %{with lttng} %{_libdir}/librbd_tp.so.* @@ -1591,7 +1578,6 @@ %postun -n librbd1 -p /sbin/ldconfig %files -n librbd-devel -%defattr(-,root,root,-) %dir %{_includedir}/rbd %{_includedir}/rbd/librbd.h %{_includedir}/rbd/librbd.hpp @@ -1602,7 +1588,6 @@ %endif %files -n librgw2 -%defattr(-,root,root,-) %{_libdir}/librgw.so.* %post -n librgw2 -p /sbin/ldconfig @@ -1610,34 +1595,28 @@ %postun -n librgw2 -p /sbin/ldconfig %files -n librgw-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/librgw.h %{_includedir}/rados/rgw_file.h %{_libdir}/librgw.so %files -n python-rgw -%defattr(-,root,root,-) %{python_sitearch}/rgw.so %{python_sitearch}/rgw-*.egg-info %files -n python%{python3_pkgversion}-rgw -%defattr(-,root,root,-) %{python3_sitearch}/rgw.cpython*.so %{python3_sitearch}/rgw-*.egg-info %files -n python-rbd -%defattr(-,root,root,-) %{python_sitearch}/rbd.so %{python_sitearch}/rbd-*.egg-info %files -n python%{python3_pkgversion}-rbd -%defattr(-,root,root,-) %{python3_sitearch}/rbd.cpython*.so %{python3_sitearch}/rbd-*.egg-info %files -n libcephfs2 -%defattr(-,root,root,-) %{_libdir}/libcephfs.so.* %post -n libcephfs2 -p /sbin/ldconfig @@ -1645,27 +1624,23 @@ %postun -n libcephfs2 -p /sbin/ldconfig %files -n libcephfs-devel -%defattr(-,root,root,-) %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h %{_includedir}/cephfs/ceph_statx.h %{_libdir}/libcephfs.so %files -n python-cephfs -%defattr(-,root,root,-) %{python_sitearch}/cephfs.so %{python_sitearch}/cephfs-*.egg-info %{python_sitelib}/ceph_volume_client.py* %files -n python%{python3_pkgversion}-cephfs -%defattr(-,root,root,-) %{python3_sitearch}/cephfs.cpython*.so %{python3_sitearch}/cephfs-*.egg-info %{python3_sitelib}/ceph_volume_client.py %{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py* %files -n python%{python3_pkgversion}-ceph-argparse -%defattr(-,root,root,-) %{python3_sitelib}/ceph_argparse.py %{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py* %{python3_sitelib}/ceph_daemon.py @@ -1673,7 +1648,6 @@ %if 0%{with ceph_test_package} %files -n ceph-test -%defattr(-,root,root,-) %{_bindir}/ceph-client-debug %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench @@ -1711,7 +1685,6 @@ %if 0%{with cephfs_java} %files -n libcephfs_jni1 -%defattr(-,root,root,-) %{_libdir}/libcephfs_jni.so.* %post -n libcephfs_jni1 -p /sbin/ldconfig @@ -1719,23 +1692,19 @@ %postun -n libcephfs_jni1 -p /sbin/ldconfig %files -n libcephfs_jni-devel -%defattr(-,root,root,-) %{_libdir}/libcephfs_jni.so %files -n cephfs-java -%defattr(-,root,root,-) %{_javadir}/libcephfs.jar %{_javadir}/libcephfs-test.jar %endif %files -n rados-objclass-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/objclass.h %if 0%{with selinux} %files selinux -%defattr(-,root,root,-) %attr(0600,root,root) %{_datadir}/selinux/packages/ceph.pp %{_datadir}/selinux/devel/include/contrib/ceph.if %{_mandir}/man8/ceph_selinux.8* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.em82bp/_old 2017-06-30 18:42:31.684730272 +0200 +++ /var/tmp/diff_new_pack.em82bp/_new 2017-06-30 18:42:31.684730272 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="versionformat">12.0.3+git.%ct.%h</param> + <param name="versionformat">12.1.0+git.%ct.%h</param> <param name="url">git://github.com/SUSE/ceph.git</param> <param name="revision">ses5</param> <param name="filename">ceph</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.em82bp/_old 2017-06-30 18:42:31.708726896 +0200 +++ /var/tmp/diff_new_pack.em82bp/_new 2017-06-30 18:42:31.708726896 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/SUSE/ceph.git</param> - <param name="changesrevision">b806032985d029d5ae667099b1a050e07516a96e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">20d6a47cc9a08e4013d0492381d62b60f48eed47</param></service></servicedata> \ No newline at end of file ++++++ ceph-12.0.3+git.1498202776.b806032985.tar.bz2 -> ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ceph/ceph-12.0.3+git.1498202776.b806032985.tar.bz2 /work/SRC/openSUSE:Factory/.ceph.new/ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 differ: char 11, line 1

4 years, 2 months

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits June 2017