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@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.bz2 +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.bz2 +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.bz2 +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@suse.com> Architecture: all