Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2016-03-03 15:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2016-02-24 14:26:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2016-03-03 15:16:37.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 3 10:00:17 UTC 2016 - [email protected] + +- Version update to 0.7.9: + * Fix bug in %if detection if it was curlified + * Add one more case of RPM_BUILD_ROOT replacement + * Detect wrong Group values and suggest correct ones + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.7.8.tar.gz New: ---- spec-cleaner-0.7.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.NVvvyr/_old 2016-03-03 15:16:38.000000000 +0100 +++ /var/tmp/diff_new_pack.NVvvyr/_new 2016-03-03 15:16:38.000000000 +0100 @@ -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.7.8 +Version: 0.7.9 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause @@ -98,6 +98,7 @@ %{_datadir}/%{name}/excludes-bracketing.txt %{_datadir}/%{name}/licenses_changes.txt %{_datadir}/%{name}/pkgconfig_conversions.txt +%{_datadir}/%{name}/allowed_groups.txt %files format_spec_file %defattr(-,root,root) ++++++ spec-cleaner-0.7.8.tar.gz -> spec-cleaner-0.7.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/data/allowed_groups.txt new/spec-cleaner-spec-cleaner-0.7.9/data/allowed_groups.txt --- old/spec-cleaner-spec-cleaner-0.7.8/data/allowed_groups.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/data/allowed_groups.txt 2016-02-20 17:25:54.000000000 +0100 @@ -0,0 +1,238 @@ +# Taken from https://en.opensuse.org/openSUSE:Package_group_guidelines +Amusements/Games/3D/Other +Amusements/Games/3D/Race +Amusements/Games/3D/Shoot +Amusements/Games/3D/Simulation +Amusements/Games/Action/Arcade +Amusements/Games/Action/Breakout +Amusements/Games/Action/Other +Amusements/Games/Action/Race +Amusements/Games/Action/Shoot +Amusements/Games/Board/Card +Amusements/Games/Board/Chess +Amusements/Games/Board/Other +Amusements/Games/Board/Pool +Amusements/Games/Board/Puzzle +Amusements/Games/Logic +Amusements/Games/Other +Amusements/Games/RPG +Amusements/Games/Strategy/Other +Amusements/Games/Strategy/Real Time +Amusements/Games/Strategy/Turn Based +Amusements/Teaching/Language +Amusements/Teaching/Mathematics +Amusements/Teaching/Other +Amusements/Toys/Background +Amusements/Toys/Clocks +Amusements/Toys/Graphics +Amusements/Toys/Other +Amusements/Toys/Screensavers +Development/Languages/C and C++ +Development/Languages/Fortran +Development/Languages/Java +Development/Languages/Other +Development/Languages/Perl +Development/Languages/Python +Development/Languages/Ruby +Development/Languages/Scheme +Development/Languages/Tcl +Development/Libraries/C and C++ +Development/Libraries/Cross +Development/Libraries/GNOME +Development/Libraries/Java +Development/Libraries/KDE +Development/Libraries/Other +Development/Libraries/Parallel +Development/Libraries/Perl +Development/Libraries/Python +Development/Libraries/Tcl +Development/Libraries/X11 +Development/Libraries/YaST +Development/Tools/Building +Development/Tools/Debuggers +Development/Tools/Doc Generators +Development/Tools/GUI Builders +Development/Tools/IDE +Development/Tools/Navigators +Development/Tools/Other +Development/Tools/Version Control +Documentation/Howto +Documentation/HTML +Documentation/Man +Documentation/Other +Documentation/SuSE +Hardware/Camera +Hardware/Fax +Hardware/ISDN +Hardware/Joystick +Hardware/Mobile +Hardware/Modem +Hardware/Other +Hardware/Palm +Hardware/Printing +Hardware/Psion +Hardware/Radio +Hardware/Scanner +Hardware/TV +Hardware/UPS +Hardware/Wifi +Metapackages +Productivity/Archiving/Backup +Productivity/Archiving/Compression +Productivity/Clustering/Computing +Productivity/Clustering/HA +Productivity/Databases/Clients +Productivity/Databases/Servers +Productivity/Databases/Tools +Productivity/File utilities +Productivity/Graphics/3D Editors +Productivity/Graphics/Bitmap Editors +Productivity/Graphics/CAD +Productivity/Graphics/Convertors +Productivity/Graphics/Other +Productivity/Graphics/Vector Editors +Productivity/Graphics/Viewers +Productivity/Graphics/Visualization/Graph +Productivity/Graphics/Visualization/Other +Productivity/Graphics/Visualization/Raytracers +Productivity/Hamradio/Fax +Productivity/Hamradio/Logging +Productivity/Hamradio/Morse +Productivity/Hamradio/Other +Productivity/Hamradio/Packet +Productivity/Hamradio/Psk31 +Productivity/Hamradio/Satellite +Productivity/Multimedia/CD/Grabbers +Productivity/Multimedia/CD/Players +Productivity/Multimedia/CD/Record +Productivity/Multimedia/Other +Productivity/Multimedia/Sound/Editors and Convertors +Productivity/Multimedia/Sound/Midi +Productivity/Multimedia/Sound/Mixers +Productivity/Multimedia/Sound/Players +Productivity/Multimedia/Sound/Utilities +Productivity/Multimedia/Sound/Visualization +Productivity/Multimedia/Video/Editors and Convertors +Productivity/Multimedia/Video/Players +Productivity/Networking/AOLInstantMessenger +Productivity/Networking/Archie +Productivity/Networking/Boot/Clients +Productivity/Networking/Boot/Servers +Productivity/Networking/Boot/Utilities +Productivity/Networking/Diagnostic +Productivity/Networking/DNS/Servers +Productivity/Networking/DNS/Utilities +Productivity/Networking/Email/Clients +Productivity/Networking/Email/Mailinglists +Productivity/Networking/Email/Servers +Productivity/Networking/Email/Utilities +Productivity/Networking/File-Sharing +Productivity/Networking/Ftp/Clients +Productivity/Networking/Ftp/Servers +Productivity/Networking/ICQ +Productivity/Networking/Instant Messenger +Productivity/Networking/IRC +Productivity/Networking/LDAP/Clients +Productivity/Networking/LDAP/Servers +Productivity/Networking/LDAP/Utilities +Productivity/Networking/Napster +Productivity/Networking/News/Clients +Productivity/Networking/News/Servers +Productivity/Networking/News/Utilities +Productivity/Networking/NFS +Productivity/Networking/NIS +Productivity/Networking/Novell +Productivity/Networking/Other +Productivity/Networking/PPP +Productivity/Networking/Radius/Clients +Productivity/Networking/Radius/Servers +Productivity/Networking/Routing +Productivity/Networking/Samba +Productivity/Networking/Security +Productivity/Networking/SSH +Productivity/Networking/System +Productivity/Networking/Talk/Clients +Productivity/Networking/Talk/Servers +Productivity/Networking/Web/Browsers +Productivity/Networking/Web/Frontends +Productivity/Networking/Web/Proxy +Productivity/Networking/Web/Servers +Productivity/Networking/Web/Utilities +Productivity/Office/Dictionary +Productivity/Office/Finance +Productivity/Office/Management +Productivity/Office/Organizers +Productivity/Office/Other +Productivity/Office/Spreadsheets +Productivity/Office/Suite +Productivity/Office/Word Processor +Productivity/Other +Productivity/Publishing/DocBook +Productivity/Publishing/HTML/Editors +Productivity/Publishing/HTML/Tools +Productivity/Publishing/Other +Productivity/Publishing/PDF +Productivity/Publishing/Presentation +Productivity/Publishing/PS +Productivity/Publishing/SGML +Productivity/Publishing/TeX/Base +Productivity/Publishing/TeX/Fonts +Productivity/Publishing/TeX/Frontends +Productivity/Publishing/TeX/Utilities +Productivity/Publishing/Texinfo +Productivity/Publishing/Troff +Productivity/Publishing/Word +Productivity/Publishing/XML +Productivity/Scientific/Astronomy +Productivity/Scientific/Chemistry +Productivity/Scientific/Electronics +Productivity/Scientific/Math +Productivity/Scientific/Other +Productivity/Scientific/Physics +Productivity/Security +Productivity/Telephony/Clients +Productivity/Telephony/H323/Clients +Productivity/Telephony/H323/Servers +Productivity/Telephony/H323/Utilities +Productivity/Telephony/Servers +Productivity/Telephony/SIP/Clients +Productivity/Telephony/SIP/Servers +Productivity/Telephony/SIP/Utilities +Productivity/Telephony/Utilities +Productivity/Text/Convertors +Productivity/Text/Editors +Productivity/Text/Spell +Productivity/Text/Utilities +System/Base +System/Benchmark +System/Boot +System/Console +System/Daemons +System/Fhs +System/Filesystems +System/Kernel +System/Libraries +System/Localization +System/Management +System/Monitoring +System/Packages +System/Shells +System/Sound Daemons +System/Emulators/Other +System/Emulators/PC +System/GUI/GNOME +System/GUI/KDE +System/GUI/LXDE +System/GUI/Other +System/GUI/XFCE +System/I18n/Chinese +System/I18n/Japanese +System/I18n/Korean +System/X11/Displaymanagers +System/X11/Fonts +System/X11/Icons +System/X11/Servers/XF86_3 +System/X11/Servers/XF86_4 +System/X11/Terminals +System/X11/Utilities +System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.7.9/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.7.8/data/excludes-bracketing.txt 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/data/excludes-bracketing.txt 2016-02-20 17:25:54.000000000 +0100 @@ -38,7 +38,7 @@ changelog check icon_theme_cache_post[^\s]* -if +if(\s*\(.*)? ifarch ifnarch include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/__init__.py 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/__init__.py 2016-02-20 17:25:54.000000000 +0100 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.7.8' +__version__ = '0.7.9' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpminstall.py new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpminstall.py --- old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpminstall.py 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpminstall.py 2016-02-20 17:25:54.000000000 +0100 @@ -12,9 +12,11 @@ def add(self, line): line = self._complete_cleanup(line) + # we do not want to cleanup buildroot, it is already clean if self.reg.re_clean.search(line): return + line = self.reg.re_jobs.sub(' %{?_smp_mflags}', line) if not self.minimal: line = self._replace_remove_la(line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmpreamble.py 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmpreamble.py 2016-02-20 17:25:54.000000000 +0100 @@ -9,6 +9,7 @@ LICENSES_CHANGES = 'licenses_changes.txt' PKGCONFIG_CONVERSIONS = 'pkgconfig_conversions.txt' +GROUPS_LIST = 'allowed_groups.txt' class RpmPreamble(Section): @@ -132,6 +133,8 @@ self.license_conversions = self._read_licenses_changes() # dict of pkgconfig conversions self.pkgconfig_conversions = self._read_pkgconfig_changes() + # list of allowed groups + self.allowed_groups = self._read_group_changes() # start the object self._start_paragraph() # initialize list of groups that need to pass over conversion fixer @@ -499,6 +502,19 @@ files.close() return licenses + def _read_group_changes(self): + groups = [] + + files = FileUtils() + files.open_datafile(GROUPS_LIST) + # header starts with link where we find the groups + next(files.f) + for line in files.f: + line = line.rstrip('\n') + groups.append(line) + files.close() + return groups + def add(self, line): line = self._complete_cleanup(line) # if the line is empty just skip it we don't need new section for it @@ -650,6 +666,15 @@ self._add_line_value_to('summary_localized', content, key='Summary{0}'.format(language)) return + elif self.reg.re_group.match(line): + match = self.reg.re_group.match(line) + value = match.group(1) + if not self.minimal: + if not self.previous_line.startswith('# FIXME') and not value in self.allowed_groups: + self.current_group.append('# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines";') + self._add_line_value_to('group', value) + return + # loop for all other matching categories which # do not require special attention else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmregexp.py 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmregexp.py 2016-02-20 17:25:54.000000000 +0100 @@ -40,7 +40,7 @@ # rpmpreamble # WARNING: keep in sync with rpmcleaner Section change detection - re_if = re.compile(r'^\s*(?:%if\s|%ifarch\s|%ifnarch\s)', re.IGNORECASE) + re_if = re.compile(r'^\s*(?:%{?if\s|%{?ifarch\s|%{?ifnarch\s)', re.IGNORECASE) re_else = re.compile(r'^\s*%else(\s.*|)$', re.IGNORECASE) re_endif = re.compile(r'^\s*%endif(\s.*|)$', re.IGNORECASE) re_name = re.compile(r'^Name:\s*(\S*)', re.IGNORECASE) @@ -138,6 +138,7 @@ re_libdir = re.compile(r'%{?_prefix}?/(%{?_lib}?|lib64)([/\s$])') re_initddir = re.compile(r'%{?_initrddir}?([/\s$])') re_rpmbuildroot = re.compile(r'(\${?RPM_BUILD_ROOT}?|"%{?buildroot}?")([/\s%]|$)') + re_rpmbuildroot_quotes = re.compile(r'"\${?RPM_BUILD_ROOT}?"') def _load_keywords_whitelist(self): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmsection.py new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmsection.py --- old/spec-cleaner-spec-cleaner-0.7.8/spec_cleaner/rpmsection.py 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/spec_cleaner/rpmsection.py 2016-02-20 17:25:54.000000000 +0100 @@ -141,9 +141,9 @@ def replace_buildroot(self, line): """ Replace RPM_BUILD_ROOT for buildroot - Replace few hard written dirs for further processing with their macro names. """ line = self.reg.re_rpmbuildroot.sub(r'%{buildroot}\2', line) + line = self.reg.re_rpmbuildroot_quotes.sub(r'%{buildroot}', line) return line def replace_optflags(self, line): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/in/conditions.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/in/conditions.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/in/conditions.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/in/conditions.spec 2016-02-20 17:25:54.000000000 +0100 @@ -12,7 +12,7 @@ %endif BuildRequires: pkg-config BuildRequires: python -%if %{with editor} +%{if %{with editor}} %ifarch ppc64 Requires: naughty-stuff %endif # test commentary @@ -21,4 +21,7 @@ %endif BuildRequires: bbb Requires: insserv +%if (0%{?suse_version} && 0%{?suse_version} >= 1210) +Requires: wine +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/in/makeinstall.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/in/makeinstall.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/in/makeinstall.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/in/makeinstall.spec 2016-02-20 17:25:54.000000000 +0100 @@ -2,6 +2,7 @@ rm -rf %{buildroot} %makeinstall %make_install +make install DESTDIR="$RPM_BUILD_ROOT" make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} -j1 make DESTDIR=%{buildroot} -j4 install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/in/sectiondefine.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/in/sectiondefine.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/in/sectiondefine.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/in/sectiondefine.spec 2016-02-20 17:25:54.000000000 +0100 @@ -34,4 +34,4 @@ --disable-static \ %endif --with-pic \ - --docdir=%{_docdir}/%{name} + --docdir=%{_prefix}/share/doc/packages/%{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/out/conditions.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/out/conditions.spec 2016-02-20 17:25:54.000000000 +0100 @@ -34,12 +34,15 @@ PreReq: %insserv_prereq PreReq: aaa_base %endif -%if %{with editor} +%{if %{with editor}} BuildRequires: gcc-c++ BuildRequires: update-desktop-files %ifarch ppc64 Requires: naughty-stuff %endif # test commentary %endif +%if (0%{?suse_version} && 0%{?suse_version} >= 1210) +Requires: wine +%endif %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/out/langpackage.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/out/langpackage.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/out/langpackage.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/out/langpackage.spec 2016-02-20 17:25:54.000000000 +0100 @@ -19,16 +19,19 @@ %package -n something-lang # FIXME: consider using %%lang_package macro Summary: Something +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; Group: Whatever %package lang # FIXME: consider using %%lang_package macro Summary: Something +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; Group: Whatever %package lang # I have reason not to convert this to lang macro Summary: Something +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; Group: Whatever %package -n %{_name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/out/makeinstall.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/out/makeinstall.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/out/makeinstall.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/out/makeinstall.spec 2016-02-20 17:25:54.000000000 +0100 @@ -20,6 +20,7 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install %make_install make %{?_smp_mflags} DESTDIR=%{buildroot} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install make -j1 DESTDIR=%{buildroot} install make %{?_smp_mflags} DESTDIR=%{buildroot} install $RPM_BUILD_ROOT_REPLACEMENT != %{buildroot} == %{buildroot} == %{buildroot} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/out-minimal/conditions.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/out-minimal/conditions.spec 2016-02-20 17:25:54.000000000 +0100 @@ -33,12 +33,15 @@ PreReq: %{insserv_prereq} PreReq: aaa_base %endif -%if %{with editor} +%{if %{with editor}} BuildRequires: gcc-c++ BuildRequires: update-desktop-files %ifarch ppc64 Requires: naughty-stuff %endif # test commentary %endif +%if (0%{?suse_version} && 0%{?suse_version} >= 1210) +Requires: wine +%endif %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.8/tests/out-minimal/makeinstall.spec new/spec-cleaner-spec-cleaner-0.7.9/tests/out-minimal/makeinstall.spec --- old/spec-cleaner-spec-cleaner-0.7.8/tests/out-minimal/makeinstall.spec 2016-02-17 10:49:21.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.9/tests/out-minimal/makeinstall.spec 2016-02-20 17:25:54.000000000 +0100 @@ -20,6 +20,7 @@ %makeinstall %make_install make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} -j1 make DESTDIR=%{buildroot} -j4 install $RPM_BUILD_ROOT_REPLACEMENT != %{buildroot} == %{buildroot} == %{buildroot}
