Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2016-05-02 10:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-28 16:56:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2016-05-02 10:44:57.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 29 20:42:17 UTC 2016 - tchvatal@suse.com + +- Version update to 0.8.2: + * Add switch to disable copyright generating + * Few small fixes + * Tweak pkgconfig addition to work on all distros not just openSUSE + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.8.1.tar.gz New: ---- spec-cleaner-0.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +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.8.1 +Version: 0.8.2 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause @@ -104,6 +104,7 @@ %{_datadir}/%{name}/licenses_changes.txt %{_datadir}/%{name}/pkgconfig_conversions.txt %{_datadir}/%{name}/allowed_groups.txt +%{_datadir}/%{name}/licences_exceptions.txt %files format_spec_file %defattr(-,root,root) ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +0200 @@ -1,4 +1,10 @@ -spec-cleaner (0.8.0-1) stable; urgency=low +spec-cleaner (0.8.2-1) stable; urgency=low + + * Update to upstream 0.8.2 release + + -- Tomáš Chvátal <tchvatal@suse.cz> Thu, 29 Apr 2016 22:30:00 +0100 + +spec-cleaner (0.8.1-1) stable; urgency=low * Update to upstream 0.8.1 release ++++++ spec-cleaner-0.8.1.tar.gz -> spec-cleaner-0.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/README.md new/spec-cleaner-spec-cleaner-0.8.2/README.md --- old/spec-cleaner-spec-cleaner-0.8.1/README.md 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/README.md 2016-04-29 22:12:42.000000000 +0200 @@ -2,6 +2,7 @@ [](https://travis-ci.org/openSUSE/spec-cleaner) [](https://coveralls.io/github/openSUSE/spec-cleaner?branch=master) +[](https://landscape.io/github/openSUSE/spec-cleaner/master) spec-cleaner is a tool that is planned to be replacement for "osc service localrun format_spec_file". It is intended to provide same or better features in order for us to be able to unify all the spec files in obs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/README.md.in new/spec-cleaner-spec-cleaner-0.8.2/README.md.in --- old/spec-cleaner-spec-cleaner-0.8.1/README.md.in 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/README.md.in 2016-04-29 22:12:42.000000000 +0200 @@ -2,6 +2,7 @@ [](https://travis-ci.org/openSUSE/spec-cleaner) [](https://coveralls.io/github/openSUSE/spec-cleaner?branch=master) +[](https://landscape.io/github/openSUSE/spec-cleaner/master) spec-cleaner is a tool that is planned to be replacement for "osc service localrun format_spec_file". It is intended to provide same or better features in order for us to be able to unify all the spec files in obs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/RELEASE.md new/spec-cleaner-spec-cleaner-0.8.2/RELEASE.md --- old/spec-cleaner-spec-cleaner-0.8.1/RELEASE.md 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/RELEASE.md 2016-04-29 22:12:42.000000000 +0200 @@ -2,7 +2,7 @@ ======================= Steps to create a new release: -1. check that the version bump was done in setup.py +1. check that the version bump was done in spec_cleaner/__init__.py 2. tag the new release: `git tag -s spec-cleaner-X.Y.Z` -3. upload to pypi: `python setup.py sdist upload -4. post release version bump in setup.py +3. upload to pypi: `python setup.py sdist upload` +4. 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.8.1/data/licences_exceptions.txt new/spec-cleaner-spec-cleaner-0.8.2/data/licences_exceptions.txt --- old/spec-cleaner-spec-cleaner-0.8.1/data/licences_exceptions.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/data/licences_exceptions.txt 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,25 @@ +389-exception +Autoconf-exception-2.0 +Autoconf-exception-3.0 +Bison-exception-2.2 +CLISP-exception-2.0 +Classpath-exception-2.0 +DigiRule-FOSS-exception +FLTK-exception +Fawkes-Runtime-exception +Font-exception-2.0 +GCC-exception-2.0 +GCC-exception-3.1 +LZMA-exception +Libtool-exception +Nokia-Qt-exception-1.1 +OCCT-exception-1.0 +Qwt-exception-1.0 +WxWindows-exception-3.1 +eCos-exception-2.0 +freertos-exception-2.0 +gnu-javamail-exception +i2p-gpl-java-exception +mif-exception +openvpn-openssl-exception +u-boot-exception-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/license-update.sh new/spec-cleaner-spec-cleaner-0.8.2/license-update.sh --- old/spec-cleaner-spec-cleaner-0.8.1/license-update.sh 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/license-update.sh 2016-04-29 22:12:42.000000000 +0200 @@ -1,23 +1,24 @@ +#!/bin/bash export LC_ALL=C curl -s 'https://docs.google.com/spreadsheets/d/14AdaJ6cmU0kvQ4ulq9pWpjdZL5tkR03exRSY...' | grep -v "New format" \ | sed -e 's,\s*$,,' > licenses_changes.ntxt : > licenses_changes.ptxt -grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | while read l; do +grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | while read -r l; do echo "$l+ $l+" >> licenses_changes.ptxt ; done -for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'`; do +for i in $(w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'); do echo "$i $i" >> licenses_changes.ntxt ; echo "$i+ $i+" >> licenses_changes.ptxt ; done IFS=: -dups=$(tr ' ' ':' < licenses_changes.ntxt | while read nl ol; do echo "$nl"; done | sed -e 's,^,B-,; s,B-SUSE-,A-,' | sort | uniq | sed -e 's,^.-,,' | sort | uniq -d) +dups=$(tr ' ' ':' < licenses_changes.ntxt | while read -r nl ol; do echo "$nl"; done | sed -e 's,^,B-,; s,B-SUSE-,A-,' | sort | uniq | sed -e 's,^.-,,' | sort | uniq -d) if test -n "$dups"; then echo "DUPS $dups" exit 1 fi -dups=$(tr ' ' ':' < licenses_changes.ntxt | while read nl ol; do echo "$ol"; done | sort | uniq -d) +dups=$(tr ' ' ':' < licenses_changes.ntxt | while read -r nl ol; do echo "$ol"; done | sort | uniq -d) unset IFS if test -n "$dups"; then echo "DUPS $dups" @@ -33,7 +34,7 @@ echo "License Tag | Description" echo "----------- | -----------" IFS=: -w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,\s* \([^ ]*\)$,:\1,' | while read text license; do +w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,\s* \([^ ]*\)$,:\1,' | while read -r text license; do echo "$license | $text" echo "$license" >> licenses_changes.raw done @@ -46,7 +47,7 @@ echo "|-----------|" IFS=: -grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | sort -u | while read nl; do +grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | sort -u | while read -r nl; do echo "|$nl|" done unset IFS @@ -54,6 +55,13 @@ rm licenses_changes.raw ) > README.md +for i in `w3m -dump -cols 1000 http://spdx.org/licenses/exceptions-index.html | grep "License Exception Text" | sed -e 's, *Y *License Exception Text,,; s, *License Exception Text,,; s,\s* \([^ ]*\)$,:\1,' | cut -d: -f2`; do + echo "$i" >> license_exceptions.ntxt ; +done + +cat license_exceptions.ntxt | sort -u -o data/licences_exceptions.txt +rm license_exceptions.ntxt + cat licenses_changes.ntxt licenses_changes.ptxt | sort -u -o licenses_changes.stxt ( echo "First line" ; cat licenses_changes.stxt ) > data/licenses_changes.txt rm licenses_changes.ntxt licenses_changes.stxt licenses_changes.ptxt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/obs/clean_spec_file new/spec-cleaner-spec-cleaner-0.8.2/obs/clean_spec_file --- old/spec-cleaner-spec-cleaner-0.8.1/obs/clean_spec_file 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/obs/clean_spec_file 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ shift ;; *) - echo Unknown parameter $1. + echo Unknown parameter "$1". echo 'Usage: this service does not expect additional arguments.' exit 1 ;; @@ -26,12 +26,12 @@ if [ -z "${MYOUTDIR}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ -z "${MYSPECFILES}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ "x${MYSPECFILES}" = "x " ]; then @@ -44,7 +44,7 @@ echo "WARNING: spec file \"${i}\" is not writeable." continue fi - /usr/bin/spec-cleaner -f "$i" -i 2>&1 > /dev/null + /usr/bin/spec-cleaner -f "$i" -i > /dev/null 2>&1 if [ $? -ne 0 ]; then echo "ERROR: failed conversion of spec file: \"${i}\"" RETVAL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/obs/format_spec_file new/spec-cleaner-spec-cleaner-0.8.2/obs/format_spec_file --- old/spec-cleaner-spec-cleaner-0.8.1/obs/format_spec_file 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/obs/format_spec_file 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ shift ;; *) - echo Unknown parameter $1. + echo Unknown parameter "$1". echo 'Usage: this service does not expect additional arguments.' exit 1 ;; @@ -26,12 +26,12 @@ if [ -z "${MYOUTDIR}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ -z "${MYSPECFILES}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ "x${MYSPECFILES}" = "x " ]; then @@ -44,7 +44,7 @@ echo "WARNING: spec file \"${i}\" is not writeable." continue fi - /usr/bin/spec-cleaner -m -f "$i" -i 2>&1 > /dev/null + /usr/bin/spec-cleaner -m -f "$i" -i > /dev/null 2>&1 if [ $? -ne 0 ]; then echo "ERROR: failed conversion of spec file: \"${i}\"" RETVAL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/pkgconfig-update.sh new/spec-cleaner-spec-cleaner-0.8.2/pkgconfig-update.sh --- old/spec-cleaner-spec-cleaner-0.8.1/pkgconfig-update.sh 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/pkgconfig-update.sh 2016-04-29 22:12:42.000000000 +0200 @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash fetch() { - local status="$(curl -o /dev/null -LsIw '%{http_code}' "$1" 2>&1)" + local status + status="$(curl -o /dev/null -LsIw '%{http_code}' "$1" 2>&1)" if [ "$status" != 200 ]; then echo >&2 "Unable to download the repodata from \"$1\": $status" exit 1 @@ -16,4 +17,4 @@ BASEURL="http://download.opensuse.org/distribution/$1/repo/oss/suse/" fetch "${BASEURL}$(fetch "${BASEURL}repodata/repomd.xml" \ | perl -ne 'print $1 if /"(.*?primary.xml.gz)"/')" \ - | zcat | perl "$(cd "`dirname $0`" && pwd)/pkgconfig-update.pl" + | zcat | perl "$(cd "$(dirname $0)" && pwd)/pkgconfig-update.pl" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/__init__.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/__init__.py 2016-04-29 22:12:42.000000000 +0200 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.8.1' +__version__ = '0.8.2' def process_args(argv): @@ -40,6 +40,8 @@ help='inline the changes directly to the parsed file.') parser.add_argument('-m', '--minimal', action='store_true', default=False, help='run in minimal mode that does not do anything intrusive (ie. just sets the Copyright)') + parser.add_argument('--no-copyright', action='store_true', default=False, + help='don\'t handle or add a copyright header') output_group.add_argument('-o', '--output', default='', help='specify the output file for the cleaned spec content.') parser.add_argument('-p', '--pkgconfig', action='store_true', default=False, @@ -74,6 +76,7 @@ 'diff': options.diff, 'diff_prog': options.diff_prog, 'minimal': options.minimal, + 'no_copyright': options.no_copyright, } return options_dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcleaner.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcleaner.py 2016-04-29 22:12:42.000000000 +0200 @@ -55,6 +55,7 @@ self.diff = options['diff'] self.diff_prog = options['diff_prog'] self.minimal = options['minimal'] + self.no_copyright = options['no_copyright'] # run gvim(diff) in foreground mode if self.diff_prog.startswith("gvim") and " -f" not in self.diff_prog: self.diff_prog += " -f" @@ -97,25 +98,25 @@ self.fout = sys.stdout def _load_licenses(self): - # detect all present licenses in the spec and detect if we have more - # than one. If we do put license to each subpkg - licenses = [] - filecontent = open(self.specfile) - for line in filecontent: - if self.reg.re_license.match(line): - line = line.rstrip('\n') - line = line.rstrip('\r') - line = line.rstrip() - match = self.reg.re_license.match(line) - value = match.groups()[len(match.groups()) - 1] - if not value in licenses: - licenses.append(value) - filecontent.close() - filecontent = None - if len(licenses) > 1: - self._subpkg_licenses = True - # put first license as placeholder if main preamble is missing one - self._main_license = licenses[0] + # detect all present licenses in the spec and detect if we have more + # than one. If we do put license to each subpkg + licenses = [] + filecontent = open(self.specfile) + for line in filecontent: + if self.reg.re_license.match(line): + line = line.rstrip('\n') + line = line.rstrip('\r') + line = line.rstrip() + match = self.reg.re_license.match(line) + value = match.groups()[len(match.groups()) - 1] + if value not in licenses: + licenses.append(value) + filecontent.close() + filecontent = None + if len(licenses) > 1: + self._subpkg_licenses = True + # put first license as placeholder if main preamble is missing one + self._main_license = licenses[0] def _detect_preamble_section(self, line): # This is seriously ugly but can't think of cleaner way @@ -204,7 +205,8 @@ def run(self): # We always start with Copyright - self.current_section = RpmCopyright(self.specfile, self.minimal) + self.current_section = RpmCopyright(self.specfile, self.minimal, + self.no_copyright) # FIXME: we need to store the content localy and then reorder # to maintain the specs all the same (eg somebody put diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcopyright.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcopyright.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcopyright.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcopyright.py 2016-04-29 22:12:42.000000000 +0200 @@ -14,8 +14,9 @@ that are still relevant. Everything else is ignored. """ - def __init__(self, specfile, minimal): + def __init__(self, specfile, minimal, no_copyright): Section.__init__(self, specfile, minimal) + self.no_copyright = no_copyright self.copyrights = [] self.buildrules = [] self.my_copyright = '' @@ -84,6 +85,8 @@ return def output(self, fout, newline=True, new_class=None): + if self.no_copyright: + return self._add_modelines() self._add_pkg_header() self._add_copyright() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmdescription.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmdescription.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmdescription.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmdescription.py 2016-04-29 22:12:42.000000000 +0200 @@ -29,7 +29,7 @@ if not self.previous_line or len(self.previous_line) == 0: return - if line == 'Authors:' and not self.minimal: + if (line == 'Authors:' or line == 'Author:') and not self.minimal: self.removing_authors = True return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmpreamble.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmpreamble.py 2016-04-29 22:12:42.000000000 +0200 @@ -289,11 +289,21 @@ len(self.paragraph['bconds']) > 0: self._condition_define = True self.paragraph = self._oldstore.pop(-1) - self.paragraph['conditions'].append(lines) + if isinstance(lines, str): + self.paragraph['conditions'].append(lines) + else: + self.paragraph['conditions'] += lines # If we are on endif we check the condition content # and if we find the defines we put it on top. if endif or not self.condition: + # check if we are doing the ppc64 migration and delete it + if not self.minimal and \ + isinstance(self.paragraph['conditions'][0], list) and \ + len(self.paragraph['conditions']) == 3 and \ + self.paragraph['conditions'][0][0] == '# bug437293' and \ + self.paragraph['conditions'][1].endswith('64bit'): + self.paragraph['conditions'] = [] if self._condition_define: # If we have define conditions and possible bcond start # we need to put it bellow bcond definitions as otherwise @@ -315,7 +325,7 @@ self._condition_bcond = False self.paragraph['conditions'] = [] - def _end_paragraph(self, needs_license = False): + def _end_paragraph(self, needs_license=False): lines = [] # add license to the package if missing and needed @@ -372,10 +382,11 @@ pkgname = value.split()[0] version = value.replace(pkgname, '') pkgconfig = [] - if pkgname == 'pkgconfig(pkg-config)': + if pkgname == 'pkgconfig(pkg-config)' or \ + pkgname == 'pkg-config': # If we have pkgconfig dep in pkgconfig it is nuts, replace it - return ['pkg-config{0}'.format(version)] - if pkgname not in self.pkgconfig_conversions or pkgname == 'pkg-config': + return ['pkgconfig{0}'.format(version)] + if pkgname not in self.pkgconfig_conversions: # first check if the pacakge is in the replacements return [value] else: @@ -426,8 +437,8 @@ expanded += token # Add pkg-config dep if we have in BR or R the pkgconfig(dependency) if any(item.startswith('pkgconfig(') for item in expanded) \ - and not 'pkg-config' in expanded: - expanded.append('pkg-config') + and 'pkgconfig' not in expanded: + expanded.append('pkgconfig') # and then sort them :) expanded.sort() @@ -659,7 +670,7 @@ elif self.reg.re_release.match(line): match = self.reg.re_release.match(line) value = match.group(1) - if re.search('[a-zA-Z\s]', value): + if re.search(r'[a-zA-Z\s]', value): self._add_line_value_to('release', value) else: self._add_line_value_to('release', '0') @@ -678,7 +689,7 @@ 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: + if not self.previous_line.startswith('# FIXME') and value not 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmregexp.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmregexp.py 2016-04-29 22:12:42.000000000 +0200 @@ -91,7 +91,7 @@ re_jobs = re.compile(r'%{?(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}?') re_make = re.compile(r'(^|(.*\s)?)make($|(\s.*)?)') re_optflags_quotes = re.compile(r'=\s*\${?RPM_OPT_FLAGS}?\s*$') - re_optflags = re.compile('\${?RPM_OPT_FLAGS}?') + re_optflags = re.compile(r'\${?RPM_OPT_FLAGS}?') # rpmcopyright re_copyright = re.compile(r'^#\s*Copyright\ \(c\)\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmscriplets.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmscriplets.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmscriplets.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmscriplets.py 2016-04-29 22:12:42.000000000 +0200 @@ -11,17 +11,18 @@ def output(self, fout, newline=True, new_class=None): if not self.minimal: - self._collapse_multiline_ldconfig(newline) + self._collapse_multiline_ldconfig() Section.output(self, fout, newline, new_class) - def _collapse_multiline_ldconfig(self, newline): - nolines = len(self.lines) - # if we have 2 or 3 lines where last one is empty - if nolines == 2 or (nolines == 3 and self.lines[2] == ''): - if self.lines[0] != '' and self.lines[1] == '': + def _collapse_multiline_ldconfig(self): + # if we have 2 lines or rest of them are empty, pop those + for i in reversed(self.lines): + if i: + break + else: self.lines.pop() - if len(self.lines) >= 2: - if self.lines[1] == '/sbin/ldconfig': - pkg = self.lines[0] - self.lines = [] - self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) + if len(self.lines) == 2: + if self.lines[1] == '/sbin/ldconfig': + pkg = self.lines[0] + self.lines = [] + self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/acceptance-tests.py new/spec-cleaner-spec-cleaner-0.8.2/tests/acceptance-tests.py --- old/spec-cleaner-spec-cleaner-0.8.1/tests/acceptance-tests.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/acceptance-tests.py 2016-04-29 22:12:42.000000000 +0200 @@ -113,6 +113,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -127,6 +128,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(self.tmp_file_rerun.name) as test: @@ -150,6 +152,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': True, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -164,12 +167,42 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': True, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(self.tmp_file_rerun.name) as test: self.assertStreamEqual(ref, test) @patch('spec_cleaner.rpmcopyright.datetime') + def test_no_copyright_output(self, datetime_mock): + datetime_mock.datetime.now.return_value = ( + datetime.datetime(2013, 1, 1)) + spec_str="""%check +make check + +%changelog +""" + tmp_file = os.path.join(self.tmp_dir, "no_copyright_test.spec") + out_file = os.path.join(self.tmp_dir, "no_copyright_test_out.spec") + with open(tmp_file, "w+") as t: + t.write(spec_str) + + # first try to generate cleaned content from messed up + options = { + 'specfile': tmp_file, + 'output': out_file, + 'pkgconfig': True, + 'inline': False, + 'diff': False, + 'diff_prog': 'vimdiff', + 'minimal': True, + 'no_copyright': True, + } + self._run_individual_test(options) + with open(out_file) as ref, open(tmp_file) as test: + self.assertStreamEqual(ref, test) + + @patch('spec_cleaner.rpmcopyright.datetime') def test_inline_function(self, datetime_mock): datetime_mock.datetime.now.return_value = ( datetime.datetime(2013, 1, 1)) @@ -188,6 +221,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -208,6 +242,7 @@ 'diff': False, 'diff_prog': 'gvimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) @@ -228,5 +263,6 @@ 'diff': True, 'diff_prog': 'gvimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,3 +17,10 @@ * Tim Cera * Peter Funk * Jay Painter + +%description devel +Headers and another development files for TomMath library. + +Author: +-------- + Tom St Denis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,8 @@ +%post -n %{libsoname} +/sbin/ldconfig + + +%postun -n %{libsoname} +/sbin/ldconfig + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,28 @@ +%package libcap +Requires: bash +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-64bit +%endif + +%package libcap-devel +BuildRequires: pkg-config +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +%endif + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +BuildRequires: somethinghandwritten +%endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# 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/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: socat +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 +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkg-config +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%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 +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/bracketdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/bracketdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/bracketdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/bracketdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: cbla-devel BuildRequires: perl-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: rocket-devel BuildRequires: something-devel BuildRequires: cmake(bla) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/conditions.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/conditions.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,7 +25,7 @@ Source1: apparmor-%{version}.tar.gz.asc Source2: %{name}.keyring BuildRequires: bbb -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python Requires: insserv BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/depredux.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/depredux.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/depredux.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/depredux.spec 2016-04-29 22:12:42.000000000 +0200 @@ -19,7 +19,7 @@ Name: depredux # comment one # comment two -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libva) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,4 +25,7 @@ also includes support for CvsGraph -- a program to graphically display the revision trees and branches. +%description devel +Headers and another development files for TomMath library. + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/interestingheader.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/interestingheader.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/interestingheader.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/interestingheader.spec 2016-04-29 22:12:42.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: libircclient-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(fftw3f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,22 @@ +# +# spec file for package ldconfigscriptlets +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%post -n %{libsoname} -p /sbin/ldconfig +%postun -n %{libsoname} -p /sbin/ldconfig + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconf.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconf.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconf.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconf.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(xxf86vm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfigdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfigdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfigdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfigdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,7 +17,7 @@ BuildRequires: gtk2 -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(gail) >= 2.13 BuildRequires: pkgconfig(gdk-2.0) >= 2.13 BuildRequires: pkgconfig(gdk-x11-2.0) >= 2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfrequires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfrequires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfrequires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfrequires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,9 +16,9 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(blabla) -Requires: pkg-config +Requires: pkgconfig Requires: pkgconfig(blabla) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,40 @@ +# +# spec file for package ppcoldsupport +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%package libcap +Requires: bash + +%package libcap-devel +BuildRequires: pkgconfig + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +BuildRequires: somethinghandwritten +Obsoletes: libcap-devel-64bit +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/requires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/requires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/requires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/requires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -33,7 +33,7 @@ Requires: jjj > %{version} Requires: kkk Requires: php5 >= %{phpversion} -Requires: pkg-config +Requires: pkgconfig Requires: rrr >= %{version} Requires: zzz Requires: perl(DBD::SQLite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# 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/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: socat +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 +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkgconfig +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%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 +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/bracketdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/bracketdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/bracketdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/bracketdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: cbla-devel BuildRequires: perl-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: rocket-devel BuildRequires: something-devel BuildRequires: cmake(bla) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/conditions.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/conditions.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,7 +25,7 @@ Source1: apparmor-%{version}.tar.gz.asc Source2: %{name}.keyring BuildRequires: bbb -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python Requires: insserv BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/depredux.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/depredux.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/depredux.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/depredux.spec 2016-04-29 22:12:42.000000000 +0200 @@ -19,7 +19,7 @@ Name: depredux # comment one # comment two -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libva) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -34,4 +34,11 @@ * Peter Funk * Jay Painter +%description devel +Headers and another development files for TomMath library. + +Author: +-------- + Tom St Denis + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/interestingheader.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/interestingheader.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/interestingheader.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/interestingheader.spec 2016-04-29 22:12:42.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: libircclient-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(fftw3f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,27 @@ +# +# spec file for package ldconfigscriptlets +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%post -n %{libsoname} +/sbin/ldconfig + + +%postun -n %{libsoname} +/sbin/ldconfig + + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconf.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconf.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconf.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconf.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(xxf86vm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfigdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfigdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfigdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfigdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,7 +17,7 @@ BuildRequires: gtk2 -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(gail) >= 2.13 BuildRequires: pkgconfig(gdk-2.0) >= 2.13 BuildRequires: pkgconfig(gdk-x11-2.0) >= 2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfrequires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfrequires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfrequires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfrequires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,9 +16,9 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(blabla) -Requires: pkg-config +Requires: pkgconfig Requires: pkgconfig(blabla) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,48 @@ +# +# spec file for package ppcoldsupport +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%package libcap +Requires: bash +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-64bit +%endif + +%package libcap-devel +BuildRequires: pkgconfig +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +%endif + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +BuildRequires: somethinghandwritten +Obsoletes: libcap-devel-64bit +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/requires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/requires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/requires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/requires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -33,7 +33,7 @@ Requires: jjj > %{version} Requires: kkk Requires: php5 >= %{phpversion} -Requires: pkg-config +Requires: pkgconfig Requires: rrr >= %{version} Requires: zzz Requires: perl(DBD::SQLite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# 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/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: socat +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 +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkgconfig +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%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 +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +0200 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 0.8.1-1 +Version: 0.8.2-1 Binary: spec-cleaner Maintainer: Přemysl Janouch <pjanouch@suse.com> Architecture: all