From 173cc439a69a3d087d5c80ffa04a94bde2b525233ca59f407ac9d320ceb8f7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 May 2011 12:17:35 +0000 Subject: [PATCH 001/151] Accepting request 71284 from openSUSE:Tools:Unstable move to stable project OBS-URL: https://build.opensuse.org/request/show/71284 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=1 --- .gitattributes | 24 ++ .gitignore | 4 + format_spec_file | 27 ++ format_spec_file.service | 5 + obs-service-format_spec_file.changes | 17 + obs-service-format_spec_file.spec | 38 ++ prepare_spec | 604 +++++++++++++++++++++++++++ 7 files changed, 719 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 format_spec_file create mode 100644 format_spec_file.service create mode 100644 obs-service-format_spec_file.changes create mode 100644 obs-service-format_spec_file.spec create mode 100644 prepare_spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..37a8eaa --- /dev/null +++ b/.gitattributes @@ -0,0 +1,24 @@ +*.changes merge=merge-changes +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b731c3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.obscpio +*.osc +_build.* +.pbuild diff --git a/format_spec_file b/format_spec_file new file mode 100644 index 0000000..da13fda --- /dev/null +++ b/format_spec_file @@ -0,0 +1,27 @@ +#!/bin/bash + +# just a wrapper for the perl script. + + +while test $# -gt 0; do + case $1 in + *-outdir) + MYOUTDIR="$2" + shift + ;; + *) + echo Unknown parameter $1. + echo 'Usage: this service is not excepting parameters' + exit 1 + ;; + esac + shift +done + +RETURN=0 +for i in *.spec; do + /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 +done + +exit $RETURN + diff --git a/format_spec_file.service b/format_spec_file.service new file mode 100644 index 0000000..8b502ac --- /dev/null +++ b/format_spec_file.service @@ -0,0 +1,5 @@ + + Validate sources + The default SUSE source validator which catches common pitfalls before build. + + diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes new file mode 100644 index 0000000..7d0c5c9 --- /dev/null +++ b/obs-service-format_spec_file.changes @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Wed May 25 14:00:35 CEST 2011 - ro@suse.de + +- fix uninitialized warning in prepare_spec + +------------------------------------------------------------------- +Wed May 4 01:55:04 CEST 2011 - ro@suse.de + +- cleanup prepare_spec, drop Needed.pm +- make it ready for public usage + +------------------------------------------------------------------- +Wed Jan 26 17:02:42 UTC 2011 - adrian@suse.de + +- initial version. + not usable outside of SUSE network yet. + diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec new file mode 100644 index 0000000..93ac8c1 --- /dev/null +++ b/obs-service-format_spec_file.spec @@ -0,0 +1,38 @@ +Name: obs-service-format_spec_file +License: GPL v2 or later +Group: Development/Tools/Building +Summary: An OBS source service: reformats a spec file to SUSE standard. +Version: 0.1 +Release: 1 +Source: format_spec_file +Source1: format_spec_file.service +Source2: prepare_spec +Requires: osc-source_validator +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This is a source service for openSUSE Build Service. + +This source service is formating the spec file to SUSE standard. The rational +behind is to make it easier to review spec files from unknown packagers. + +This should be used in "trylocal" mode, so that osc is adapting the existing +spec file instead of creating a new one. + +%prep + +%setup -q -D -T 0 -n . + +%build + +%install +mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files + +%files +%defattr(-,root,root) +%dir /usr/lib/obs +/usr/lib/obs/service diff --git a/prepare_spec b/prepare_spec new file mode 100644 index 0000000..e27a4d0 --- /dev/null +++ b/prepare_spec @@ -0,0 +1,604 @@ +#! /usr/bin/perl -w +# +# vim:sw=2:et +# + +BEGIN { + unshift @INC, "."; + unshift @INC, "/usr/lib/build/"; +} + +use Time::localtime; +use Data::Dumper; +use strict; + +my @oldspec = (); +my @newspec = (); +my $base_package = ""; +my $neededforbuild = ""; +my $icecreamforbuild = ""; +my $norootforbuild = 0; +my @copyrights = (); +my $needsrootforbuild = 0; +my $needsbinariesforbuild = 0; +my $nodebuginfo = 0; +my %multiline_macros = (); +my $nosrc_result = 0; +my $current_section = "header"; +my $had_debug_package = 0; +my %pkg_version = (); +my %pkg_release = (); +my %please_replace = (); +my %replace_hash = (); +my $build_root = $ENV{'BUILD_ROOT'}; +my $disabled_packs; +my $ifhandler; +my $definelist; +my $debug = 0; + +my @global_tags_list = +( + 'Autoreq', + 'Autoreqprov', + 'BuildArch', + 'BuildArchitectures', + 'BuildRequires', + 'Conflicts', + 'DocDir', + 'Enhances', + 'Enhances', + 'EssentialFor', + 'ExcludeArch', + 'ExclusiveArch', + 'Freshens', + 'NoPatch', + 'NoSource', + 'Obsoletes', + 'Patch\d*', + 'Prefix', + 'PreReq', + 'Provides', + 'Recommends', + 'Requires', + 'Source\d*', + 'Suggests', + 'Supplements', + 'Url', +); + +my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; + +my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . + 'description|files|triggerin|triggerun|triggerpostun)\b'; + +sub unify { + my %h = map {$_ => 1} @_; + return grep(delete($h{$_}), @_); +} + +sub capitalize_case($) +{ + my ($tag) = @_; + + $tag = lc($tag); + + $tag =~ s/docdir/DocDir/i; + $tag =~ s/arch/Arch/i; + $tag =~ s/patch/Patch/i; + $tag =~ s/source/Source/i; + $tag =~ s/req/Req/i; + $tag =~ s/prov/Prov/i; + $tag =~ s/^(\w)/uc($1)/e; + + return $tag; +} + +sub maybe_add_empty_line() +{ + push @oldspec, "" + if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); +} + +sub maybe_add_debug_package() +{ + if ( $ENV{'BUILD_DEBUG_FLAGS'} + && ( !$nosrc_result || $base_package =~ /^kernel/ || $base_package =~ /^java/ || $base_package =~ /^texlive-bin/ || $base_package =~ /^glibc/ ) + && !$nodebuginfo + && !$had_debug_package ) + { + my @spec_back; + while(1) { + my $line = pop @oldspec; + unshift @spec_back, $line; + next if ($line =~ /^\s*$/); + next if ($line =~ /^\s*%if\b/); + last; + } + # insert the %debug_package just before the first %if + push @oldspec, shift @spec_back; + push @oldspec, "%debug_package", @spec_back; + $had_debug_package = 1; + } +} + +sub change_section($) +{ + my ($new_section) = @_; + + maybe_add_empty_line(); + + $current_section = $new_section; + warn "section changed to $current_section\n" if $debug; +} + +sub set_current_pkg { + my ( $arg ) = @_; + print "DEBUG: set_current_pkg receiving $arg\n" if $debug; + my ( @argarray ) = split ( '\s+' , $arg ); + my $curpack = $base_package; + my $curlang = ""; + while (my $carg = shift @argarray) { + next if ($carg eq "%description" || $carg eq "%package" || $carg eq "%prep"); + if ($carg eq "-l") { + $curlang = shift @argarray; + } elsif ($carg eq "-n") { + $curpack = shift @argarray; + } else { + $curpack = "$base_package-" if $base_package; + $curpack .= $carg; + } + } + print "DEBUG: set_current_pkg returning $curpack, $curlang\n" if $debug; + return ($curpack, $curlang); +} + +sub read_and_parse_old_spec { + my ( $specfile, $base_package ) = @_; + my $current_package = $base_package; + my $current_lang = ""; + my $check_printed = "false"; + my $print_comments = "false"; + my %version; + my $ifhandler; + $ifhandler->{"disabled"} = 0; + + my @readspec; + open ( SPEC , "$specfile" ) || die "can't read specfile"; + @readspec = ; + close SPEC; + chomp @readspec; + + while (@readspec) { + $_ = shift @readspec; + if ( /^\s*$/ && $current_section ne "description") { + push @oldspec, "XXXBLANKLINE"; + next; + } + + if ( /^#\s*norootforbuild\s*$/ ) { + $norootforbuild = 1; + next; + } + if ( /^#\s*needsrootforbuild\s*$/ ) { + $needsrootforbuild = 1; + next; + } + if ( /^#\s*needsbinariesforbuild\s*$/ ) { + $needsbinariesforbuild = 1; + next; + } + if ( /^#\s*nodebuginfo\s*$/ ) { + $nodebuginfo = 1; + next; + } + if ( /^#\s*icecream/ ) { + $icecreamforbuild = $_; + $icecreamforbuild =~ s/^#\s*icecream\s*//; + next; + } + if ( /^#\s*Copyright\s*/ ) { + for (;;) + { + # check if line is ONLY a standard copyright line, if so, ignore. + my $c = $_; + $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; + push(@copyrights, $_) if length $c > 5; + last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ + || grep { $readspec[0] =~ /^#\s*$_/ } ("norootforbuild","needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","neededforbuild","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + $_ = shift @readspec; + } + next; + } + if ( /^#\s*neededforbuild/ ) { + $neededforbuild = $_; + $neededforbuild =~ s/^#\s*neededforbuild\s*//; + my (%aa) = (); + foreach my $x (split(' ',$neededforbuild)){ + $aa{$x}=1; + } + $neededforbuild = join(' ',sort keys (%aa)); + + next; + } + # evil epoch removal + next if ( /^Epoch:/ ); + $_ =~ s/%{?epoch}?[:-]//g; + $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); + + if ( /^BuildRequires:/ ) { + my $cur_buildreq = $_; + $cur_buildreq =~ s/^BuildRequires:\s*//; + my %aa; + while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + $aa{$1}=1; + } + # ignore line if it looks like a "usedforbuild" line, i.e. + # if it contains too many base packages + next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; + push @oldspec, "BuildRequires: ".join(' ',sort keys(%aa)); + next; + } + next if ( /^#\s*usedforbuild/ ); + if ( /^%\?__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!BuildIgnore:/ ) { + push @oldspec, $_; + next; + } + if ( /^#/ && $current_section ne "description") { + warn "$_ $current_section\n" if $debug; + if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { + push @oldspec, $_; + } + next; + } + if ( /^%debug_package/ ) { + # remove, we add this ourselves + next; + } + $print_comments = "true" unless /^#/; + + if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { + next; + } + if ( /^%define\s+(\w[\w\d]+).*\\$/ ) { + $multiline_macros{$1} = 1; + } + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { + change_section("header") if ($current_section eq "description"); + push @oldspec, $_; + if ( /^\s*%if\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 1; + $ifhandler->{"depth"}++; + my $if_not = 0; + if ( $args[1] =~ /^\!/ ) { + $args[1] =~ s/^\!//; + $if_not = 1; + } + if ( ($args[1] eq "0") + || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) + || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) + || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") + || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { + $ifhandler->{"disabled"} = $ifhandler->{"depth"}; + $ifhandler->{"last_if_disabled"} = 1; + } + } elsif ( /^\s*%if/ ) { + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 0; + $ifhandler->{"depth"}++; + } elsif ( /^\s*%endif/ ) { + $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; + $ifhandler->{"depth"}--; + } elsif ( /^\s*%else/ ) { + if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { + $ifhandler->{"disabled"} = 0; + } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { + $ifhandler->{"disabled"} = 1; + } + } elsif ( /^\s*%define\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); + if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { + $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + } + while ($_ =~ /\\$/) { + $_ = shift @readspec; + push @oldspec, $_; + } + } + next; + } + if ( /^%package\b/i or /^%prep\b/i ) { + if (/^%package\b/i) { + change_section("header"); + } else { + change_section("prep"); + } + maybe_add_debug_package(); + $_ =~ s/^(%\w+)/lc($1)/e; + if ($debug) { + warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); + } + push @oldspec, $_; + for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { + $_ =~ s/\Q$xx\E/$definelist->{$xx}/; + } + $_ =~ s/%{\?[^\}]*}//; + if ($debug) { + warn "after: $_\n"; + } + ($current_package, $current_lang) = set_current_pkg ( $_ ); + $disabled_packs->{$current_package} = 1 if $ifhandler->{"disabled"}; + warn "$current_package is disabled\n" if $ifhandler->{"disabled"} && $debug; + next; + } + if ( /^%description\b/i ) { + change_section("description"); + $_ =~ s/^(%\w+)/lc($1)/e; + push @oldspec, $_; + ($current_package, $current_lang) = set_current_pkg ( $_ ); + my $target = $current_package; + $target .= "_$current_lang" if $current_lang; + $target .= "_disabled" if $ifhandler->{"disabled"}; + push @oldspec, "XXXDESCRIPTION $target"; + next; + } + if ( /^%install\b/i ) { + change_section("install"); + push @oldspec, $_; + next; + } + if ( /^%changelog\b/i ) { + change_section("changelog"); + # changelog comes always from *.changes. Skip what is in spec file + # at the moment. + next; + } + if (/^%files\b/i) { + change_section("files"); + $current_section = "files"; + } + if ( /^%/ ) { + if ( m/$section_tags_re/oi ) { + $_ =~ s/^(%\w+)/lc($1)/e; + change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); + change_section("build") if m/\s*%build/i; + warn "changed to $current_section for $_\n" if $debug; + } + + push @oldspec, $_; + # multiline macros need an extra newline with old RPMs + if (/^%(\w[\w\d]+).*[^\\]$/) { + push @oldspec, "" if (defined($multiline_macros{$1})); + } + next; + } + if ($current_section eq "header") { + if ( /^Summary\b\s*:\s*(.*)/i ) { + $replace_hash{"XXXSUMMARY $current_package"} = sprintf("%-16s%s","Summary:", $1); + push @oldspec, "XXXSUMMARY $current_package"; + next; + } + if ( /^Group\b\s*:\s*(.*)/i ) { + $replace_hash{"XXXGROUP $current_package"} = sprintf("%-16s%s", "Group:", $1); + push @oldspec, "XXXGROUP $current_package"; + next; + } + if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { + next; + } + if ( /^Name\s*:\s*(.*)/i ) { + my $orig_name = $1; + my $changed_name = $orig_name; + $changed_name =~ s/\Q$_\E/$definelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$definelist})); + if ($changed_name eq $base_package) { + push @oldspec, sprintf("\n%-16s%s","Name:", $orig_name); + } else { + push @oldspec, sprintf("\n%-16s%s","Name:", $base_package); + } + $definelist->{"%name"} = $base_package if $ifhandler->{"disabled"} == 0; + $definelist->{"%{name}"} = $base_package if $ifhandler->{"disabled"} == 0; + warn ("line is $_, orig_name is $orig_name, base_package is $base_package\n") if $ifhandler->{"disabled"} == 0 && $debug; + next; + } + if ( /^BuildArchitectures\s*:/i ) { + $_ =~ s/^[^:]+:/BuildArch:/; + } + if ( /^Release\s*:\s*(.*)/i ) { + $pkg_release{$current_package} = $_; + $replace_hash{"XXXRELEASE $current_package"} = sprintf("%-16s%s","Release:", $1); + next; + } + if ( /^BuildRoot\s*:/i ) { + push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; + next; + } + if ( /^Copyright\s*:\s*(.*)/i || /^License\s*:\s*(.*)/i ) { + $replace_hash{"XXXLICENSE $current_package"} = sprintf("%-16s%s","License:", $1); + push @oldspec, "XXXLICENSE $current_package"; + next; + } + if ( /^Url\s*:\s*(.*)/i ) { + $replace_hash{"XXXURL $current_package"} = sprintf("%-16s%s","Url:", $1); + push @oldspec, "XXXURL $current_package"; + next; + } + if ( m/$global_tags_re\s*(.*)/oi ) { + my ($tag, $value) = ($1, $2); + $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); + push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); + next; + } + if ( /^Version:/ ) { + warn "found Version, section = $current_section\n" if $debug; + $version{$current_package} = $_; + $version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/; + $replace_hash{"XXXVERSION $current_package"} = sprintf("%-16s%s","Version:",$version{$current_package}); + push @oldspec, "XXXVERSION $current_package"; + push @oldspec, "XXXRELEASE $current_package"; + next; + } + } + if ( $current_section eq "description" ) { + my $target = $current_package; + $target .= "_$current_lang" if $current_lang; + $target .= "_disabled" if $ifhandler->{"disabled"}; + $replace_hash{"XXXDESCRIPTION $target"} .= "\n" if ( $replace_hash{"XXXDESCRIPTION $target"} ); + $replace_hash{"XXXDESCRIPTION $target"} .= $_; + next; + } + if ( $current_section ne "description" && $current_section ne "changelog" ) { + push @oldspec, $_; + } + } +} + +if ($ARGV[0] eq '--debug') { + $debug = 1; + shift @ARGV; +} + +my $specfile = shift ( @ARGV ); +if ( ! stat($specfile) ) { + die "$specfile is no file"; +} + + +my @specpath = split ('/' ,$specfile); +my $specbase = pop @specpath; +my $specdir = join ('/', @specpath); + +if ( $specdir eq "" ) { + $specdir = "."; +} + +my $xdefinelist; +my $seen_name = 0; +open ( SPE , "$specfile" ); +while ( ) { + chomp(); + if ( /^%define/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $args[2] =~ s/\Q$_\E/$xdefinelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$xdefinelist})); + if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { + $xdefinelist->{"%".$args[1]} = $args[2]; + $xdefinelist->{"%{".$args[1]."}"} = $args[2]; + } + } + if ( /^\s*Name:/ ) { + next if $seen_name; + $seen_name = 1; + $base_package = $_; + $base_package =~ s/^\s*Name:\s*(\S*)\s*/$1/; + $base_package =~ s/\Q$_\E/$xdefinelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$xdefinelist})); + if ($debug) { + warn "DEBUG: base_package = $base_package\n"; + warn Dumper($xdefinelist); + } + last; + } +} +close ( SPE ); + +warn ("base_package is $base_package\n") if $debug; + +if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { + $base_package =~ s/[0-9]$//; +} +if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { + $base_package =~ s/\-[^\-]*$//; +} + +warn ("base_package is $base_package\n") if $debug; + +if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { + $base_package = $specbase; + $base_package =~ s/\.spec$//; + $base_package =~ s/\-.*$//; +} + +read_and_parse_old_spec ( $specfile, $base_package ); + +for (@oldspec) { + next unless /^XXX/; + $please_replace{$_} = 1; +} + +my $thisyear = localtime->year() + 1900; + +unshift @copyrights, "# Copyright (c) $thisyear SUSE LINUX Products GmbH, Nuernberg, Germany."; + +my $copy_list = join("\n", @copyrights); +print < Date: Wed, 25 May 2011 15:34:58 +0000 Subject: [PATCH 002/151] avoid double files OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=2 --- format_spec_file | 2 ++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 20 -------------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/format_spec_file b/format_spec_file index da13fda..b97f59c 100644 --- a/format_spec_file +++ b/format_spec_file @@ -21,6 +21,8 @@ done RETURN=0 for i in *.spec; do /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 + # remove all file files which are indendical to committed files + cmp "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" done exit $RETURN diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7d0c5c9..f4040cc 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 25 15:34:28 UTC 2011 - adrian@suse.de + +- do not generate new spec files when no changes happened + ------------------------------------------------------------------- Wed May 25 14:00:35 CEST 2011 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5fe92e6..93ac8c1 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,22 +1,3 @@ -# -# spec file for package obs-service-format_spec_file -# -# Copyright (c) 2011 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: obs-service-format_spec_file License: GPL v2 or later Group: Development/Tools/Building @@ -55,4 +36,3 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file. %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service -%changelog -- 2.51.1 From ecad4243a74b48f1c1229f00ab8f17cd23221a03f2f9fac5b51b3b4341e2dbfd Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Wed, 25 May 2011 15:35:01 +0000 Subject: [PATCH 003/151] generated via source service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=3 -- 2.51.1 From b3ba34bedfd97f05c16bf16502db8604c34b68e6459df9d3142affa186bc766a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 31 May 2011 08:03:54 +0000 Subject: [PATCH 004/151] do not fail for non-spec file packages OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=4 --- format_spec_file | 4 ++++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/format_spec_file b/format_spec_file index b97f59c..c6acb6e 100644 --- a/format_spec_file +++ b/format_spec_file @@ -20,6 +20,10 @@ done RETURN=0 for i in *.spec; do + if [ "$i" == '*.spec' ]; then + print "WARNING: no spec file found" + exit 0 + fi /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 # remove all file files which are indendical to committed files cmp "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index f4040cc..7911eca 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 31 08:03:34 UTC 2011 - adrian@suse.de + +- do not fail on kiwi packages + ------------------------------------------------------------------- Wed May 25 15:34:28 UTC 2011 - adrian@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 93ac8c1..b86d579 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,3 +1,22 @@ +# +# spec file for package obs-service-format_spec_file +# +# Copyright (c) 2011 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: obs-service-format_spec_file License: GPL v2 or later Group: Development/Tools/Building @@ -11,6 +30,7 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %description This is a source service for openSUSE Build Service. @@ -24,15 +44,20 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . + %build + %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files + %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service + +%changelog -- 2.51.1 From cc45093da40b62018680a3b762e080d03a9de750772f064146d98e4670b16ece Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Tue, 31 May 2011 08:03:59 +0000 Subject: [PATCH 005/151] generated via source service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=5 -- 2.51.1 From dfa800b46a2ef6a3c6477b5fa290aa059729b6641393e515c727afbbd61e7a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 31 May 2011 08:08:57 +0000 Subject: [PATCH 006/151] typo OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=6 --- format_spec_file | 2 +- obs-service-format_spec_file.spec | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/format_spec_file b/format_spec_file index c6acb6e..01c0a36 100644 --- a/format_spec_file +++ b/format_spec_file @@ -21,7 +21,7 @@ done RETURN=0 for i in *.spec; do if [ "$i" == '*.spec' ]; then - print "WARNING: no spec file found" + echo "WARNING: no spec file found" exit 0 fi /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index b86d579..4b9e4e0 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -60,4 +60,6 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file. %dir /usr/lib/obs /usr/lib/obs/service + + %changelog -- 2.51.1 From cdeb749f8c7d4a98ac088bfa80c1601075117b63bf90aa532469d6bdc54c8c49 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 1 Jun 2011 13:10:04 +0000 Subject: [PATCH 007/151] Accepting request 71299 from openSUSE:Tools for our new checkin process OBS-URL: https://build.opensuse.org/request/show/71299 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=1 -- 2.51.1 From 2803f1398d23d2582e637eee7da3028d484b3fcec2b17edecf820937784f64d2 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 1 Jun 2011 13:10:16 +0000 Subject: [PATCH 008/151] Autobuild autoformatter for 71299 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=2 --- obs-service-format_spec_file.spec | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 93ac8c1..5fe92e6 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,3 +1,22 @@ +# +# spec file for package obs-service-format_spec_file +# +# Copyright (c) 2011 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: obs-service-format_spec_file License: GPL v2 or later Group: Development/Tools/Building @@ -36,3 +55,4 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file. %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service +%changelog -- 2.51.1 From ca44de4ebb9ce6589a84c333eef08b93cd2db67f74f0236c22dca42614841451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 15 Jun 2011 12:24:13 +0000 Subject: [PATCH 009/151] silence OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=8 --- format_spec_file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/format_spec_file b/format_spec_file index 01c0a36..e6da271 100644 --- a/format_spec_file +++ b/format_spec_file @@ -26,7 +26,7 @@ for i in *.spec; do fi /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 # remove all file files which are indendical to committed files - cmp "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" + cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" done exit $RETURN -- 2.51.1 From 5051b7deeb74002cc9c282ca911498e6c3547983cd28e89f3bf29dadd002b667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 Jun 2011 07:46:56 +0000 Subject: [PATCH 010/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=9 --- format_spec_file | 6 ------ obs-service-format_spec_file.changes | 10 ---------- obs-service-format_spec_file.spec | 7 ------- 3 files changed, 23 deletions(-) diff --git a/format_spec_file b/format_spec_file index e6da271..da13fda 100644 --- a/format_spec_file +++ b/format_spec_file @@ -20,13 +20,7 @@ done RETURN=0 for i in *.spec; do - if [ "$i" == '*.spec' ]; then - echo "WARNING: no spec file found" - exit 0 - fi /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 - # remove all file files which are indendical to committed files - cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" done exit $RETURN diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7911eca..7d0c5c9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue May 31 08:03:34 UTC 2011 - adrian@suse.de - -- do not fail on kiwi packages - -------------------------------------------------------------------- -Wed May 25 15:34:28 UTC 2011 - adrian@suse.de - -- do not generate new spec files when no changes happened - ------------------------------------------------------------------- Wed May 25 14:00:35 CEST 2011 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 4b9e4e0..5fe92e6 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,16 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - - %changelog -- 2.51.1 From c0e79d2913ecb4dc58b1469611c75ee65aca7375377ba836e9b9ee3ca65607b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 Jun 2011 07:50:25 +0000 Subject: [PATCH 011/151] merge OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=10 --- format_spec_file | 6 ++++++ obs-service-format_spec_file.changes | 10 ++++++++++ obs-service-format_spec_file.spec | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/format_spec_file b/format_spec_file index da13fda..e6da271 100644 --- a/format_spec_file +++ b/format_spec_file @@ -20,7 +20,13 @@ done RETURN=0 for i in *.spec; do + if [ "$i" == '*.spec' ]; then + echo "WARNING: no spec file found" + exit 0 + fi /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 + # remove all file files which are indendical to committed files + cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" done exit $RETURN diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7d0c5c9..7911eca 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 31 08:03:34 UTC 2011 - adrian@suse.de + +- do not fail on kiwi packages + +------------------------------------------------------------------- +Wed May 25 15:34:28 UTC 2011 - adrian@suse.de + +- do not generate new spec files when no changes happened + ------------------------------------------------------------------- Wed May 25 14:00:35 CEST 2011 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5fe92e6..4b9e4e0 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,6 +30,7 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %description This is a source service for openSUSE Build Service. @@ -43,16 +44,22 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . + %build + %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files + %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service + + + %changelog -- 2.51.1 From 0fe0f4bbbbc35a481148b181c121156e77b84f085cd13ae518130d0cc06017f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 Jun 2011 07:52:59 +0000 Subject: [PATCH 012/151] Accepting request 73966 from home:coolo:branches:openSUSE:Factory fix invalid licenses OBS-URL: https://build.opensuse.org/request/show/73966 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=11 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7911eca..06621a9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com + +- do not replace licenses without knowing them (not sure this + is necessary at all) + ------------------------------------------------------------------- Tue May 31 08:03:34 UTC 2011 - adrian@suse.de diff --git a/prepare_spec b/prepare_spec index e27a4d0..01f1f11 100644 --- a/prepare_spec +++ b/prepare_spec @@ -592,7 +592,7 @@ while (@oldspec) { if ($line =~ /^%package/ && $line !~ /\\$/) { $line =~ s/^(%\w+)/lc($1)/e; my ($current_package, $current_lang) = set_current_pkg ( $line ); - unless ($please_replace{"XXXLICENSE $current_package"}) { + unless ($please_replace{"XXXLICENSE $current_package"} || !$replace_hash{"XXXLICENSE $current_package"}) { print $replace_hash{"XXXLICENSE $current_package"}."\n"; } } -- 2.51.1 From a5b9a9ce9f46f7990cc5554601d9ed52e2be1388976c083f009e0134ad279d4e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 17 Jun 2011 09:36:25 +0000 Subject: [PATCH 013/151] Updating link to change in openSUSE:Factory/obs-service-format_spec_file revision 4.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=243506146534c93f65c341787a97dab7 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 4b9e4e0..e39cab5 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 1 +Release: 3 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From 5a441eb82908ef70f4562fa944f1b1af4fbee4d9483193d6b68e61350aa6babb Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jun 2011 09:36:25 +0000 Subject: [PATCH 014/151] Autobuild autoformatter for 73982 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=4 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 4b9e4e0..e39cab5 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 1 +Release: 3 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From 97e97a1ceac9ada22e81f29e4fa4fca3616af5fe470c9a34cc6d15da2912458e Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Sun, 3 Jul 2011 22:17:27 +0000 Subject: [PATCH 015/151] - leave Version lines intact (fix issue with multiple version lines in a package, for example in if-constructs) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=13 --- obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 6 ++++++ prepare_spec | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 06621a9..2ec3fea 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 4 00:16:05 CEST 2011 - ro@suse.de + +- leave Version lines intact (fix issue with multiple version + lines in a package, for example in if-constructs) + ------------------------------------------------------------------- Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e39cab5..c15aae5 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,6 +30,7 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %description This is a source service for openSUSE Build Service. @@ -43,17 +44,22 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . + %build + %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files + %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service + + %changelog diff --git a/prepare_spec b/prepare_spec index 01f1f11..4f3f699 100644 --- a/prepare_spec +++ b/prepare_spec @@ -450,7 +450,7 @@ sub read_and_parse_old_spec { $version{$current_package} = $_; $version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/; $replace_hash{"XXXVERSION $current_package"} = sprintf("%-16s%s","Version:",$version{$current_package}); - push @oldspec, "XXXVERSION $current_package"; + push @oldspec, $replace_hash{"XXXVERSION $current_package"}; push @oldspec, "XXXRELEASE $current_package"; next; } -- 2.51.1 From ea69473a76297f6195eb254c56e395f9c273981c00320e14158db28d7727f9d0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jul 2011 07:49:02 +0000 Subject: [PATCH 016/151] Updating link to change in openSUSE:Factory/obs-service-format_spec_file revision 6.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=4bbaf11c348d7e4a7498d7ee032fd78d --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index c15aae5..6d1c595 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 3 +Release: 5 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From b6f9ae8ea75b6111979d72af07f90d7043bf78a2b0472f80c676ae7ea134b1cd Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 4 Jul 2011 07:49:02 +0000 Subject: [PATCH 017/151] Autobuild autoformatter for 75216 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=6 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index c15aae5..6d1c595 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 3 +Release: 5 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From 412e33f359467a10676f540eae24fdf115dc96f7463ec0d3c0cbc069cfe950ca Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 4 Jul 2011 09:43:18 +0000 Subject: [PATCH 018/151] - fix empty line handling (multiple subsequent empty lines) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=15 --- obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 6 ++++++ prepare_spec | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2ec3fea..4117da9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de + +- fix empty line handling (multiple subsequent empty lines) + ------------------------------------------------------------------- Mon Jul 4 00:16:05 CEST 2011 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 6d1c595..9d5696d 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,6 +30,7 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %description This is a source service for openSUSE Build Service. @@ -43,17 +44,22 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . + %build + %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files + %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service + + %changelog diff --git a/prepare_spec b/prepare_spec index 4f3f699..37945ba 100644 --- a/prepare_spec +++ b/prepare_spec @@ -95,7 +95,7 @@ sub capitalize_case($) sub maybe_add_empty_line() { - push @oldspec, "" + push @oldspec, "XXXBLANKLINE" if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); } @@ -284,6 +284,7 @@ sub read_and_parse_old_spec { $args[1] =~ s/^\!//; $if_not = 1; } + $args[2] = "" unless $args[2]; if ( ($args[1] eq "0") || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) @@ -382,7 +383,7 @@ sub read_and_parse_old_spec { warn "changed to $current_section for $_\n" if $debug; } - push @oldspec, $_; + push @oldspec, "$_"; # multiline macros need an extra newline with old RPMs if (/^%(\w[\w\d]+).*[^\\]$/) { push @oldspec, "" if (defined($multiline_macros{$1})); -- 2.51.1 From daace2bbc54736894c27887d3b97d94c67960025742f6298dc2fff1804747d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Jul 2011 09:55:32 +0000 Subject: [PATCH 019/151] testing osc OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=16 --- obs-service-format_spec_file.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4117da9..f9ca6eb 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,6 +1,6 @@ ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de - + - fix empty line handling (multiple subsequent empty lines) ------------------------------------------------------------------- -- 2.51.1 From f6cdbca8c450f8a0343ce17922a0d08595e1c4d5316fdec98dadddc5a418d6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Jul 2011 09:56:57 +0000 Subject: [PATCH 020/151] testing osc OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=17 --- obs-service-format_spec_file.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index f9ca6eb..4117da9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,6 +1,6 @@ ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de - + - fix empty line handling (multiple subsequent empty lines) ------------------------------------------------------------------- -- 2.51.1 From f4a6dbf81478330fbe3689fde7656d4b8b8838bab97ae29cc8e6856232ab1a42 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jul 2011 10:31:38 +0000 Subject: [PATCH 021/151] Updating link to change in openSUSE:Factory/obs-service-format_spec_file revision 8.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=1daeaf33878ddc1d9843ee16ed819631 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 9d5696d..11ddf8f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 5 +Release: 7 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From bd5b80f58cf37995f397699b268227403dd67bf2be0eaa50000e677c31f48540 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 4 Jul 2011 10:31:38 +0000 Subject: [PATCH 022/151] Autobuild autoformatter for 75241 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=8 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 9d5696d..11ddf8f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 5 +Release: 7 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog -- 2.51.1 From 7057ea5ecbe721c3e8c10059e8fffec1f305b39721290a915a24ca2eeb5f2e8b Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 1 Aug 2011 15:30:16 +0000 Subject: [PATCH 023/151] - try to keep summary and group for cases like openldap2 (bnc#624980) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=19 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4117da9..0769b97 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de + +- try to keep summary and group for cases like openldap2 + (bnc#624980) + ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index 37945ba..d40c28b 100644 --- a/prepare_spec +++ b/prepare_spec @@ -391,14 +391,16 @@ sub read_and_parse_old_spec { next; } if ($current_section eq "header") { + my $c_pack = $current_package; + $c_pack .= "_disabled" if $ifhandler->{"disabled"}; if ( /^Summary\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXSUMMARY $current_package"} = sprintf("%-16s%s","Summary:", $1); - push @oldspec, "XXXSUMMARY $current_package"; + $replace_hash{"XXXSUMMARY $c_pack"} = sprintf("%-16s%s","Summary:", $1); + push @oldspec, "XXXSUMMARY $c_pack"; next; } if ( /^Group\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXGROUP $current_package"} = sprintf("%-16s%s", "Group:", $1); - push @oldspec, "XXXGROUP $current_package"; + $replace_hash{"XXXGROUP $c_pack"} = sprintf("%-16s%s", "Group:", $1); + push @oldspec, "XXXGROUP $c_pack"; next; } if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { -- 2.51.1 From a8821d6b256f61650dc1a447463d417bdeb1fa0186ba9b4b342853fedafc1db0 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 8 Aug 2011 14:06:29 +0000 Subject: [PATCH 024/151] - more work on disabled subpackages, port from internal prepare_spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=20 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 28 +++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0769b97..b05a8cd 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com + +- more work on disabled subpackages, port from internal + prepare_spec + ------------------------------------------------------------------- Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index d40c28b..4a93690 100644 --- a/prepare_spec +++ b/prepare_spec @@ -345,8 +345,10 @@ sub read_and_parse_old_spec { warn "after: $_\n"; } ($current_package, $current_lang) = set_current_pkg ( $_ ); - $disabled_packs->{$current_package} = 1 if $ifhandler->{"disabled"}; - warn "$current_package is disabled\n" if $ifhandler->{"disabled"} && $debug; + if ($ifhandler->{"disabled"}) { + $disabled_packs->{$current_package} = 1; + warn "$current_package is disabled\n" if $debug; + } next; } if ( /^%description\b/i ) { @@ -424,8 +426,8 @@ sub read_and_parse_old_spec { $_ =~ s/^[^:]+:/BuildArch:/; } if ( /^Release\s*:\s*(.*)/i ) { - $pkg_release{$current_package} = $_; - $replace_hash{"XXXRELEASE $current_package"} = sprintf("%-16s%s","Release:", $1); + $pkg_release{$c_pack} = $_; + $replace_hash{"XXXRELEASE $c_pack"} = sprintf("%-16s%s","Release:", $1); next; } if ( /^BuildRoot\s*:/i ) { @@ -433,13 +435,13 @@ sub read_and_parse_old_spec { next; } if ( /^Copyright\s*:\s*(.*)/i || /^License\s*:\s*(.*)/i ) { - $replace_hash{"XXXLICENSE $current_package"} = sprintf("%-16s%s","License:", $1); - push @oldspec, "XXXLICENSE $current_package"; + $replace_hash{"XXXLICENSE $c_pack"} = sprintf("%-16s%s","License:", $1); + push @oldspec, "XXXLICENSE $c_pack"; next; } if ( /^Url\s*:\s*(.*)/i ) { - $replace_hash{"XXXURL $current_package"} = sprintf("%-16s%s","Url:", $1); - push @oldspec, "XXXURL $current_package"; + $replace_hash{"XXXURL $c_pack"} = sprintf("%-16s%s","Url:", $1); + push @oldspec, "XXXURL $c_pack"; next; } if ( m/$global_tags_re\s*(.*)/oi ) { @@ -450,11 +452,11 @@ sub read_and_parse_old_spec { } if ( /^Version:/ ) { warn "found Version, section = $current_section\n" if $debug; - $version{$current_package} = $_; - $version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/; - $replace_hash{"XXXVERSION $current_package"} = sprintf("%-16s%s","Version:",$version{$current_package}); - push @oldspec, $replace_hash{"XXXVERSION $current_package"}; - push @oldspec, "XXXRELEASE $current_package"; + $version{$c_pack} = $_; + $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; + $replace_hash{"XXXVERSION $c_pack"} = sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, $replace_hash{"XXXVERSION $c_pack"}; + push @oldspec, "XXXRELEASE $c_pack"; next; } } -- 2.51.1 From 9e846d39a97ca7b1f842de2e1e2548883d26c6023d4e4eb902d25154a4e0183f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 9 Aug 2011 14:35:13 +0000 Subject: [PATCH 025/151] Updating link to change in openSUSE:Factory/obs-service-format_spec_file revision 10.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=a611a674eae0189e64a78c2fbcbe1d48 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 11ddf8f..5a26eea 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 7 +Release: 9 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec -- 2.51.1 From 7b25a0077d7d43b722af33fc4261b013267c7b964aebc1273b5dbdd2fd19d1d0 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 9 Aug 2011 14:35:13 +0000 Subject: [PATCH 026/151] Autobuild autoformatter for 78305 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=10 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 11ddf8f..5a26eea 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 7 +Release: 9 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec -- 2.51.1 From 7cf5e6a49fc467760193ed28be6bb9201b900b86f3c3ed5fa839d2b9cc4024fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Sep 2011 15:35:30 +0000 Subject: [PATCH 027/151] Accepting request 81272 from home:dirkmueller:branches:openSUSE:Tools - remove %%debug_package insertion OBS-URL: https://build.opensuse.org/request/show/81272 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=23 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 23 ----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index b05a8cd..a94cf35 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 7 13:34:45 CEST 2011 - dmueller@suse.de + +- remove %%debug_package insertion + ------------------------------------------------------------------- Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com diff --git a/prepare_spec b/prepare_spec index 4a93690..5c6517b 100644 --- a/prepare_spec +++ b/prepare_spec @@ -99,28 +99,6 @@ sub maybe_add_empty_line() if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); } -sub maybe_add_debug_package() -{ - if ( $ENV{'BUILD_DEBUG_FLAGS'} - && ( !$nosrc_result || $base_package =~ /^kernel/ || $base_package =~ /^java/ || $base_package =~ /^texlive-bin/ || $base_package =~ /^glibc/ ) - && !$nodebuginfo - && !$had_debug_package ) - { - my @spec_back; - while(1) { - my $line = pop @oldspec; - unshift @spec_back, $line; - next if ($line =~ /^\s*$/); - next if ($line =~ /^\s*%if\b/); - last; - } - # insert the %debug_package just before the first %if - push @oldspec, shift @spec_back; - push @oldspec, "%debug_package", @spec_back; - $had_debug_package = 1; - } -} - sub change_section($) { my ($new_section) = @_; @@ -331,7 +309,6 @@ sub read_and_parse_old_spec { } else { change_section("prep"); } - maybe_add_debug_package(); $_ =~ s/^(%\w+)/lc($1)/e; if ($debug) { warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); -- 2.51.1 From fd2fd1f76733953ab8313e8f53dd89345345b9cbcfd082c5233f52cd630dab6d Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 9 Sep 2011 10:23:17 +0000 Subject: [PATCH 028/151] Autobuild autoformatter for 81589 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=12 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5a26eea..b151eb7 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 9 +Release: 11 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec -- 2.51.1 From fce67a9036d78178e34eccec3c7abeddff6d299bdf2fea95979c33da9d892a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 1 Dec 2011 14:11:20 +0000 Subject: [PATCH 029/151] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=25 --- format_spec_file | 9 ++++++++- format_spec_file.service | 7 +++++-- obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/format_spec_file b/format_spec_file index e6da271..1554799 100644 --- a/format_spec_file +++ b/format_spec_file @@ -9,6 +9,10 @@ while test $# -gt 0; do MYOUTDIR="$2" shift ;; + *-specfile) + MYSPECFILES="$MYSPECFILES $2" + shift + ;; *) echo Unknown parameter $1. echo 'Usage: this service is not excepting parameters' @@ -19,7 +23,10 @@ while test $# -gt 0; do done RETURN=0 -for i in *.spec; do +if [ -z "$MYSPECFILES" ]; then + MYSPECFILES=`echo *.spec` +fi +for i in $MYSPECFILES; do if [ "$i" == '*.spec' ]; then echo "WARNING: no spec file found" exit 0 diff --git a/format_spec_file.service b/format_spec_file.service index 8b502ac..e6607d9 100644 --- a/format_spec_file.service +++ b/format_spec_file.service @@ -1,5 +1,8 @@ - - Validate sources + + Format the spec files The default SUSE source validator which catches common pitfalls before build. + + Just run on specified spec file instead all available + diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a94cf35..9b95e02 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 1 14:10:52 UTC 2011 - adrian@suse.de + +- allow to specify a defined spec file (version 0.2) + ------------------------------------------------------------------- Wed Sep 7 13:34:45 CEST 2011 - dmueller@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5a26eea..8616a34 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -21,8 +21,8 @@ Name: obs-service-format_spec_file License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. -Version: 0.1 -Release: 9 +Version: 0.2 +Release: 11 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec -- 2.51.1 From ad90477cb0330a7db8c12f6fdeaa66043911668fc4df575cf558a084730ac1fd Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 6 Dec 2011 08:55:21 +0000 Subject: [PATCH 030/151] - update from https://github.com/openSUSE/obs-service-format_spec_file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=26 --- obs-service-format_spec_file.changes | 5 + obs-service-format_spec_file.spec | 9 +- prepare_spec | 380 +++++++++++++++++++-------- 3 files changed, 279 insertions(+), 115 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 9b95e02..1aa0934 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 6 08:50:41 UTC 2011 - coolo@suse.com + +- update from https://github.com/openSUSE/obs-service-format_spec_file + ------------------------------------------------------------------- Thu Dec 1 14:10:52 UTC 2011 - adrian@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 8616a34..4463c72 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -16,13 +16,12 @@ # - Name: obs-service-format_spec_file -License: GPL v2 or later -Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. -Version: 0.2 -Release: 11 +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 0.3 +Release: 0 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec diff --git a/prepare_spec b/prepare_spec index 5c6517b..43615d0 100644 --- a/prepare_spec +++ b/prepare_spec @@ -15,21 +15,20 @@ use strict; my @oldspec = (); my @newspec = (); my $base_package = ""; -my $neededforbuild = ""; my $icecreamforbuild = ""; -my $norootforbuild = 0; my @copyrights = (); my $needsrootforbuild = 0; my $needsbinariesforbuild = 0; my $nodebuginfo = 0; -my %multiline_macros = (); +my $vim_modeline; my $nosrc_result = 0; my $current_section = "header"; my $had_debug_package = 0; my %pkg_version = (); -my %pkg_release = (); -my %please_replace = (); -my %replace_hash = (); +my $main_license; +my %seen_licenses = (); +my $main_group; +my %seen_groups = (); my $build_root = $ENV{'BUILD_ROOT'}; my $disabled_packs; my $ifhandler; @@ -51,6 +50,8 @@ my @global_tags_list = 'ExcludeArch', 'ExclusiveArch', 'Freshens', + 'Group', + 'Name', 'NoPatch', 'NoSource', 'Obsoletes', @@ -62,6 +63,7 @@ my @global_tags_list = 'Requires', 'Source\d*', 'Suggests', + 'Summary', 'Supplements', 'Url', ); @@ -93,10 +95,19 @@ sub capitalize_case($) return $tag; } +sub compare_arrays { + my ($first, $second) = @_; + return 0 unless @$first == @$second; + for (my $i = 0; $i < @$first; $i++) { + return 0 if $first->[$i] ne $second->[$i]; + } + return 1; +} + sub maybe_add_empty_line() { push @oldspec, "XXXBLANKLINE" - if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); + if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); } sub change_section($) @@ -109,6 +120,149 @@ sub change_section($) warn "section changed to $current_section\n" if $debug; } +sub replace_single_spdx($) +{ + my ($l) = @_; + + my %replace = ( + "lgplv2.1only" =>"LGPL-2.1", + "lgplv2.1orlater" => "LGPL-2.1+", + "lgplv2.1+" => "LGPL-2.1+", + "lgplv2.1" => "LGPL-2.1", + "lgplv2.0+" => "LGPL-2.0+", + "lgplv2.0" => "LGPL-2.0", + "lgplv2+" => "LGPL-2.1+", + + 'lgplv3' => "LGPL-3.0", + 'lgplv3+' => "LGPL-3.0+", + 'gnulgplv2.1orlater' => "LGPL-2.1+", + 'gnulgplv2.1' => "LGPL-2.1", + 'lgplv2.0orlater' => 'LGPL-2.0+', + 'lgplv2orlater' => 'LGPL-2.0+', + + "lgplv3only" => "LGPL-3.0", + "lgplv3orlater" => "LGPL-3.0+", + + "gpl" => "GPL-1.0", + "gpl+" => "GPL-1.0+", + "gplv2only" => "GPL-2.0", + "gplv2" => "GPL-2.0", + "gpl2" => "GPL-2.0", + "gplv2orlater" => "GPL-2.0+", + "gplv2.0orlater" => "GPL-2.0+", + "gplv2+" => "GPL-2.0+", + "gpl-2+" => "GPL-2.0+", + "gplv3only" => "GPL-3.0", + "gplv3orlater" => "GPL-3.0+", + "gplv3+" => "GPL-3.0+", + "gplv3" => "GPL-3.0", + "gpl-3+" => "GPL-3.0+", + "gnugplversion3" => "GPL-3.0", + + "fdl1.1" => "GFDL-1.1", + "gfdlv1.1" => "GFDL-1.1", + 'gnufreedocumentationlicense,version1.1(fdl1.1)' => "GFDL-1.1", + 'gnufreedocumentationlicense,version1.1(gfdl1.1)' => "GFDL-1.1", + "fdl1.2" => "GFDL-1.2", + "gfdl1.2" => "GFDL-1.2", + "gfdlv1.2" => "GFDL-1.2", + 'gnufreedocumentationlicense,version1.2(fdl1.2)' => "GFDL-1.2", + 'gnufreedocumentationlicense,version1.2(gfdl1.2)' => "GFDL-1.2", + "fdl1.3" => "GFDL-1.3", + + "bsd-2c" => "BSD-2-Clause", + "bsd3-clause" => "BSD-3-Clause", + "bsd3c" => "BSD-3-Clause", + "bsd3c(orsimilar)" => "BSD-3-Clause", + "bsd3-clause(orsimilar)" => "BSD-3-Clause", + + "bsd4c" => "BSD-4-Clause", + "bsd4c(orsimilar)" => "BSD-4-Clause", + + "x11/mit" => "MIT", + "X11mit" => "MIT", + "mitlicense(orsimilar)" => "MIT", + + "asl2.0" => "Apache-2.0", + 'apachelicense2.0' => "Apache-2.0", + 'apachelicense' => "Apache-2.0", + 'theapachesoftwarelicense' => "Apache-2.0", + "apachesoftwarelicense.." => "Apache-2.0", + 'apachesoftware license..' => "Apache-2.0", + 'aslv..' => "Apache-2.0", + 'aslv2' => "Apache-2.0", + + "artistic" => "Artistic-1.0", + "artistic2.0" => "Artistic-2.0", + + "thephplicense,version3.01" => "PHP-3.01", + "phplicense" => "PHP-3.01", + "mplv1.0" => "MPL-1.0", + "mplv1.1" => "MPL-1.1", + + "ibmpubliclicense.." => "IPL-1.0", + "ibmpl" => "IPL-1.0", + + "eclipsepubliclicense" => "EPL-1.0", + + "openldap2.8" => "OLDAP-2.8", + + "zliblicense" => "Zlib" + + ); + + my $tl = lc $l; + $tl =~ s, ,,g; + if (defined $replace{$tl}) { + $l = $replace{$tl}; + } else { + my @m = grep(lc($_) eq lc($l), values(%replace)); + if (@m) { + $l = $m[0]; + } else { + print STDERR "unknown license '$l'\n"; + } + } + return $l; +} + +sub replace_spdx_or($) +{ + my ($license) = @_; + + # special case as or later is common in our spec files + $license =~ s, or later, orlater,g; + + my @licenses = (); + for (split(/\s+or\s+/, $license)) { + push @licenses, replace_single_spdx($_); + } + + return join(' or ', sort(@licenses)); +} + +sub replace_spdx_and($) +{ + my ($license) = @_; + + my @licenses = (); + for (split(/\s*and\s*/, $license)) { + push @licenses, replace_spdx_or($_); + } + return join(' and ', sort(@licenses)); +} + +sub replace_spdx($) +{ + my ($license) = @_; + + my @licenses = (); + for (split(/\s*;\s*/, $license)) { + push @licenses, replace_spdx_and($_); + } + return join(' ; ', sort(@licenses)); +} + sub set_current_pkg { my ( $arg ) = @_; print "DEBUG: set_current_pkg receiving $arg\n" if $debug; @@ -148,15 +302,23 @@ sub read_and_parse_old_spec { while (@readspec) { $_ = shift @readspec; + if ( /^\s*$/ && $current_section ne "description") { + # stop preamble parsing on two blank lines + if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { + $print_comments = "true"; + push @oldspec, "XXXDOUBLELINE"; + next; + } push @oldspec, "XXXBLANKLINE"; next; } - - if ( /^#\s*norootforbuild\s*$/ ) { - $norootforbuild = 1; - next; + + if ( /^# vim:/ ) { + $vim_modeline = $_; + next; } + if ( /^#\s*needsrootforbuild\s*$/ ) { $needsrootforbuild = 1; next; @@ -165,6 +327,10 @@ sub read_and_parse_old_spec { $needsbinariesforbuild = 1; next; } + if ( /^#\s*norootforbuild/ ) { + next; + } + if ( /^#\s*nodebuginfo\s*$/ ) { $nodebuginfo = 1; next; @@ -175,6 +341,7 @@ sub read_and_parse_old_spec { next; } if ( /^#\s*Copyright\s*/ ) { + my $lastlineblank = 0; for (;;) { # check if line is ONLY a standard copyright line, if so, ignore. @@ -182,22 +349,11 @@ sub read_and_parse_old_spec { $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; push(@copyrights, $_) if length $c > 5; last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ - || grep { $readspec[0] =~ /^#\s*$_/ } ("norootforbuild","needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","neededforbuild","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); $_ = shift @readspec; } next; } - if ( /^#\s*neededforbuild/ ) { - $neededforbuild = $_; - $neededforbuild =~ s/^#\s*neededforbuild\s*//; - my (%aa) = (); - foreach my $x (split(' ',$neededforbuild)){ - $aa{$x}=1; - } - $neededforbuild = join(' ',sort keys (%aa)); - - next; - } # evil epoch removal next if ( /^Epoch:/ ); $_ =~ s/%{?epoch}?[:-]//g; @@ -213,7 +369,9 @@ sub read_and_parse_old_spec { # ignore line if it looks like a "usedforbuild" line, i.e. # if it contains too many base packages next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - push @oldspec, "BuildRequires: ".join(' ',sort keys(%aa)); + for my $br (sort keys(%aa)) { + push @oldspec, "BuildRequires: $br"; + } next; } next if ( /^#\s*usedforbuild/ ); @@ -229,6 +387,7 @@ sub read_and_parse_old_spec { push @oldspec, $_; next; } + if ( /^#/ && $current_section ne "description") { warn "$_ $current_section\n" if $debug; if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { @@ -236,6 +395,7 @@ sub read_and_parse_old_spec { } next; } + if ( /^%debug_package/ ) { # remove, we add this ourselves next; @@ -245,9 +405,7 @@ sub read_and_parse_old_spec { if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { next; } - if ( /^%define\s+(\w[\w\d]+).*\\$/ ) { - $multiline_macros{$1} = 1; - } + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { change_section("header") if ($current_section eq "description"); push @oldspec, $_; @@ -330,13 +488,7 @@ sub read_and_parse_old_spec { } if ( /^%description\b/i ) { change_section("description"); - $_ =~ s/^(%\w+)/lc($1)/e; push @oldspec, $_; - ($current_package, $current_lang) = set_current_pkg ( $_ ); - my $target = $current_package; - $target .= "_$current_lang" if $current_lang; - $target .= "_disabled" if $ifhandler->{"disabled"}; - push @oldspec, "XXXDESCRIPTION $target"; next; } if ( /^%install\b/i ) { @@ -363,64 +515,56 @@ sub read_and_parse_old_spec { } push @oldspec, "$_"; - # multiline macros need an extra newline with old RPMs - if (/^%(\w[\w\d]+).*[^\\]$/) { - push @oldspec, "" if (defined($multiline_macros{$1})); - } next; } + if ($current_section eq "header") { my $c_pack = $current_package; $c_pack .= "_disabled" if $ifhandler->{"disabled"}; - if ( /^Summary\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXSUMMARY $c_pack"} = sprintf("%-16s%s","Summary:", $1); - push @oldspec, "XXXSUMMARY $c_pack"; - next; - } - if ( /^Group\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXGROUP $c_pack"} = sprintf("%-16s%s", "Group:", $1); - push @oldspec, "XXXGROUP $c_pack"; - next; - } + if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { next; } - if ( /^Name\s*:\s*(.*)/i ) { - my $orig_name = $1; - my $changed_name = $orig_name; - $changed_name =~ s/\Q$_\E/$definelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$definelist})); - if ($changed_name eq $base_package) { - push @oldspec, sprintf("\n%-16s%s","Name:", $orig_name); - } else { - push @oldspec, sprintf("\n%-16s%s","Name:", $base_package); - } - $definelist->{"%name"} = $base_package if $ifhandler->{"disabled"} == 0; - $definelist->{"%{name}"} = $base_package if $ifhandler->{"disabled"} == 0; - warn ("line is $_, orig_name is $orig_name, base_package is $base_package\n") if $ifhandler->{"disabled"} == 0 && $debug; - next; + # remove default value of Autoreqprov + if ( /^Autoreqprov\s*:\s*(.*)/i ) { + next if ( lc($1) eq "on" || lc($1) eq "yes"); } + # reset Release + if ( /^Release\s*:\s*(.*)/i ) { + # will be after Version + next; + } + if ( /^Summary\s*:\s*(.*)\s*$/i ) { + push @oldspec, sprintf("%-16s%s", "Summary:", $1); + push @oldspec, "XXXPOSTSUMMARY $current_package"; + next; + } + + # remove license and print out after license later + if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { + my $license = replace_spdx($1); + $main_license = $license if (!$main_license); + $seen_licenses{$current_package} = $license; + next; + } + + # remove groups and print out after summary later + if ( /^Group\s*:\s*(.*)\s*$/i ) { + my $group = $1; + $main_group = $group if (!$main_group); + $seen_groups{$current_package} = $group; + next; + } + if ( /^BuildArchitectures\s*:/i ) { $_ =~ s/^[^:]+:/BuildArch:/; } - if ( /^Release\s*:\s*(.*)/i ) { - $pkg_release{$c_pack} = $_; - $replace_hash{"XXXRELEASE $c_pack"} = sprintf("%-16s%s","Release:", $1); - next; - } + if ( /^BuildRoot\s*:/i ) { push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; next; } - if ( /^Copyright\s*:\s*(.*)/i || /^License\s*:\s*(.*)/i ) { - $replace_hash{"XXXLICENSE $c_pack"} = sprintf("%-16s%s","License:", $1); - push @oldspec, "XXXLICENSE $c_pack"; - next; - } - if ( /^Url\s*:\s*(.*)/i ) { - $replace_hash{"XXXURL $c_pack"} = sprintf("%-16s%s","Url:", $1); - push @oldspec, "XXXURL $c_pack"; - next; - } + if ( m/$global_tags_re\s*(.*)/oi ) { my ($tag, $value) = ($1, $2); $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); @@ -431,24 +575,17 @@ sub read_and_parse_old_spec { warn "found Version, section = $current_section\n" if $debug; $version{$c_pack} = $_; $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; - $replace_hash{"XXXVERSION $c_pack"} = sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, $replace_hash{"XXXVERSION $c_pack"}; - push @oldspec, "XXXRELEASE $c_pack"; + push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, sprintf("%-16s%s","Release:", "0"); next; } } - if ( $current_section eq "description" ) { - my $target = $current_package; - $target .= "_$current_lang" if $current_lang; - $target .= "_disabled" if $ifhandler->{"disabled"}; - $replace_hash{"XXXDESCRIPTION $target"} .= "\n" if ( $replace_hash{"XXXDESCRIPTION $target"} ); - $replace_hash{"XXXDESCRIPTION $target"} .= $_; + if ( $current_section ne "changelog" ) { + push @oldspec, $_; next; } - if ( $current_section ne "description" && $current_section ne "changelog" ) { - push @oldspec, $_; - } } + } if ($ARGV[0] eq '--debug') { @@ -518,16 +655,40 @@ if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { read_and_parse_old_spec ( $specfile, $base_package ); -for (@oldspec) { - next unless /^XXX/; - $please_replace{$_} = 1; +my $linesmoved = 1; +while ($linesmoved) { + $linesmoved = 0; + my @firstlines = (); + my @buildrequires = (); + while ($oldspec[0]) { + my $l = shift @oldspec; + if ($l =~ m/^BuildRequires:/ ) { + push(@buildrequires, $l); + } else { + # if there are already buildrequires, we need to sort and exit + if (@buildrequires > 0) { + my @sortedbrs = sort(@buildrequires); + $linesmoved = !compare_arrays(\@buildrequires, \@sortedbrs); + @oldspec = (@firstlines, sort(@buildrequires), $l, @oldspec); + @firstlines = (); + @buildrequires = (); + last; + } else { + push(@firstlines, $l); + } + } + } + @oldspec = (@firstlines, @oldspec); } + my $thisyear = localtime->year() + 1900; unshift @copyrights, "# Copyright (c) $thisyear SUSE LINUX Products GmbH, Nuernberg, Germany."; my $copy_list = join("\n", @copyrights); + +print $vim_modeline . "\n" if (defined $vim_modeline); print < Date: Wed, 7 Dec 2011 08:27:18 +0000 Subject: [PATCH 031/151] - another update from git to replace way more licenses (0.4) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=27 --- format_spec_file.service | 2 +- licenses_changes.txt | 366 +++++++++++++++++ obs-service-format_spec_file.changes | 5 + obs-service-format_spec_file.spec | 9 +- patch_license | 564 +++++++++++++++++++++++++++ prepare_spec | 175 +++------ 6 files changed, 1003 insertions(+), 118 deletions(-) create mode 100644 licenses_changes.txt create mode 100644 patch_license diff --git a/format_spec_file.service b/format_spec_file.service index e6607d9..4379d57 100644 --- a/format_spec_file.service +++ b/format_spec_file.service @@ -1,6 +1,6 @@ Format the spec files - The default SUSE source validator which catches common pitfalls before build. + Formatting the spec files Just run on specified spec file instead all available diff --git a/licenses_changes.txt b/licenses_changes.txt new file mode 100644 index 0000000..7aeebb7 --- /dev/null +++ b/licenses_changes.txt @@ -0,0 +1,366 @@ +AAL AAL +AFL-2.1 Academic Free License 2.1 +AGPL-3.0 Affero GPL +AFL-2.1 AFL 2.1 +AFL-1.2 AFL-1.2 +AFL-2.0 AFL-2.0 +AFL-2.1 AFL-2.1 +AFL-3.0 AFL-3.0 +AGPL-3.0 AGPL-3.0 +AGPL-3.0 AGPLv3 +SUSE-AGPL-3.0+ AGPLv3+ +ANTLR-PD ANTLR-PD +Apache-1.1 Apache 1.1 (Indiana University) +Apache-2.0 Apache 2.0 +Apache-2.0 Apache License +Apache-2.0 Apache License 2.0 +Apache-2.0 Apache License, Version 2.0 +Apache-2.0 Apache Software License .. +Apache-2.0 Apache Software License +Apache-2.0 Apache v2.0 +Apache-1.0 Apache-1.0 +Apache-1.1 Apache-1.1 +Apache-2.0 Apache-2.0 +APL-1.0 APL-1.0 +APL-1.0 APL-1.0 (spdx.org/licenses) +APSL-1.0 APSL-1.0 +APSL-1.1 APSL-1.1 +APSL-1.2 APSL-1.2 +APSL-2.0 APSL-2.0 +Artistic-1.0 Artistic +Artistic-1.0 Artistic 1.0 +Artistic-2.0 Artistic 2.0 +Artistic-1.0 Artistic license +Artistic-1.0 Artistic License +Artistic-1.0 Artistic License .. +Artistic-1.0 Artistic-1.0 +SUSE-Artistic-1.0+ Artistic-1.0+ +Artistic-2.0 Artistic-2.0 +Apache-1.1 ASL 1.1 +Apache-2.0 ASL 2.0 +Apache-2.0 ASL2 +Apache-2.0 ASLv.. +Apache-2.0 ASLv2 +Apache-2.0 ASLv2.0 +SUSE-Apache-2.0+ ASLv2.0+ +BSD-3-Clause BSD (3-Clause) +BSD-2-Clause BSD 2 clause +BSD-2-Clause BSD 2 Clause +BSD-2-Clause BSD 2-clause +BSD-2-Clause BSD 2-Clause +BSD-3-Clause BSD 3-Clause +BSD-3-Clause BSD 3-clause (or similar) +BSD-2-Clause BSD-2-Clause +BSD-2-Clause BSD-2c +BSD-3-Clause BSD-3 +BSD-3-Clause BSD-3-Clause +BSD-3-Clause BSD-3-clause (or similar) +BSD-4-Clause BSD-4-Clause +BSD-2-Clause BSD2c +BSD-3-Clause BSD3 +BSD-3-Clause BSD3c +BSD-3-Clause BSD3c (or similar) +BSD-3-Clause BSD3c(or similar) +BSD-4-Clause BSD4c +BSD-4-Clause BSD4c(or similar) +BSL-1.0 BSL-1.0 +CATOSL-1.1 CATOSL-1.1 +CC-BY-SA-3.0 CC BY-SA 3.0 +CC-BY-SA-2.5 CC by-sa V2.5 +CC-BY-SA-3.0 CC BY-SA V3.0 +CC-BY-1.0 CC-BY-1.0 +CC-BY-2.0 CC-BY-2.0 +CC-BY-2.5 CC-BY-2.5 +CC-BY-3.0 CC-BY-3.0 +CC-BY-NC-1.0 CC-BY-NC-1.0 +CC-BY-NC-2.0 CC-BY-NC-2.0 +CC-BY-NC-2.5 CC-BY-NC-2.5 +CC-BY-NC-3.0 CC-BY-NC-3.0 +CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 +CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 +CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 +CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 +CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 +CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 +CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 +CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 +CC-BY-ND-1.0 CC-BY-ND-1.0 +CC-BY-ND-2.0 CC-BY-ND-2.0 +CC-BY-ND-2.5 CC-BY-ND-2.5 +CC-BY-ND-3.0 CC-BY-ND-3.0 +CC-BY-SA-1.0 CC-BY-SA-1.0 +CC-BY-SA-2.0 CC-BY-SA-2.0 +CC-BY-SA-2.5 CC-BY-SA-2.5 +CC-BY-SA-3.0 CC-BY-SA-3.0 +CC0-1.0 CC0-1.0 +CDDL-1.0 CDDL +CDDL-1.0 CDDL 1.0 +CDDL-1.0 CDDL-1.0 +CDDL-1.0 or LGPL-2.1 CDDLv1.0 | LGPLv2.1 +CECILL-1.0 CECILL-1.0 +CECILL-1.1English CECILL-1.1English +CECILL-2.0 CECILL-2.0 +CECILL-B CECILL-B +CECILL-C CECILL-C +ClArtistic ClArtistic +CPL-1.0 Common Public License - v 1.0 +CPL-1.0 Common Public License v1.0 +CPL-1.0 Common Public License v1.0 (CPL) +CPL-1.0 Common Public License Version 1.0 +CPL-1.0 Common Public License Version 1.0 (CPL1.0) +CPAL-1.0 CPAL-1.0 +CPL-1.0 CPL (Common Public License) v1 +CPL-1.0 CPL 1.0 +CPL-1.0 CPL 1.0 ... +CPL-1.0 CPL-1.0 +CUA-OPL-1.0 CUA-OPL-1.0 +ECL-1.0 ECL-1.0 +ECL-2.0 ECL-2.0 +EPL-1.0 Eclipse Public License +EPL-1.0 Eclipse-1.0 +EPL-1.0 Eclipse Public License 1.0 +eCos-2.0 eCos-2.0 +EFL-1.0 EFL-1.0 +EFL-2.0 EFL-2.0 +Entessa Entessa +EPL-1.0 EPL +EPL-1.0 EPL 1.0 +EPL-1.0 EPL 1.0 ... +EPL-1.0 EPL v1.0 +EPL-1.0 EPL-1 +EPL-1.0 EPL-1.0 +ErlPL-1.1 Erlang Public License +ErlPL-1.1 ErlPL-1.1 +EUDatagrid EUDatagrid +EUPL-1.0 EUPL-1.0 +EUPL-1.1 EUPL-1.1 +MIT Expat +MIT Expat License +Fair Fair +SUSE-GFDL-1.1 FDL v1.1 or later +SUSE-GFDL-1.2+ FDL-1.2+ +SUSE-GFDL-1.3+ FDL-1.3+ +SUSE-GFDL-1.2+ FDLv1.2+ +Frameworx-1.0 Frameworx-1.0 +SUSE-Freeware Freeware +SUSE-Freeware Freeware license +GFDL-1.1 GFDL 1.1 +GFDL-1.2 GFDL 1.2 +GFDL-1.1 GFDL v1.1 +GFDL-1.2 GFDL v1.2 +GFDL-1.1 GFDL-1.1 +GFDL-1.2 GFDL-1.2 +GFDL-1.3 GFDL-1.3 +GFDL-1.1 GFDLv1.1 +GFDL-1.2 GFDLv1.2 +SUSE-GFDL-1.2+ GFDLv1.2+ +GPL-2.0 GLPv2 +GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) +GPL-2.0 GNU General Public License (GPL) v2 +GPL-2.0 GNU General Public License version 2 (GPL v2) +GPL-2.0+ GNU General Public License version 2 or later +GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) +GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) +GPL-3.0 GNU General Public License version 3 (GPLv3) +GPL-2.0 GNU GPL v2 +GPL-3.0+ GNU GPL v3 or later +GPL-3.0 GNU GPL version 3 +LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 +LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) +LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) +LGPL-2.1+ GNU LGPL v2.1 or later +LGPL-2.1 GNU LGPLv2.1 +GPL-2.0 GPL 2.0 +GPL-3.0 GPL 3 +GPL-2.0 GPL v2 +GPL-2.0 GPL v2 only +GPL-2.0+ GPL v2 or later +GPL-2.0+ GPL v2 or later +GPL-2.0 GPL v2.0 +GPL-2.0+ GPL v2.0 or later +GPL-2.0+ GPL v2+ +GPL-3.0 GPL v3 +GPL-3.0 GPL v3 only +GPL-3.0+ GPL v3 or later +GPL-1.0 GPL-1.0 +GPL-1.0+ GPL-1.0+ +GPL-2.0 GPL-2 +GPL-2.0 GPL-2.0 +GPL-2.0; GPL-2.0+ GPL-2.0 GPL-2.0+ +GPL-2.0+ GPL-2.0 or later +GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception +GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception +GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception +GPL-2.0-with-font-exception GPL-2.0-with-font-exception +GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception +GPL-2.0; GPL-2.0+ GPL-2.0, GPL-2.0+ +GPL-2.0+ GPL-2.0+ +Apache-2.0; GPL-2.0+ GPL-2.0+, Apache-2.0 +GPL-2.0+; LGPL-2.0+ GPL-2.0+,LGPL-2.0+ +GPL-2.0 GPL-2.Ã0 +GPL-2.0+ GPL-2+ +GPL-3.0 GPL-3 +GPL-3.0 GPL-3.0 +GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception +GPL-3.0; GPL-2.0+ GPL-3.0, GPL-2.0+ +GPL-3.0+ GPL-3.0+ +GPL-3.0+ GPL-3+ +GPL-1.0+ GPL+ +GPL-2.0 GPL2 +GPL-2.0+ GPL2+ +GPL-3.0 GPL3 +GPL-1.0+ GPLv1+ +GPL-2.0 GPLv2 +GPL-2.0 or GPL-3.0 GPLv2 || GPLv3 +GPL-2.0+ GPLv2 or later +GPL-2.0+ GPLv2+ +GPL-3.0 GPLv3 +GPL-3.0+ GPLv3+ +gSOAP-1.3b gSOAP-1.3b +HPND HPND +IPL-1.0 IBM PL +IPL-1.0 IBM Public License +IPL-1.0 IBM Public License .. +IPA IPA +IPL-1.0 IPL-1.0 +ISC ISC +ISC ISC License +LGPL-2.1 LGPL 2.1 +LGPL-2.0 LGPL v2 +LGPL-2.0+ LGPL v2 or later +LGPL-2.0 LGPL v2.0 only +LGPL-2.0+ LGPL v2.0 or later +LGPL-2.1 LGPL v2.1 +LGPL-2.1 LGPL v2.1 only +LGPL-2.1+ LGPL v2.1 or later +LGPL-2.1+ LGPL v2.1+ +LGPL-2.1+ LGPL v2+ +LGPL-2.1+ LGPL V2+ +LGPL-3.0+ LGPL v3 or later +LGPL-2.0 LGPL-2.0 +LGPL-2.1+ LGPL-2.0.1 or later +LGPL-2.0+ LGPL-2.0+ +LGPL-2.1 LGPL-2.1 +LGPL-2.1+ LGPL-2.1+ +LGPL-3.0 LGPL-3.0 +LGPL-3.0+ LGPL-3.0+ +LGPL-2.1 LGPL2.1 +LGPL-2.0 LGPLv2 +LGPL-2.0 LGPLv2.0 +LGPL-2.0+ LGPLv2.0+ +LGPL-2.1 LGPLv2.1 +LGPL-2.1+ LGPLv2.1+ +LGPL-2.1+ LGPLv2+ +LGPL-3.0 LGPLv3 +LGPL-3.0+ LGPLv3+ +GPL-2.0+ libGeoIPUpdate is GPLv2 or later +Libpng Libpng +LPL-1.02 LPL-1.02 +LPPL-1.3c LPPL .. +LPPL-1.0 LPPL-1.0 +LPPL-1.1 LPPL-1.1 +LPPL-1.2 LPPL-1.2 +LPPL-1.3c LPPL-1.3c +MirOS MirOS +MIT MIT +MIT MIT licence +MIT MIT license +MIT MIT License +MIT MIT License (or similar) +MIT MIT-Licence +MIT MIT/X Consortium License +MIT MIT/X License +MIT MIT/X11 +Motosoto Motosoto +MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) +MPL-1.1 Mozilla Public License 1.1 +SUSE-MPL-1.1+ MPL 1.1 or later +MPL-1.0 MPL-1.0 +MPL-1.1 MPL-1.1 +MPL-1.0 MPLv1.0 +MPL-1.1 MPLv1.1 +MPL-1.1 MPLv1.1 .. +SUSE-MPL-1.1+ MPLv1.1+ +MS-PL Ms-Pl +MS-PL MS-PL +MS-RL MS-RL +Multics Multics +SPDX Name in Spec File +NASA-1.3 NASA-1.3 +Naumen Naumen +NCSA NCSA +NGPL NGPL +Nokia Nokia +NPOSL-3.0 NPOSL-3.0 +NTP NTP +OCLC-2.0 OCLC-2.0 +ODbL-1.0 ODbL-1.0 +OFL-1.1 OFL +OFL-1.1 OFL-1.1 +OGTSL OGTSL +OLDAP-2.8 OLDAP-2.8 +OFL-1.1 Open Font License +OLDAP-2.8 openldap 2.8 +OpenSSL OpenSSL +OSL-1.0 OSL-1.0 +OSL-2.0 OSL-2.0 +OSL-3.0 OSL-3.0 +PDDL-1.0 PDDL-1.0 +Artistic-1.0 or GPL-1.0+ Perl License +PHP-3.0.1 PHP License +PostgreSQL PostgreSQL +SUSE-Public-Domain Public domain +SUSE-Public-Domain Public Domain +SUSE-Public-Domain Public Domain, Freeware +SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +Python-2.0 Python +Python-2.0 Python .. +Python-2.0 Python Copyright +Python-2.0 Python License .. +Python-2.0 Python Software Foundation License +Python-2.0 Python-2.0 +QPL-1.0 QPL +QPL-1.0 QPL .. +QPL-1.0 QPL-1.0 +RHeCos-1.1 RHeCos-1.1 +RPL-1.5 RPL-1.5 +RPSL-1.0 RPSL-1.0 +RSCPL RSCPL +Ruby Ruby +SAX-PD SAX-PD +IPA see IPA_Font_License_Agreement_v1.0.txt +OFL-1.1 SIL Open Font License +OFL-1.1 SIL Open Font License 1.1 +SimPL-2.0 SimPL-2.0 +Sleepycat Sleepycat +SPL-1.0 SPL-1.0 +SugarCRM-1.1.3 SugarCRM-1.1.3 +LPPL-1.3c TeX-License .. +Apache-2.0 The Apache Software License +PHP-3.0.1 The PHP License, version 3.01 +VSL-1.0 VSL-1.0 +W3C W3C +W3C W3C Software License +Watcom-1.0 Watcom-1.0 +WXwindows WXwindows +MIT X11 +MIT X11 (BSD like) +MIT X11 MIT +MIT X11/MIT +XFree86-1.1 XFree86-1.1 +Xnet Xnet +YPL-1.1 YPL-1.1 +Zimbra-1.3 Zimbra-1.3 +Zlib Zlib +Zlib zlib +Zlib Zlib License +Zlib zlib/libpng License +ZPL-2.0 Zope Public License +ZPL-2.0 ZPL +ZPL-2.1 ZPL 2.1 +ZPL-1.1 ZPL-1.1 +ZPL-2.0 ZPL-2.0 +ZPL-2.1 ZPL-2.1 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 1aa0934..3e8307b 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 7 08:22:29 UTC 2011 - coolo@suse.com + +- another update from git to replace way more licenses (0.4) + ------------------------------------------------------------------- Tue Dec 6 08:50:41 UTC 2011 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 4463c72..3e352a1 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,14 +17,16 @@ Name: obs-service-format_spec_file -Summary: An OBS source service: reformats a spec file to SUSE standard. +Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.3 +Version: 0.4 Release: 0 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec +Source3: patch_license +Source4: licenses_changes.txt Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -48,7 +50,8 @@ spec file instead of creating a new one. mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files %files %defattr(-,root,root) diff --git a/patch_license b/patch_license new file mode 100644 index 0000000..6cdb58a --- /dev/null +++ b/patch_license @@ -0,0 +1,564 @@ +#! /usr/bin/perl -w +# +# vim:sw=2:et +# + +BEGIN { + unshift @INC, "."; + unshift @INC, "/usr/lib/build/"; +} + +use Time::localtime; +use Data::Dumper; +use strict; + +my @oldspec = (); +my @newspec = (); +my $base_package = ""; +my $icecreamforbuild = ""; +my @copyrights = (); +my $needsrootforbuild = 0; +my $needsbinariesforbuild = 0; +my $nodebuginfo = 0; +my $vim_modeline; +my $nosrc_result = 0; +my $current_section = "header"; +my $had_debug_package = 0; +my %pkg_version = (); +my $main_license; +my %seen_licenses = (); +my $main_group; +my %seen_groups = (); +my $build_root = $ENV{'BUILD_ROOT'}; +my $disabled_packs; +my $ifhandler; +my $definelist; +my $debug = 0; + +my @global_tags_list = +( + 'Autoreq', + 'Autoreqprov', + 'BuildArch', + 'BuildArchitectures', + 'BuildRequires', + 'Conflicts', + 'DocDir', + 'Enhances', + 'Enhances', + 'EssentialFor', + 'ExcludeArch', + 'ExclusiveArch', + 'Freshens', + 'Group', + 'Name', + 'NoPatch', + 'NoSource', + 'Obsoletes', + 'Patch\d*', + 'Prefix', + 'PreReq', + 'Provides', + 'Recommends', + 'Requires', + 'Source\d*', + 'Suggests', + 'Summary', + 'Supplements', + 'Url', +); + +my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; + +my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . + 'description|files|triggerin|triggerun|triggerpostun)\b'; + +sub unify { + my %h = map {$_ => 1} @_; + return grep(delete($h{$_}), @_); +} + +sub capitalize_case($) +{ + my ($tag) = @_; + + $tag = lc($tag); + + $tag =~ s/docdir/DocDir/i; + $tag =~ s/arch/Arch/i; + $tag =~ s/patch/Patch/i; + $tag =~ s/source/Source/i; + $tag =~ s/req/Req/i; + $tag =~ s/prov/Prov/i; + $tag =~ s/^(\w)/uc($1)/e; + + return $tag; +} + +sub compare_arrays { + my ($first, $second) = @_; + return 0 unless @$first == @$second; + for (my $i = 0; $i < @$first; $i++) { + return 0 if $first->[$i] ne $second->[$i]; + } + return 1; +} + +sub maybe_add_empty_line() +{ + push @oldspec, "XXXBLANKLINE" + if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); +} + +sub change_section($) +{ + my ($new_section) = @_; + + maybe_add_empty_line(); + + $current_section = $new_section; + warn "section changed to $current_section\n" if $debug; +} + +my %license_replace = (); +use File::Basename; + +sub load_license_map() +{ + return if defined $license_replace{"GPL-2.0"}; + my $scriptdir = File::Basename::dirname($0); + open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; + # ignore header + readline(*MAP); + my %spdx; + while () { + chomp; + my ($license, $oldstring) = split(/\t/, $_, 2); + #$license =~ s,\s*$,,; + #$oldstring =~ s,\s*$,,; + next unless length($license); + #print STDERR "$license\t$oldstring\n"; + die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; + $license_replace{$oldstring} = $license; + $spdx{$license} = 1; + } + close(MAP); + for (keys %spdx) { + $license_replace{$_} = $_; + } +} + +sub replace_single_spdx($) +{ + my ($l) = @_; + + return '' if $l eq ''; + + load_license_map(); + $l =~ s,ORlater,or later,g; + $l =~ s,ORsim,or similar,g; + $l =~ s,^\s+,,; + $l =~ s,\s+$,,; + + if (defined $license_replace{$l}) { + $l = $license_replace{$l}; + } else { + print STDERR "Unknown license '$l'\n"; + exit(1); + } + return $l; +} + +sub replace_spdx_and($); +sub replace_spdx_and($) +{ + my ($license) = @_; + + # special case as or later is common in our spec files + $license =~ s,or later,ORlater,g; + $license =~ s,or similar,ORsim,g; + + #print STDERR "ORIG '$license'\n"; + my @licenses = (); + if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { + my ($head, $paren, $tail) = ($1, $2, $3); + if ($paren =~ /and|or/) { + $head = replace_spdx_and($head); + $tail = replace_spdx_and($tail); + $paren = replace_spdx_and($paren); + #print STDERR "AFTE '$head($paren)$tail'\n"; + return "$head($paren)$tail"; + } + } + + for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + s/\s+/ /g; + push @licenses, $_; + } + #print STDERR "AFTE '" . join('', @licenses) . "'\n"; + return join('', @licenses); +} + +sub replace_spdx($) +{ + my ($license) = @_; + + my @licenses = (); + for (split(/\s*;\s*/, $license)) { + push @licenses, replace_spdx_and($_); + } + return join(' ; ', @licenses); +} + +sub set_current_pkg { + my ( $arg ) = @_; + print "DEBUG: set_current_pkg receiving $arg\n" if $debug; + my ( @argarray ) = split ( '\s+' , $arg ); + my $curpack = $base_package; + my $curlang = ""; + while (my $carg = shift @argarray) { + next if ($carg eq "%description" || $carg eq "%package" || $carg eq "%prep"); + if ($carg eq "-l") { + $curlang = shift @argarray; + } elsif ($carg eq "-n") { + $curpack = shift @argarray; + } else { + $curpack = "$base_package-" if $base_package; + $curpack .= $carg; + } + } + print "DEBUG: set_current_pkg returning $curpack, $curlang\n" if $debug; + return ($curpack, $curlang); +} + +sub read_and_parse_old_spec { + my ( $specfile, $base_package ) = @_; + my $current_package = $base_package; + my $current_lang = ""; + my $check_printed = "false"; + my $print_comments = "false"; + my %version; + my $ifhandler; + $ifhandler->{"disabled"} = 0; + + my @readspec; + open ( SPEC , "$specfile" ) || die "can't read specfile"; + @readspec = ; + close SPEC; + chomp @readspec; + + while (@readspec) { + $_ = shift @readspec; + + if ( /^\s*$/ && $current_section ne "description") { + # stop preamble parsing on two blank lines + if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { + $print_comments = "true"; + push @oldspec, "XXXDOUBLELINE"; + next; + } + push @oldspec, "XXXBLANKLINE"; + next; + } + + if ( /^# vim:/ ) { + $vim_modeline = $_; + next; + } + + if ( /^#\s*needsrootforbuild\s*$/ ) { + $needsrootforbuild = 1; + next; + } + if ( /^#\s*needsbinariesforbuild\s*$/ ) { + $needsbinariesforbuild = 1; + next; + } + if ( /^#\s*norootforbuild/ ) { + next; + } + + if ( /^#\s*nodebuginfo\s*$/ ) { + $nodebuginfo = 1; + next; + } + if ( /^#\s*icecream/ ) { + $icecreamforbuild = $_; + $icecreamforbuild =~ s/^#\s*icecream\s*//; + next; + } + if ( /^#\s*Copyright\s*/ ) { + my $lastlineblank = 0; + for (;;) + { + # check if line is ONLY a standard copyright line, if so, ignore. + my $c = $_; + $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; + push(@copyrights, $_) if length $c > 5; + last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ + || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + $_ = shift @readspec; + } + next; + } + # evil epoch removal + next if ( /^Epoch:/ ); + $_ =~ s/%{?epoch}?[:-]//g; + $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); + + if ( /^BuildRequires:/ ) { + my $cur_buildreq = $_; + $cur_buildreq =~ s/^BuildRequires:\s*//; + my %aa; + while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + $aa{$1}=1; + } + # ignore line if it looks like a "usedforbuild" line, i.e. + # if it contains too many base packages + next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; + for my $br (sort keys(%aa)) { + push @oldspec, "BuildRequires: $br"; + } + next; + } + next if ( /^#\s*usedforbuild/ ); + if ( /^%\?__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!BuildIgnore:/ ) { + push @oldspec, $_; + next; + } + + if ( /^#/ && $current_section ne "description") { + warn "$_ $current_section\n" if $debug; + if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { + push @oldspec, $_; + } + next; + } + + if ( /^%debug_package/ ) { + # remove, we add this ourselves + next; + } + $print_comments = "true" unless /^#/; + + if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { + next; + } + + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { + change_section("header") if ($current_section eq "description"); + push @oldspec, $_; + if ( /^\s*%if\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 1; + $ifhandler->{"depth"}++; + my $if_not = 0; + if ( $args[1] =~ /^\!/ ) { + $args[1] =~ s/^\!//; + $if_not = 1; + } + $args[2] = "" unless $args[2]; + if ( ($args[1] eq "0") + || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) + || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) + || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") + || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { + $ifhandler->{"disabled"} = $ifhandler->{"depth"}; + $ifhandler->{"last_if_disabled"} = 1; + } + } elsif ( /^\s*%if/ ) { + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 0; + $ifhandler->{"depth"}++; + } elsif ( /^\s*%endif/ ) { + $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; + $ifhandler->{"depth"}--; + } elsif ( /^\s*%else/ ) { + if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { + $ifhandler->{"disabled"} = 0; + } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { + $ifhandler->{"disabled"} = 1; + } + } elsif ( /^\s*%define\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); + if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { + $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + } + while ($_ =~ /\\$/) { + $_ = shift @readspec; + push @oldspec, $_; + } + } + next; + } + if ( /^%package\b/i or /^%prep\b/i ) { + if (/^%package\b/i) { + change_section("header"); + } else { + change_section("prep"); + } + $_ =~ s/^(%\w+)/lc($1)/e; + if ($debug) { + warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); + } + push @oldspec, $_; + for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { + $_ =~ s/\Q$xx\E/$definelist->{$xx}/; + } + $_ =~ s/%{\?[^\}]*}//; + if ($debug) { + warn "after: $_\n"; + } + ($current_package, $current_lang) = set_current_pkg ( $_ ); + if ($ifhandler->{"disabled"}) { + $disabled_packs->{$current_package} = 1; + warn "$current_package is disabled\n" if $debug; + } + next; + } + if ( /^%description\b/i ) { + change_section("description"); + push @oldspec, $_; + next; + } + if ( /^%install\b/i ) { + change_section("install"); + push @oldspec, $_; + next; + } + if ( /^%changelog\b/i ) { + change_section("changelog"); + # changelog comes always from *.changes. Skip what is in spec file + # at the moment. + next; + } + if (/^%files\b/i) { + change_section("files"); + $current_section = "files"; + } + if ( /^%/ ) { + if ( m/$section_tags_re/oi ) { + $_ =~ s/^(%\w+)/lc($1)/e; + change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); + change_section("build") if m/\s*%build/i; + warn "changed to $current_section for $_\n" if $debug; + } + + push @oldspec, "$_"; + next; + } + + if ($current_section eq "header") { + my $c_pack = $current_package; + $c_pack .= "_disabled" if $ifhandler->{"disabled"}; + + if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { + next; + } + # remove default value of Autoreqprov + if ( /^Autoreqprov\s*:\s*(.*)/i ) { + next if ( lc($1) eq "on" || lc($1) eq "yes"); + } + # reset Release + if ( /^Release\s*:\s*(.*)/i ) { + # will be after Version + next; + } + if ( /^Summary\s*:\s*(.*)\s*$/i ) { + push @oldspec, sprintf("%-16s%s", "Summary:", $1); + push @oldspec, "XXXPOSTSUMMARY $current_package"; + next; + } + + # remove license and print out after license later + if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { + my $license = replace_spdx($1); + $main_license = $license if (!$main_license); + $seen_licenses{$current_package} = $license; + next; + } + + # remove groups and print out after summary later + if ( /^Group\s*:\s*(.*)\s*$/i ) { + my $group = $1; + $main_group = $group if (!$main_group); + $seen_groups{$current_package} = $group; + next; + } + + if ( /^BuildArchitectures\s*:/i ) { + $_ =~ s/^[^:]+:/BuildArch:/; + } + + if ( /^BuildRoot\s*:/i ) { + push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; + next; + } + + if ( m/$global_tags_re\s*(.*)/oi ) { + my ($tag, $value) = ($1, $2); + $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); + push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); + next; + } + if ( /^Version:/ ) { + warn "found Version, section = $current_section\n" if $debug; + $version{$c_pack} = $_; + $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; + push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, sprintf("%-16s%s","Release:", "0"); + next; + } + } + if ( $current_section ne "changelog" ) { + push @oldspec, $_; + next; + } + } + +} + +my $specfile = shift ( @ARGV ); +if ( ! stat($specfile) ) { + die "$specfile is no file"; +} + + +my @specpath = split ('/' ,$specfile); +my $specbase = pop @specpath; +my $specdir = join ('/', @specpath); + +if ( $specdir eq "" ) { + $specdir = "."; +} +my $xdefinelist; +my $seen_name = 0; +open ( SPE , "$specfile" ); +while ( ) { + chomp; + + if ( m/^License\s*:\s*(.*)\s*$/ ) { + printf("%-16s%s\n","License:", replace_spdx($1)); + } else { + print "$_\n"; + } +} + diff --git a/prepare_spec b/prepare_spec index 43615d0..c954a9d 100644 --- a/prepare_spec +++ b/prepare_spec @@ -120,136 +120,83 @@ sub change_section($) warn "section changed to $current_section\n" if $debug; } +my %license_replace = (); +use File::Basename; + +sub load_license_map() +{ + return if defined $license_replace{"GPL-2.0"}; + my $scriptdir = File::Basename::dirname($0); + open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; + # ignore header + readline(*MAP); + my %spdx; + while () { + chomp; + my ($license, $oldstring) = split(/\t/, $_, 2); + #$license =~ s,\s*$,,; + #$oldstring =~ s,\s*$,,; + next unless length($license); + #print STDERR "$license\t$oldstring\n"; + die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; + $license_replace{$oldstring} = $license; + $spdx{$license} = 1; + } + close(MAP); + for (keys %spdx) { + $license_replace{$_} = $_; + } +} + sub replace_single_spdx($) { my ($l) = @_; - my %replace = ( - "lgplv2.1only" =>"LGPL-2.1", - "lgplv2.1orlater" => "LGPL-2.1+", - "lgplv2.1+" => "LGPL-2.1+", - "lgplv2.1" => "LGPL-2.1", - "lgplv2.0+" => "LGPL-2.0+", - "lgplv2.0" => "LGPL-2.0", - "lgplv2+" => "LGPL-2.1+", + return '' if $l eq ''; - 'lgplv3' => "LGPL-3.0", - 'lgplv3+' => "LGPL-3.0+", - 'gnulgplv2.1orlater' => "LGPL-2.1+", - 'gnulgplv2.1' => "LGPL-2.1", - 'lgplv2.0orlater' => 'LGPL-2.0+', - 'lgplv2orlater' => 'LGPL-2.0+', + load_license_map(); + $l =~ s,ORlater,or later,g; + $l =~ s,ORsim,or similar,g; + $l =~ s,^\s+,,; + $l =~ s,\s+$,,; - "lgplv3only" => "LGPL-3.0", - "lgplv3orlater" => "LGPL-3.0+", - - "gpl" => "GPL-1.0", - "gpl+" => "GPL-1.0+", - "gplv2only" => "GPL-2.0", - "gplv2" => "GPL-2.0", - "gpl2" => "GPL-2.0", - "gplv2orlater" => "GPL-2.0+", - "gplv2.0orlater" => "GPL-2.0+", - "gplv2+" => "GPL-2.0+", - "gpl-2+" => "GPL-2.0+", - "gplv3only" => "GPL-3.0", - "gplv3orlater" => "GPL-3.0+", - "gplv3+" => "GPL-3.0+", - "gplv3" => "GPL-3.0", - "gpl-3+" => "GPL-3.0+", - "gnugplversion3" => "GPL-3.0", - - "fdl1.1" => "GFDL-1.1", - "gfdlv1.1" => "GFDL-1.1", - 'gnufreedocumentationlicense,version1.1(fdl1.1)' => "GFDL-1.1", - 'gnufreedocumentationlicense,version1.1(gfdl1.1)' => "GFDL-1.1", - "fdl1.2" => "GFDL-1.2", - "gfdl1.2" => "GFDL-1.2", - "gfdlv1.2" => "GFDL-1.2", - 'gnufreedocumentationlicense,version1.2(fdl1.2)' => "GFDL-1.2", - 'gnufreedocumentationlicense,version1.2(gfdl1.2)' => "GFDL-1.2", - "fdl1.3" => "GFDL-1.3", - - "bsd-2c" => "BSD-2-Clause", - "bsd3-clause" => "BSD-3-Clause", - "bsd3c" => "BSD-3-Clause", - "bsd3c(orsimilar)" => "BSD-3-Clause", - "bsd3-clause(orsimilar)" => "BSD-3-Clause", - - "bsd4c" => "BSD-4-Clause", - "bsd4c(orsimilar)" => "BSD-4-Clause", - - "x11/mit" => "MIT", - "X11mit" => "MIT", - "mitlicense(orsimilar)" => "MIT", - - "asl2.0" => "Apache-2.0", - 'apachelicense2.0' => "Apache-2.0", - 'apachelicense' => "Apache-2.0", - 'theapachesoftwarelicense' => "Apache-2.0", - "apachesoftwarelicense.." => "Apache-2.0", - 'apachesoftware license..' => "Apache-2.0", - 'aslv..' => "Apache-2.0", - 'aslv2' => "Apache-2.0", - - "artistic" => "Artistic-1.0", - "artistic2.0" => "Artistic-2.0", - - "thephplicense,version3.01" => "PHP-3.01", - "phplicense" => "PHP-3.01", - "mplv1.0" => "MPL-1.0", - "mplv1.1" => "MPL-1.1", - - "ibmpubliclicense.." => "IPL-1.0", - "ibmpl" => "IPL-1.0", - - "eclipsepubliclicense" => "EPL-1.0", - - "openldap2.8" => "OLDAP-2.8", - - "zliblicense" => "Zlib" - - ); - - my $tl = lc $l; - $tl =~ s, ,,g; - if (defined $replace{$tl}) { - $l = $replace{$tl}; + if (defined $license_replace{$l}) { + $l = $license_replace{$l}; } else { - my @m = grep(lc($_) eq lc($l), values(%replace)); - if (@m) { - $l = $m[0]; - } else { - print STDERR "unknown license '$l'\n"; - } + print STDERR "Unknown license '$l'\n"; } return $l; } -sub replace_spdx_or($) -{ - my ($license) = @_; - - # special case as or later is common in our spec files - $license =~ s, or later, orlater,g; - - my @licenses = (); - for (split(/\s+or\s+/, $license)) { - push @licenses, replace_single_spdx($_); - } - - return join(' or ', sort(@licenses)); -} - +sub replace_spdx_and($); sub replace_spdx_and($) { my ($license) = @_; + # special case as or later is common in our spec files + $license =~ s,or later,ORlater,g; + $license =~ s,or similar,ORsim,g; + + #print STDERR "ORIG '$license'\n"; my @licenses = (); - for (split(/\s*and\s*/, $license)) { - push @licenses, replace_spdx_or($_); + if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { + my ($head, $paren, $tail) = ($1, $2, $3); + if ($paren =~ /and|or/) { + $head = replace_spdx_and($head); + $tail = replace_spdx_and($tail); + $paren = replace_spdx_and($paren); + #print STDERR "AFTE '$head($paren)$tail'\n"; + return "$head($paren)$tail"; + } } - return join(' and ', sort(@licenses)); + + for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + s/\s+/ /g; + push @licenses, $_; + } + #print STDERR "AFTE '" . join('', @licenses) . "'\n"; + return join('', @licenses); } sub replace_spdx($) @@ -260,7 +207,7 @@ sub replace_spdx($) for (split(/\s*;\s*/, $license)) { push @licenses, replace_spdx_and($_); } - return join(' ; ', sort(@licenses)); + return join(' ; ', @licenses); } sub set_current_pkg { -- 2.51.1 From 82e57fb146bf8e4acedd995a65bb61f84b78d97d5b6e29c02bb53fa28b03020a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 7 Dec 2011 08:28:39 +0000 Subject: [PATCH 032/151] add url OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=28 --- obs-service-format_spec_file.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 3e352a1..cf1b31f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,6 +22,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Version: 0.4 Release: 0 +Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec -- 2.51.1 From 71eac424021a97677661406ffb56f76f677990cd41647f7dee49c2e715ab0b86 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 7 Dec 2011 14:05:00 +0000 Subject: [PATCH 033/151] - move pkgconfig() and co to the end of the buildrequires OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=29 --- licenses_changes.txt | 2 +- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 7aeebb7..c2ee98a 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,3 +1,4 @@ +SPDX Name in Spec File AAL AAL AFL-2.1 Academic Free License 2.1 AGPL-3.0 Affero GPL @@ -288,7 +289,6 @@ MS-PL Ms-Pl MS-PL MS-PL MS-RL MS-RL Multics Multics -SPDX Name in Spec File NASA-1.3 NASA-1.3 Naumen Naumen NCSA NCSA diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 3e8307b..b3b8073 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 7 14:04:46 UTC 2011 - coolo@suse.com + +- move pkgconfig() and co to the end of the buildrequires + ------------------------------------------------------------------- Wed Dec 7 08:22:29 UTC 2011 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index c954a9d..6393469 100644 --- a/prepare_spec +++ b/prepare_spec @@ -231,6 +231,18 @@ sub set_current_pkg { return ($curpack, $curlang); } +sub sort_buildrequires_helper { + if (($a =~ /^[^#]*\(/) != ($b =~ /^[^#]*\(/)) { + if ($a =~ /^[^#]*\(/) { + 1; + } else { + -1; + } + } else { + $a cmp $b; + } +} + sub read_and_parse_old_spec { my ( $specfile, $base_package ) = @_; my $current_package = $base_package; @@ -614,9 +626,9 @@ while ($linesmoved) { } else { # if there are already buildrequires, we need to sort and exit if (@buildrequires > 0) { - my @sortedbrs = sort(@buildrequires); + my @sortedbrs = sort sort_buildrequires_helper @buildrequires; $linesmoved = !compare_arrays(\@buildrequires, \@sortedbrs); - @oldspec = (@firstlines, sort(@buildrequires), $l, @oldspec); + @oldspec = (@firstlines, @sortedbrs, $l, @oldspec); @firstlines = (); @buildrequires = (); last; -- 2.51.1 From ce672c1e3c201f4a003fdac0d5bf9a7a9e902187351dc2bd8cc0fea10538b31d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 12 Dec 2011 10:29:11 +0000 Subject: [PATCH 034/151] - preserve release tag if it's more than a number OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=30 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index b3b8073..aedbff9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 12 10:28:57 UTC 2011 - coolo@suse.com + +- preserve release tag if it's more than a number + ------------------------------------------------------------------- Wed Dec 7 14:04:46 UTC 2011 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 6393469..1b3a643 100644 --- a/prepare_spec +++ b/prepare_spec @@ -24,7 +24,6 @@ my $vim_modeline; my $nosrc_result = 0; my $current_section = "header"; my $had_debug_package = 0; -my %pkg_version = (); my $main_license; my %seen_licenses = (); my $main_group; @@ -490,6 +489,10 @@ sub read_and_parse_old_spec { } # reset Release if ( /^Release\s*:\s*(.*)/i ) { + if ($1 !~ m/^[0-9]*$/ && $oldspec[-1] eq "XXXRELEASE") { + pop @oldspec; + push @oldspec, sprintf("%-16s%s","Release:", $1); + } # will be after Version next; } @@ -535,7 +538,7 @@ sub read_and_parse_old_spec { $version{$c_pack} = $_; $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, sprintf("%-16s%s","Release:", "0"); + push @oldspec, "XXXRELEASE"; next; } } @@ -688,6 +691,8 @@ while (@oldspec) { print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); } elsif ($line eq "XXXDOUBLELINE") { print "\n\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); + } elsif ($line eq "XXXRELEASE") { + printf("%-16s%s\n", "Release:", "0") ; } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { my $current_package = $1; my $license = $seen_licenses{$current_package} || $main_license; -- 2.51.1 From 9642f30d90613c510389807d3fb61591149dc92781f2fb63fe03a7d9798ac67d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 12 Dec 2011 15:58:11 +0000 Subject: [PATCH 035/151] Accepting request 95751 from openSUSE:Tools - move pkgconfig() and co to the end of the buildrequires - another update from git to replace way more licenses (0.4) - update from https://github.com/openSUSE/obs-service-format_spec_file - allow to specify a defined spec file (version 0.2) OBS-URL: https://build.opensuse.org/request/show/95751 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=14 --- format_spec_file | 9 +- format_spec_file.service | 9 +- licenses_changes.txt | 366 +++++++++++++++++ obs-service-format_spec_file.changes | 20 + obs-service-format_spec_file.spec | 15 +- patch_license | 564 +++++++++++++++++++++++++++ prepare_spec | 339 ++++++++++------ 7 files changed, 1202 insertions(+), 120 deletions(-) create mode 100644 licenses_changes.txt create mode 100644 patch_license diff --git a/format_spec_file b/format_spec_file index e6da271..1554799 100644 --- a/format_spec_file +++ b/format_spec_file @@ -9,6 +9,10 @@ while test $# -gt 0; do MYOUTDIR="$2" shift ;; + *-specfile) + MYSPECFILES="$MYSPECFILES $2" + shift + ;; *) echo Unknown parameter $1. echo 'Usage: this service is not excepting parameters' @@ -19,7 +23,10 @@ while test $# -gt 0; do done RETURN=0 -for i in *.spec; do +if [ -z "$MYSPECFILES" ]; then + MYSPECFILES=`echo *.spec` +fi +for i in $MYSPECFILES; do if [ "$i" == '*.spec' ]; then echo "WARNING: no spec file found" exit 0 diff --git a/format_spec_file.service b/format_spec_file.service index 8b502ac..4379d57 100644 --- a/format_spec_file.service +++ b/format_spec_file.service @@ -1,5 +1,8 @@ - - Validate sources - The default SUSE source validator which catches common pitfalls before build. + + Format the spec files + Formatting the spec files + + Just run on specified spec file instead all available + diff --git a/licenses_changes.txt b/licenses_changes.txt new file mode 100644 index 0000000..c2ee98a --- /dev/null +++ b/licenses_changes.txt @@ -0,0 +1,366 @@ +SPDX Name in Spec File +AAL AAL +AFL-2.1 Academic Free License 2.1 +AGPL-3.0 Affero GPL +AFL-2.1 AFL 2.1 +AFL-1.2 AFL-1.2 +AFL-2.0 AFL-2.0 +AFL-2.1 AFL-2.1 +AFL-3.0 AFL-3.0 +AGPL-3.0 AGPL-3.0 +AGPL-3.0 AGPLv3 +SUSE-AGPL-3.0+ AGPLv3+ +ANTLR-PD ANTLR-PD +Apache-1.1 Apache 1.1 (Indiana University) +Apache-2.0 Apache 2.0 +Apache-2.0 Apache License +Apache-2.0 Apache License 2.0 +Apache-2.0 Apache License, Version 2.0 +Apache-2.0 Apache Software License .. +Apache-2.0 Apache Software License +Apache-2.0 Apache v2.0 +Apache-1.0 Apache-1.0 +Apache-1.1 Apache-1.1 +Apache-2.0 Apache-2.0 +APL-1.0 APL-1.0 +APL-1.0 APL-1.0 (spdx.org/licenses) +APSL-1.0 APSL-1.0 +APSL-1.1 APSL-1.1 +APSL-1.2 APSL-1.2 +APSL-2.0 APSL-2.0 +Artistic-1.0 Artistic +Artistic-1.0 Artistic 1.0 +Artistic-2.0 Artistic 2.0 +Artistic-1.0 Artistic license +Artistic-1.0 Artistic License +Artistic-1.0 Artistic License .. +Artistic-1.0 Artistic-1.0 +SUSE-Artistic-1.0+ Artistic-1.0+ +Artistic-2.0 Artistic-2.0 +Apache-1.1 ASL 1.1 +Apache-2.0 ASL 2.0 +Apache-2.0 ASL2 +Apache-2.0 ASLv.. +Apache-2.0 ASLv2 +Apache-2.0 ASLv2.0 +SUSE-Apache-2.0+ ASLv2.0+ +BSD-3-Clause BSD (3-Clause) +BSD-2-Clause BSD 2 clause +BSD-2-Clause BSD 2 Clause +BSD-2-Clause BSD 2-clause +BSD-2-Clause BSD 2-Clause +BSD-3-Clause BSD 3-Clause +BSD-3-Clause BSD 3-clause (or similar) +BSD-2-Clause BSD-2-Clause +BSD-2-Clause BSD-2c +BSD-3-Clause BSD-3 +BSD-3-Clause BSD-3-Clause +BSD-3-Clause BSD-3-clause (or similar) +BSD-4-Clause BSD-4-Clause +BSD-2-Clause BSD2c +BSD-3-Clause BSD3 +BSD-3-Clause BSD3c +BSD-3-Clause BSD3c (or similar) +BSD-3-Clause BSD3c(or similar) +BSD-4-Clause BSD4c +BSD-4-Clause BSD4c(or similar) +BSL-1.0 BSL-1.0 +CATOSL-1.1 CATOSL-1.1 +CC-BY-SA-3.0 CC BY-SA 3.0 +CC-BY-SA-2.5 CC by-sa V2.5 +CC-BY-SA-3.0 CC BY-SA V3.0 +CC-BY-1.0 CC-BY-1.0 +CC-BY-2.0 CC-BY-2.0 +CC-BY-2.5 CC-BY-2.5 +CC-BY-3.0 CC-BY-3.0 +CC-BY-NC-1.0 CC-BY-NC-1.0 +CC-BY-NC-2.0 CC-BY-NC-2.0 +CC-BY-NC-2.5 CC-BY-NC-2.5 +CC-BY-NC-3.0 CC-BY-NC-3.0 +CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 +CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 +CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 +CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 +CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 +CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 +CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 +CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 +CC-BY-ND-1.0 CC-BY-ND-1.0 +CC-BY-ND-2.0 CC-BY-ND-2.0 +CC-BY-ND-2.5 CC-BY-ND-2.5 +CC-BY-ND-3.0 CC-BY-ND-3.0 +CC-BY-SA-1.0 CC-BY-SA-1.0 +CC-BY-SA-2.0 CC-BY-SA-2.0 +CC-BY-SA-2.5 CC-BY-SA-2.5 +CC-BY-SA-3.0 CC-BY-SA-3.0 +CC0-1.0 CC0-1.0 +CDDL-1.0 CDDL +CDDL-1.0 CDDL 1.0 +CDDL-1.0 CDDL-1.0 +CDDL-1.0 or LGPL-2.1 CDDLv1.0 | LGPLv2.1 +CECILL-1.0 CECILL-1.0 +CECILL-1.1English CECILL-1.1English +CECILL-2.0 CECILL-2.0 +CECILL-B CECILL-B +CECILL-C CECILL-C +ClArtistic ClArtistic +CPL-1.0 Common Public License - v 1.0 +CPL-1.0 Common Public License v1.0 +CPL-1.0 Common Public License v1.0 (CPL) +CPL-1.0 Common Public License Version 1.0 +CPL-1.0 Common Public License Version 1.0 (CPL1.0) +CPAL-1.0 CPAL-1.0 +CPL-1.0 CPL (Common Public License) v1 +CPL-1.0 CPL 1.0 +CPL-1.0 CPL 1.0 ... +CPL-1.0 CPL-1.0 +CUA-OPL-1.0 CUA-OPL-1.0 +ECL-1.0 ECL-1.0 +ECL-2.0 ECL-2.0 +EPL-1.0 Eclipse Public License +EPL-1.0 Eclipse-1.0 +EPL-1.0 Eclipse Public License 1.0 +eCos-2.0 eCos-2.0 +EFL-1.0 EFL-1.0 +EFL-2.0 EFL-2.0 +Entessa Entessa +EPL-1.0 EPL +EPL-1.0 EPL 1.0 +EPL-1.0 EPL 1.0 ... +EPL-1.0 EPL v1.0 +EPL-1.0 EPL-1 +EPL-1.0 EPL-1.0 +ErlPL-1.1 Erlang Public License +ErlPL-1.1 ErlPL-1.1 +EUDatagrid EUDatagrid +EUPL-1.0 EUPL-1.0 +EUPL-1.1 EUPL-1.1 +MIT Expat +MIT Expat License +Fair Fair +SUSE-GFDL-1.1 FDL v1.1 or later +SUSE-GFDL-1.2+ FDL-1.2+ +SUSE-GFDL-1.3+ FDL-1.3+ +SUSE-GFDL-1.2+ FDLv1.2+ +Frameworx-1.0 Frameworx-1.0 +SUSE-Freeware Freeware +SUSE-Freeware Freeware license +GFDL-1.1 GFDL 1.1 +GFDL-1.2 GFDL 1.2 +GFDL-1.1 GFDL v1.1 +GFDL-1.2 GFDL v1.2 +GFDL-1.1 GFDL-1.1 +GFDL-1.2 GFDL-1.2 +GFDL-1.3 GFDL-1.3 +GFDL-1.1 GFDLv1.1 +GFDL-1.2 GFDLv1.2 +SUSE-GFDL-1.2+ GFDLv1.2+ +GPL-2.0 GLPv2 +GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) +GPL-2.0 GNU General Public License (GPL) v2 +GPL-2.0 GNU General Public License version 2 (GPL v2) +GPL-2.0+ GNU General Public License version 2 or later +GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) +GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) +GPL-3.0 GNU General Public License version 3 (GPLv3) +GPL-2.0 GNU GPL v2 +GPL-3.0+ GNU GPL v3 or later +GPL-3.0 GNU GPL version 3 +LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 +LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) +LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) +LGPL-2.1+ GNU LGPL v2.1 or later +LGPL-2.1 GNU LGPLv2.1 +GPL-2.0 GPL 2.0 +GPL-3.0 GPL 3 +GPL-2.0 GPL v2 +GPL-2.0 GPL v2 only +GPL-2.0+ GPL v2 or later +GPL-2.0+ GPL v2 or later +GPL-2.0 GPL v2.0 +GPL-2.0+ GPL v2.0 or later +GPL-2.0+ GPL v2+ +GPL-3.0 GPL v3 +GPL-3.0 GPL v3 only +GPL-3.0+ GPL v3 or later +GPL-1.0 GPL-1.0 +GPL-1.0+ GPL-1.0+ +GPL-2.0 GPL-2 +GPL-2.0 GPL-2.0 +GPL-2.0; GPL-2.0+ GPL-2.0 GPL-2.0+ +GPL-2.0+ GPL-2.0 or later +GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception +GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception +GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception +GPL-2.0-with-font-exception GPL-2.0-with-font-exception +GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception +GPL-2.0; GPL-2.0+ GPL-2.0, GPL-2.0+ +GPL-2.0+ GPL-2.0+ +Apache-2.0; GPL-2.0+ GPL-2.0+, Apache-2.0 +GPL-2.0+; LGPL-2.0+ GPL-2.0+,LGPL-2.0+ +GPL-2.0 GPL-2.Ã0 +GPL-2.0+ GPL-2+ +GPL-3.0 GPL-3 +GPL-3.0 GPL-3.0 +GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception +GPL-3.0; GPL-2.0+ GPL-3.0, GPL-2.0+ +GPL-3.0+ GPL-3.0+ +GPL-3.0+ GPL-3+ +GPL-1.0+ GPL+ +GPL-2.0 GPL2 +GPL-2.0+ GPL2+ +GPL-3.0 GPL3 +GPL-1.0+ GPLv1+ +GPL-2.0 GPLv2 +GPL-2.0 or GPL-3.0 GPLv2 || GPLv3 +GPL-2.0+ GPLv2 or later +GPL-2.0+ GPLv2+ +GPL-3.0 GPLv3 +GPL-3.0+ GPLv3+ +gSOAP-1.3b gSOAP-1.3b +HPND HPND +IPL-1.0 IBM PL +IPL-1.0 IBM Public License +IPL-1.0 IBM Public License .. +IPA IPA +IPL-1.0 IPL-1.0 +ISC ISC +ISC ISC License +LGPL-2.1 LGPL 2.1 +LGPL-2.0 LGPL v2 +LGPL-2.0+ LGPL v2 or later +LGPL-2.0 LGPL v2.0 only +LGPL-2.0+ LGPL v2.0 or later +LGPL-2.1 LGPL v2.1 +LGPL-2.1 LGPL v2.1 only +LGPL-2.1+ LGPL v2.1 or later +LGPL-2.1+ LGPL v2.1+ +LGPL-2.1+ LGPL v2+ +LGPL-2.1+ LGPL V2+ +LGPL-3.0+ LGPL v3 or later +LGPL-2.0 LGPL-2.0 +LGPL-2.1+ LGPL-2.0.1 or later +LGPL-2.0+ LGPL-2.0+ +LGPL-2.1 LGPL-2.1 +LGPL-2.1+ LGPL-2.1+ +LGPL-3.0 LGPL-3.0 +LGPL-3.0+ LGPL-3.0+ +LGPL-2.1 LGPL2.1 +LGPL-2.0 LGPLv2 +LGPL-2.0 LGPLv2.0 +LGPL-2.0+ LGPLv2.0+ +LGPL-2.1 LGPLv2.1 +LGPL-2.1+ LGPLv2.1+ +LGPL-2.1+ LGPLv2+ +LGPL-3.0 LGPLv3 +LGPL-3.0+ LGPLv3+ +GPL-2.0+ libGeoIPUpdate is GPLv2 or later +Libpng Libpng +LPL-1.02 LPL-1.02 +LPPL-1.3c LPPL .. +LPPL-1.0 LPPL-1.0 +LPPL-1.1 LPPL-1.1 +LPPL-1.2 LPPL-1.2 +LPPL-1.3c LPPL-1.3c +MirOS MirOS +MIT MIT +MIT MIT licence +MIT MIT license +MIT MIT License +MIT MIT License (or similar) +MIT MIT-Licence +MIT MIT/X Consortium License +MIT MIT/X License +MIT MIT/X11 +Motosoto Motosoto +MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) +MPL-1.1 Mozilla Public License 1.1 +SUSE-MPL-1.1+ MPL 1.1 or later +MPL-1.0 MPL-1.0 +MPL-1.1 MPL-1.1 +MPL-1.0 MPLv1.0 +MPL-1.1 MPLv1.1 +MPL-1.1 MPLv1.1 .. +SUSE-MPL-1.1+ MPLv1.1+ +MS-PL Ms-Pl +MS-PL MS-PL +MS-RL MS-RL +Multics Multics +NASA-1.3 NASA-1.3 +Naumen Naumen +NCSA NCSA +NGPL NGPL +Nokia Nokia +NPOSL-3.0 NPOSL-3.0 +NTP NTP +OCLC-2.0 OCLC-2.0 +ODbL-1.0 ODbL-1.0 +OFL-1.1 OFL +OFL-1.1 OFL-1.1 +OGTSL OGTSL +OLDAP-2.8 OLDAP-2.8 +OFL-1.1 Open Font License +OLDAP-2.8 openldap 2.8 +OpenSSL OpenSSL +OSL-1.0 OSL-1.0 +OSL-2.0 OSL-2.0 +OSL-3.0 OSL-3.0 +PDDL-1.0 PDDL-1.0 +Artistic-1.0 or GPL-1.0+ Perl License +PHP-3.0.1 PHP License +PostgreSQL PostgreSQL +SUSE-Public-Domain Public domain +SUSE-Public-Domain Public Domain +SUSE-Public-Domain Public Domain, Freeware +SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +Python-2.0 Python +Python-2.0 Python .. +Python-2.0 Python Copyright +Python-2.0 Python License .. +Python-2.0 Python Software Foundation License +Python-2.0 Python-2.0 +QPL-1.0 QPL +QPL-1.0 QPL .. +QPL-1.0 QPL-1.0 +RHeCos-1.1 RHeCos-1.1 +RPL-1.5 RPL-1.5 +RPSL-1.0 RPSL-1.0 +RSCPL RSCPL +Ruby Ruby +SAX-PD SAX-PD +IPA see IPA_Font_License_Agreement_v1.0.txt +OFL-1.1 SIL Open Font License +OFL-1.1 SIL Open Font License 1.1 +SimPL-2.0 SimPL-2.0 +Sleepycat Sleepycat +SPL-1.0 SPL-1.0 +SugarCRM-1.1.3 SugarCRM-1.1.3 +LPPL-1.3c TeX-License .. +Apache-2.0 The Apache Software License +PHP-3.0.1 The PHP License, version 3.01 +VSL-1.0 VSL-1.0 +W3C W3C +W3C W3C Software License +Watcom-1.0 Watcom-1.0 +WXwindows WXwindows +MIT X11 +MIT X11 (BSD like) +MIT X11 MIT +MIT X11/MIT +XFree86-1.1 XFree86-1.1 +Xnet Xnet +YPL-1.1 YPL-1.1 +Zimbra-1.3 Zimbra-1.3 +Zlib Zlib +Zlib zlib +Zlib Zlib License +Zlib zlib/libpng License +ZPL-2.0 Zope Public License +ZPL-2.0 ZPL +ZPL-2.1 ZPL 2.1 +ZPL-1.1 ZPL-1.1 +ZPL-2.0 ZPL-2.0 +ZPL-2.1 ZPL-2.1 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a94cf35..b3b8073 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Dec 7 14:04:46 UTC 2011 - coolo@suse.com + +- move pkgconfig() and co to the end of the buildrequires + +------------------------------------------------------------------- +Wed Dec 7 08:22:29 UTC 2011 - coolo@suse.com + +- another update from git to replace way more licenses (0.4) + +------------------------------------------------------------------- +Tue Dec 6 08:50:41 UTC 2011 - coolo@suse.com + +- update from https://github.com/openSUSE/obs-service-format_spec_file + +------------------------------------------------------------------- +Thu Dec 1 14:10:52 UTC 2011 - adrian@suse.de + +- allow to specify a defined spec file (version 0.2) + ------------------------------------------------------------------- Wed Sep 7 13:34:45 CEST 2011 - dmueller@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index b151eb7..cf1b31f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -16,16 +16,18 @@ # - Name: obs-service-format_spec_file -License: GPL v2 or later +Summary: An OBS source service: reformats a spec file to SUSE standard +License: GPL-2.0+ Group: Development/Tools/Building -Summary: An OBS source service: reformats a spec file to SUSE standard. -Version: 0.1 -Release: 11 +Version: 0.4 +Release: 0 +Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec +Source3: patch_license +Source4: licenses_changes.txt Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -49,7 +51,8 @@ spec file instead of creating a new one. mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files %files %defattr(-,root,root) diff --git a/patch_license b/patch_license new file mode 100644 index 0000000..6cdb58a --- /dev/null +++ b/patch_license @@ -0,0 +1,564 @@ +#! /usr/bin/perl -w +# +# vim:sw=2:et +# + +BEGIN { + unshift @INC, "."; + unshift @INC, "/usr/lib/build/"; +} + +use Time::localtime; +use Data::Dumper; +use strict; + +my @oldspec = (); +my @newspec = (); +my $base_package = ""; +my $icecreamforbuild = ""; +my @copyrights = (); +my $needsrootforbuild = 0; +my $needsbinariesforbuild = 0; +my $nodebuginfo = 0; +my $vim_modeline; +my $nosrc_result = 0; +my $current_section = "header"; +my $had_debug_package = 0; +my %pkg_version = (); +my $main_license; +my %seen_licenses = (); +my $main_group; +my %seen_groups = (); +my $build_root = $ENV{'BUILD_ROOT'}; +my $disabled_packs; +my $ifhandler; +my $definelist; +my $debug = 0; + +my @global_tags_list = +( + 'Autoreq', + 'Autoreqprov', + 'BuildArch', + 'BuildArchitectures', + 'BuildRequires', + 'Conflicts', + 'DocDir', + 'Enhances', + 'Enhances', + 'EssentialFor', + 'ExcludeArch', + 'ExclusiveArch', + 'Freshens', + 'Group', + 'Name', + 'NoPatch', + 'NoSource', + 'Obsoletes', + 'Patch\d*', + 'Prefix', + 'PreReq', + 'Provides', + 'Recommends', + 'Requires', + 'Source\d*', + 'Suggests', + 'Summary', + 'Supplements', + 'Url', +); + +my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; + +my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . + 'description|files|triggerin|triggerun|triggerpostun)\b'; + +sub unify { + my %h = map {$_ => 1} @_; + return grep(delete($h{$_}), @_); +} + +sub capitalize_case($) +{ + my ($tag) = @_; + + $tag = lc($tag); + + $tag =~ s/docdir/DocDir/i; + $tag =~ s/arch/Arch/i; + $tag =~ s/patch/Patch/i; + $tag =~ s/source/Source/i; + $tag =~ s/req/Req/i; + $tag =~ s/prov/Prov/i; + $tag =~ s/^(\w)/uc($1)/e; + + return $tag; +} + +sub compare_arrays { + my ($first, $second) = @_; + return 0 unless @$first == @$second; + for (my $i = 0; $i < @$first; $i++) { + return 0 if $first->[$i] ne $second->[$i]; + } + return 1; +} + +sub maybe_add_empty_line() +{ + push @oldspec, "XXXBLANKLINE" + if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); +} + +sub change_section($) +{ + my ($new_section) = @_; + + maybe_add_empty_line(); + + $current_section = $new_section; + warn "section changed to $current_section\n" if $debug; +} + +my %license_replace = (); +use File::Basename; + +sub load_license_map() +{ + return if defined $license_replace{"GPL-2.0"}; + my $scriptdir = File::Basename::dirname($0); + open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; + # ignore header + readline(*MAP); + my %spdx; + while () { + chomp; + my ($license, $oldstring) = split(/\t/, $_, 2); + #$license =~ s,\s*$,,; + #$oldstring =~ s,\s*$,,; + next unless length($license); + #print STDERR "$license\t$oldstring\n"; + die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; + $license_replace{$oldstring} = $license; + $spdx{$license} = 1; + } + close(MAP); + for (keys %spdx) { + $license_replace{$_} = $_; + } +} + +sub replace_single_spdx($) +{ + my ($l) = @_; + + return '' if $l eq ''; + + load_license_map(); + $l =~ s,ORlater,or later,g; + $l =~ s,ORsim,or similar,g; + $l =~ s,^\s+,,; + $l =~ s,\s+$,,; + + if (defined $license_replace{$l}) { + $l = $license_replace{$l}; + } else { + print STDERR "Unknown license '$l'\n"; + exit(1); + } + return $l; +} + +sub replace_spdx_and($); +sub replace_spdx_and($) +{ + my ($license) = @_; + + # special case as or later is common in our spec files + $license =~ s,or later,ORlater,g; + $license =~ s,or similar,ORsim,g; + + #print STDERR "ORIG '$license'\n"; + my @licenses = (); + if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { + my ($head, $paren, $tail) = ($1, $2, $3); + if ($paren =~ /and|or/) { + $head = replace_spdx_and($head); + $tail = replace_spdx_and($tail); + $paren = replace_spdx_and($paren); + #print STDERR "AFTE '$head($paren)$tail'\n"; + return "$head($paren)$tail"; + } + } + + for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + s/\s+/ /g; + push @licenses, $_; + } + #print STDERR "AFTE '" . join('', @licenses) . "'\n"; + return join('', @licenses); +} + +sub replace_spdx($) +{ + my ($license) = @_; + + my @licenses = (); + for (split(/\s*;\s*/, $license)) { + push @licenses, replace_spdx_and($_); + } + return join(' ; ', @licenses); +} + +sub set_current_pkg { + my ( $arg ) = @_; + print "DEBUG: set_current_pkg receiving $arg\n" if $debug; + my ( @argarray ) = split ( '\s+' , $arg ); + my $curpack = $base_package; + my $curlang = ""; + while (my $carg = shift @argarray) { + next if ($carg eq "%description" || $carg eq "%package" || $carg eq "%prep"); + if ($carg eq "-l") { + $curlang = shift @argarray; + } elsif ($carg eq "-n") { + $curpack = shift @argarray; + } else { + $curpack = "$base_package-" if $base_package; + $curpack .= $carg; + } + } + print "DEBUG: set_current_pkg returning $curpack, $curlang\n" if $debug; + return ($curpack, $curlang); +} + +sub read_and_parse_old_spec { + my ( $specfile, $base_package ) = @_; + my $current_package = $base_package; + my $current_lang = ""; + my $check_printed = "false"; + my $print_comments = "false"; + my %version; + my $ifhandler; + $ifhandler->{"disabled"} = 0; + + my @readspec; + open ( SPEC , "$specfile" ) || die "can't read specfile"; + @readspec = ; + close SPEC; + chomp @readspec; + + while (@readspec) { + $_ = shift @readspec; + + if ( /^\s*$/ && $current_section ne "description") { + # stop preamble parsing on two blank lines + if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { + $print_comments = "true"; + push @oldspec, "XXXDOUBLELINE"; + next; + } + push @oldspec, "XXXBLANKLINE"; + next; + } + + if ( /^# vim:/ ) { + $vim_modeline = $_; + next; + } + + if ( /^#\s*needsrootforbuild\s*$/ ) { + $needsrootforbuild = 1; + next; + } + if ( /^#\s*needsbinariesforbuild\s*$/ ) { + $needsbinariesforbuild = 1; + next; + } + if ( /^#\s*norootforbuild/ ) { + next; + } + + if ( /^#\s*nodebuginfo\s*$/ ) { + $nodebuginfo = 1; + next; + } + if ( /^#\s*icecream/ ) { + $icecreamforbuild = $_; + $icecreamforbuild =~ s/^#\s*icecream\s*//; + next; + } + if ( /^#\s*Copyright\s*/ ) { + my $lastlineblank = 0; + for (;;) + { + # check if line is ONLY a standard copyright line, if so, ignore. + my $c = $_; + $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; + push(@copyrights, $_) if length $c > 5; + last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ + || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + $_ = shift @readspec; + } + next; + } + # evil epoch removal + next if ( /^Epoch:/ ); + $_ =~ s/%{?epoch}?[:-]//g; + $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); + + if ( /^BuildRequires:/ ) { + my $cur_buildreq = $_; + $cur_buildreq =~ s/^BuildRequires:\s*//; + my %aa; + while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + $aa{$1}=1; + } + # ignore line if it looks like a "usedforbuild" line, i.e. + # if it contains too many base packages + next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; + for my $br (sort keys(%aa)) { + push @oldspec, "BuildRequires: $br"; + } + next; + } + next if ( /^#\s*usedforbuild/ ); + if ( /^%\?__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!__\*BuildRequires:/ ) { + push @oldspec, $_; + next; + } + if ( /^#!BuildIgnore:/ ) { + push @oldspec, $_; + next; + } + + if ( /^#/ && $current_section ne "description") { + warn "$_ $current_section\n" if $debug; + if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { + push @oldspec, $_; + } + next; + } + + if ( /^%debug_package/ ) { + # remove, we add this ourselves + next; + } + $print_comments = "true" unless /^#/; + + if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { + next; + } + + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { + change_section("header") if ($current_section eq "description"); + push @oldspec, $_; + if ( /^\s*%if\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 1; + $ifhandler->{"depth"}++; + my $if_not = 0; + if ( $args[1] =~ /^\!/ ) { + $args[1] =~ s/^\!//; + $if_not = 1; + } + $args[2] = "" unless $args[2]; + if ( ($args[1] eq "0") + || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) + || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) + || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") + || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { + $ifhandler->{"disabled"} = $ifhandler->{"depth"}; + $ifhandler->{"last_if_disabled"} = 1; + } + } elsif ( /^\s*%if/ ) { + $ifhandler->{"last_if_disabled"} = 0; + $ifhandler->{"last_if_if"} = 0; + $ifhandler->{"depth"}++; + } elsif ( /^\s*%endif/ ) { + $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; + $ifhandler->{"depth"}--; + } elsif ( /^\s*%else/ ) { + if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { + $ifhandler->{"disabled"} = 0; + } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { + $ifhandler->{"disabled"} = 1; + } + } elsif ( /^\s*%define\s/ ) { + my @args = split (/\s+/,$_); + $_ =~ s/[\{\}\"]//g for (@args); + $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); + if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { + $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + } + while ($_ =~ /\\$/) { + $_ = shift @readspec; + push @oldspec, $_; + } + } + next; + } + if ( /^%package\b/i or /^%prep\b/i ) { + if (/^%package\b/i) { + change_section("header"); + } else { + change_section("prep"); + } + $_ =~ s/^(%\w+)/lc($1)/e; + if ($debug) { + warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); + } + push @oldspec, $_; + for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { + $_ =~ s/\Q$xx\E/$definelist->{$xx}/; + } + $_ =~ s/%{\?[^\}]*}//; + if ($debug) { + warn "after: $_\n"; + } + ($current_package, $current_lang) = set_current_pkg ( $_ ); + if ($ifhandler->{"disabled"}) { + $disabled_packs->{$current_package} = 1; + warn "$current_package is disabled\n" if $debug; + } + next; + } + if ( /^%description\b/i ) { + change_section("description"); + push @oldspec, $_; + next; + } + if ( /^%install\b/i ) { + change_section("install"); + push @oldspec, $_; + next; + } + if ( /^%changelog\b/i ) { + change_section("changelog"); + # changelog comes always from *.changes. Skip what is in spec file + # at the moment. + next; + } + if (/^%files\b/i) { + change_section("files"); + $current_section = "files"; + } + if ( /^%/ ) { + if ( m/$section_tags_re/oi ) { + $_ =~ s/^(%\w+)/lc($1)/e; + change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); + change_section("build") if m/\s*%build/i; + warn "changed to $current_section for $_\n" if $debug; + } + + push @oldspec, "$_"; + next; + } + + if ($current_section eq "header") { + my $c_pack = $current_package; + $c_pack .= "_disabled" if $ifhandler->{"disabled"}; + + if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { + next; + } + # remove default value of Autoreqprov + if ( /^Autoreqprov\s*:\s*(.*)/i ) { + next if ( lc($1) eq "on" || lc($1) eq "yes"); + } + # reset Release + if ( /^Release\s*:\s*(.*)/i ) { + # will be after Version + next; + } + if ( /^Summary\s*:\s*(.*)\s*$/i ) { + push @oldspec, sprintf("%-16s%s", "Summary:", $1); + push @oldspec, "XXXPOSTSUMMARY $current_package"; + next; + } + + # remove license and print out after license later + if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { + my $license = replace_spdx($1); + $main_license = $license if (!$main_license); + $seen_licenses{$current_package} = $license; + next; + } + + # remove groups and print out after summary later + if ( /^Group\s*:\s*(.*)\s*$/i ) { + my $group = $1; + $main_group = $group if (!$main_group); + $seen_groups{$current_package} = $group; + next; + } + + if ( /^BuildArchitectures\s*:/i ) { + $_ =~ s/^[^:]+:/BuildArch:/; + } + + if ( /^BuildRoot\s*:/i ) { + push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; + next; + } + + if ( m/$global_tags_re\s*(.*)/oi ) { + my ($tag, $value) = ($1, $2); + $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); + push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); + next; + } + if ( /^Version:/ ) { + warn "found Version, section = $current_section\n" if $debug; + $version{$c_pack} = $_; + $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; + push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, sprintf("%-16s%s","Release:", "0"); + next; + } + } + if ( $current_section ne "changelog" ) { + push @oldspec, $_; + next; + } + } + +} + +my $specfile = shift ( @ARGV ); +if ( ! stat($specfile) ) { + die "$specfile is no file"; +} + + +my @specpath = split ('/' ,$specfile); +my $specbase = pop @specpath; +my $specdir = join ('/', @specpath); + +if ( $specdir eq "" ) { + $specdir = "."; +} +my $xdefinelist; +my $seen_name = 0; +open ( SPE , "$specfile" ); +while ( ) { + chomp; + + if ( m/^License\s*:\s*(.*)\s*$/ ) { + printf("%-16s%s\n","License:", replace_spdx($1)); + } else { + print "$_\n"; + } +} + diff --git a/prepare_spec b/prepare_spec index 5c6517b..6393469 100644 --- a/prepare_spec +++ b/prepare_spec @@ -15,21 +15,20 @@ use strict; my @oldspec = (); my @newspec = (); my $base_package = ""; -my $neededforbuild = ""; my $icecreamforbuild = ""; -my $norootforbuild = 0; my @copyrights = (); my $needsrootforbuild = 0; my $needsbinariesforbuild = 0; my $nodebuginfo = 0; -my %multiline_macros = (); +my $vim_modeline; my $nosrc_result = 0; my $current_section = "header"; my $had_debug_package = 0; my %pkg_version = (); -my %pkg_release = (); -my %please_replace = (); -my %replace_hash = (); +my $main_license; +my %seen_licenses = (); +my $main_group; +my %seen_groups = (); my $build_root = $ENV{'BUILD_ROOT'}; my $disabled_packs; my $ifhandler; @@ -51,6 +50,8 @@ my @global_tags_list = 'ExcludeArch', 'ExclusiveArch', 'Freshens', + 'Group', + 'Name', 'NoPatch', 'NoSource', 'Obsoletes', @@ -62,6 +63,7 @@ my @global_tags_list = 'Requires', 'Source\d*', 'Suggests', + 'Summary', 'Supplements', 'Url', ); @@ -93,10 +95,19 @@ sub capitalize_case($) return $tag; } +sub compare_arrays { + my ($first, $second) = @_; + return 0 unless @$first == @$second; + for (my $i = 0; $i < @$first; $i++) { + return 0 if $first->[$i] ne $second->[$i]; + } + return 1; +} + sub maybe_add_empty_line() { push @oldspec, "XXXBLANKLINE" - if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); + if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); } sub change_section($) @@ -109,6 +120,96 @@ sub change_section($) warn "section changed to $current_section\n" if $debug; } +my %license_replace = (); +use File::Basename; + +sub load_license_map() +{ + return if defined $license_replace{"GPL-2.0"}; + my $scriptdir = File::Basename::dirname($0); + open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; + # ignore header + readline(*MAP); + my %spdx; + while () { + chomp; + my ($license, $oldstring) = split(/\t/, $_, 2); + #$license =~ s,\s*$,,; + #$oldstring =~ s,\s*$,,; + next unless length($license); + #print STDERR "$license\t$oldstring\n"; + die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; + $license_replace{$oldstring} = $license; + $spdx{$license} = 1; + } + close(MAP); + for (keys %spdx) { + $license_replace{$_} = $_; + } +} + +sub replace_single_spdx($) +{ + my ($l) = @_; + + return '' if $l eq ''; + + load_license_map(); + $l =~ s,ORlater,or later,g; + $l =~ s,ORsim,or similar,g; + $l =~ s,^\s+,,; + $l =~ s,\s+$,,; + + if (defined $license_replace{$l}) { + $l = $license_replace{$l}; + } else { + print STDERR "Unknown license '$l'\n"; + } + return $l; +} + +sub replace_spdx_and($); +sub replace_spdx_and($) +{ + my ($license) = @_; + + # special case as or later is common in our spec files + $license =~ s,or later,ORlater,g; + $license =~ s,or similar,ORsim,g; + + #print STDERR "ORIG '$license'\n"; + my @licenses = (); + if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { + my ($head, $paren, $tail) = ($1, $2, $3); + if ($paren =~ /and|or/) { + $head = replace_spdx_and($head); + $tail = replace_spdx_and($tail); + $paren = replace_spdx_and($paren); + #print STDERR "AFTE '$head($paren)$tail'\n"; + return "$head($paren)$tail"; + } + } + + for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + s/\s+/ /g; + push @licenses, $_; + } + #print STDERR "AFTE '" . join('', @licenses) . "'\n"; + return join('', @licenses); +} + +sub replace_spdx($) +{ + my ($license) = @_; + + my @licenses = (); + for (split(/\s*;\s*/, $license)) { + push @licenses, replace_spdx_and($_); + } + return join(' ; ', @licenses); +} + sub set_current_pkg { my ( $arg ) = @_; print "DEBUG: set_current_pkg receiving $arg\n" if $debug; @@ -130,6 +231,18 @@ sub set_current_pkg { return ($curpack, $curlang); } +sub sort_buildrequires_helper { + if (($a =~ /^[^#]*\(/) != ($b =~ /^[^#]*\(/)) { + if ($a =~ /^[^#]*\(/) { + 1; + } else { + -1; + } + } else { + $a cmp $b; + } +} + sub read_and_parse_old_spec { my ( $specfile, $base_package ) = @_; my $current_package = $base_package; @@ -148,15 +261,23 @@ sub read_and_parse_old_spec { while (@readspec) { $_ = shift @readspec; + if ( /^\s*$/ && $current_section ne "description") { + # stop preamble parsing on two blank lines + if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { + $print_comments = "true"; + push @oldspec, "XXXDOUBLELINE"; + next; + } push @oldspec, "XXXBLANKLINE"; next; } - - if ( /^#\s*norootforbuild\s*$/ ) { - $norootforbuild = 1; - next; + + if ( /^# vim:/ ) { + $vim_modeline = $_; + next; } + if ( /^#\s*needsrootforbuild\s*$/ ) { $needsrootforbuild = 1; next; @@ -165,6 +286,10 @@ sub read_and_parse_old_spec { $needsbinariesforbuild = 1; next; } + if ( /^#\s*norootforbuild/ ) { + next; + } + if ( /^#\s*nodebuginfo\s*$/ ) { $nodebuginfo = 1; next; @@ -175,6 +300,7 @@ sub read_and_parse_old_spec { next; } if ( /^#\s*Copyright\s*/ ) { + my $lastlineblank = 0; for (;;) { # check if line is ONLY a standard copyright line, if so, ignore. @@ -182,22 +308,11 @@ sub read_and_parse_old_spec { $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; push(@copyrights, $_) if length $c > 5; last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ - || grep { $readspec[0] =~ /^#\s*$_/ } ("norootforbuild","needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","neededforbuild","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); $_ = shift @readspec; } next; } - if ( /^#\s*neededforbuild/ ) { - $neededforbuild = $_; - $neededforbuild =~ s/^#\s*neededforbuild\s*//; - my (%aa) = (); - foreach my $x (split(' ',$neededforbuild)){ - $aa{$x}=1; - } - $neededforbuild = join(' ',sort keys (%aa)); - - next; - } # evil epoch removal next if ( /^Epoch:/ ); $_ =~ s/%{?epoch}?[:-]//g; @@ -213,7 +328,9 @@ sub read_and_parse_old_spec { # ignore line if it looks like a "usedforbuild" line, i.e. # if it contains too many base packages next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - push @oldspec, "BuildRequires: ".join(' ',sort keys(%aa)); + for my $br (sort keys(%aa)) { + push @oldspec, "BuildRequires: $br"; + } next; } next if ( /^#\s*usedforbuild/ ); @@ -229,6 +346,7 @@ sub read_and_parse_old_spec { push @oldspec, $_; next; } + if ( /^#/ && $current_section ne "description") { warn "$_ $current_section\n" if $debug; if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { @@ -236,6 +354,7 @@ sub read_and_parse_old_spec { } next; } + if ( /^%debug_package/ ) { # remove, we add this ourselves next; @@ -245,9 +364,7 @@ sub read_and_parse_old_spec { if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { next; } - if ( /^%define\s+(\w[\w\d]+).*\\$/ ) { - $multiline_macros{$1} = 1; - } + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { change_section("header") if ($current_section eq "description"); push @oldspec, $_; @@ -330,13 +447,7 @@ sub read_and_parse_old_spec { } if ( /^%description\b/i ) { change_section("description"); - $_ =~ s/^(%\w+)/lc($1)/e; push @oldspec, $_; - ($current_package, $current_lang) = set_current_pkg ( $_ ); - my $target = $current_package; - $target .= "_$current_lang" if $current_lang; - $target .= "_disabled" if $ifhandler->{"disabled"}; - push @oldspec, "XXXDESCRIPTION $target"; next; } if ( /^%install\b/i ) { @@ -363,64 +474,56 @@ sub read_and_parse_old_spec { } push @oldspec, "$_"; - # multiline macros need an extra newline with old RPMs - if (/^%(\w[\w\d]+).*[^\\]$/) { - push @oldspec, "" if (defined($multiline_macros{$1})); - } next; } + if ($current_section eq "header") { my $c_pack = $current_package; $c_pack .= "_disabled" if $ifhandler->{"disabled"}; - if ( /^Summary\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXSUMMARY $c_pack"} = sprintf("%-16s%s","Summary:", $1); - push @oldspec, "XXXSUMMARY $c_pack"; - next; - } - if ( /^Group\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXGROUP $c_pack"} = sprintf("%-16s%s", "Group:", $1); - push @oldspec, "XXXGROUP $c_pack"; - next; - } + if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { next; } - if ( /^Name\s*:\s*(.*)/i ) { - my $orig_name = $1; - my $changed_name = $orig_name; - $changed_name =~ s/\Q$_\E/$definelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$definelist})); - if ($changed_name eq $base_package) { - push @oldspec, sprintf("\n%-16s%s","Name:", $orig_name); - } else { - push @oldspec, sprintf("\n%-16s%s","Name:", $base_package); - } - $definelist->{"%name"} = $base_package if $ifhandler->{"disabled"} == 0; - $definelist->{"%{name}"} = $base_package if $ifhandler->{"disabled"} == 0; - warn ("line is $_, orig_name is $orig_name, base_package is $base_package\n") if $ifhandler->{"disabled"} == 0 && $debug; - next; + # remove default value of Autoreqprov + if ( /^Autoreqprov\s*:\s*(.*)/i ) { + next if ( lc($1) eq "on" || lc($1) eq "yes"); } + # reset Release + if ( /^Release\s*:\s*(.*)/i ) { + # will be after Version + next; + } + if ( /^Summary\s*:\s*(.*)\s*$/i ) { + push @oldspec, sprintf("%-16s%s", "Summary:", $1); + push @oldspec, "XXXPOSTSUMMARY $current_package"; + next; + } + + # remove license and print out after license later + if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { + my $license = replace_spdx($1); + $main_license = $license if (!$main_license); + $seen_licenses{$current_package} = $license; + next; + } + + # remove groups and print out after summary later + if ( /^Group\s*:\s*(.*)\s*$/i ) { + my $group = $1; + $main_group = $group if (!$main_group); + $seen_groups{$current_package} = $group; + next; + } + if ( /^BuildArchitectures\s*:/i ) { $_ =~ s/^[^:]+:/BuildArch:/; } - if ( /^Release\s*:\s*(.*)/i ) { - $pkg_release{$c_pack} = $_; - $replace_hash{"XXXRELEASE $c_pack"} = sprintf("%-16s%s","Release:", $1); - next; - } + if ( /^BuildRoot\s*:/i ) { push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; next; } - if ( /^Copyright\s*:\s*(.*)/i || /^License\s*:\s*(.*)/i ) { - $replace_hash{"XXXLICENSE $c_pack"} = sprintf("%-16s%s","License:", $1); - push @oldspec, "XXXLICENSE $c_pack"; - next; - } - if ( /^Url\s*:\s*(.*)/i ) { - $replace_hash{"XXXURL $c_pack"} = sprintf("%-16s%s","Url:", $1); - push @oldspec, "XXXURL $c_pack"; - next; - } + if ( m/$global_tags_re\s*(.*)/oi ) { my ($tag, $value) = ($1, $2); $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); @@ -431,24 +534,17 @@ sub read_and_parse_old_spec { warn "found Version, section = $current_section\n" if $debug; $version{$c_pack} = $_; $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; - $replace_hash{"XXXVERSION $c_pack"} = sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, $replace_hash{"XXXVERSION $c_pack"}; - push @oldspec, "XXXRELEASE $c_pack"; + push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, sprintf("%-16s%s","Release:", "0"); next; } } - if ( $current_section eq "description" ) { - my $target = $current_package; - $target .= "_$current_lang" if $current_lang; - $target .= "_disabled" if $ifhandler->{"disabled"}; - $replace_hash{"XXXDESCRIPTION $target"} .= "\n" if ( $replace_hash{"XXXDESCRIPTION $target"} ); - $replace_hash{"XXXDESCRIPTION $target"} .= $_; + if ( $current_section ne "changelog" ) { + push @oldspec, $_; next; } - if ( $current_section ne "description" && $current_section ne "changelog" ) { - push @oldspec, $_; - } } + } if ($ARGV[0] eq '--debug') { @@ -518,16 +614,40 @@ if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { read_and_parse_old_spec ( $specfile, $base_package ); -for (@oldspec) { - next unless /^XXX/; - $please_replace{$_} = 1; +my $linesmoved = 1; +while ($linesmoved) { + $linesmoved = 0; + my @firstlines = (); + my @buildrequires = (); + while ($oldspec[0]) { + my $l = shift @oldspec; + if ($l =~ m/^BuildRequires:/ ) { + push(@buildrequires, $l); + } else { + # if there are already buildrequires, we need to sort and exit + if (@buildrequires > 0) { + my @sortedbrs = sort sort_buildrequires_helper @buildrequires; + $linesmoved = !compare_arrays(\@buildrequires, \@sortedbrs); + @oldspec = (@firstlines, @sortedbrs, $l, @oldspec); + @firstlines = (); + @buildrequires = (); + last; + } else { + push(@firstlines, $l); + } + } + } + @oldspec = (@firstlines, @oldspec); } + my $thisyear = localtime->year() + 1900; unshift @copyrights, "# Copyright (c) $thisyear SUSE LINUX Products GmbH, Nuernberg, Germany."; my $copy_list = join("\n", @copyrights); + +print $vim_modeline . "\n" if (defined $vim_modeline); print < Date: Mon, 12 Dec 2011 15:58:19 +0000 Subject: [PATCH 036/151] Accepting request 95751 from openSUSE:Tools baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/95751 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=32 -- 2.51.1 From bdaf16ad49e2c1f4477ee5f95dddcd4da96e2f5045bb99e42c57909aba4f4435 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Dec 2011 14:00:23 +0000 Subject: [PATCH 037/151] - more licenses for SUSE-* OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=33 --- licenses_changes.txt | 7 ++++++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index c2ee98a..ebd97a8 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,4 +1,4 @@ -SPDX Name in Spec File +SPDX Name in Spec File AAL AAL AFL-2.1 Academic Free License 2.1 AGPL-3.0 Affero GPL @@ -138,6 +138,7 @@ EUPL-1.1 EUPL-1.1 MIT Expat MIT Expat License Fair Fair +SUSE-FLTK Fltk SUSE-GFDL-1.1 FDL v1.1 or later SUSE-GFDL-1.2+ FDL-1.2+ SUSE-GFDL-1.3+ FDL-1.3+ @@ -221,7 +222,9 @@ GPL-2.0+ GPLv2+ GPL-3.0 GPLv3 GPL-3.0+ GPLv3+ gSOAP-1.3b gSOAP-1.3b +SUSE-Gnuplot Gnuplot HPND HPND +SUSE-IJG JPEG License IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. @@ -364,3 +367,5 @@ ZPL-2.1 ZPL 2.1 ZPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.0 ZPL-2.1 ZPL-2.1 +SUSE-Firmware Firmware license, redistributable unmodified +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index aedbff9..b66f81d 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 15 13:59:55 UTC 2011 - coolo@suse.com + +- more licenses for SUSE-* + ------------------------------------------------------------------- Mon Dec 12 10:28:57 UTC 2011 - coolo@suse.com -- 2.51.1 From 3c8bc6af572b9b41fcecb525fd17b47b7f47105a8e2b5540bf0df62c1141b6ec Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 08:42:52 +0000 Subject: [PATCH 038/151] - put groups in subpackages unconditionally to leave sle11 support intact OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=34 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index b66f81d..0729f76 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 19 08:40:02 UTC 2011 - coolo@suse.com + +- put groups in subpackages unconditionally to leave sle11 support + intact + ------------------------------------------------------------------- Thu Dec 15 13:59:55 UTC 2011 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 1b3a643..b100e5a 100644 --- a/prepare_spec +++ b/prepare_spec @@ -682,6 +682,8 @@ while ($oldspec[0] eq "XXXBLANKLINE") { my $license_unique = !grep { $_ ne $main_license } values %seen_licenses; my $groups_unique = !grep { $_ ne $main_group } values %seen_groups; +# we need to have unique groups in the spec file as long as we support SLE11 ;( +$groups_unique = 0; my $first_summary = 1; my $line; -- 2.51.1 From 2eb92a676f55cf028641e2c406aa7122455eba5caf88228cf2f74f89621b02c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 20 Dec 2011 09:42:29 +0000 Subject: [PATCH 039/151] increase ci_counter OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=35 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index cf1b31f..a1323de 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -21,7 +21,7 @@ Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0+ Group: Development/Tools/Building Version: 0.4 -Release: 0 +Release: 45 Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file Source1: format_spec_file.service -- 2.51.1 From 2d1afcdbaefb294b34451a11052278ec9fb5274f55306a08a93c2b737c1460ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 20 Dec 2011 09:58:31 +0000 Subject: [PATCH 040/151] increase version to force update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=36 --- obs-service-format_spec_file.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index a1323de..d132ce5 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,8 +20,8 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.4 -Release: 45 +Version: 0.4.1 +Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file Source1: format_spec_file.service -- 2.51.1 From c17ec2f8988dbe0c9b3c589fed30d2c096996e0e6a89162c081e5b4fa9ae06b1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 21 Dec 2011 09:01:39 +0000 Subject: [PATCH 041/151] Accepting request 97066 from openSUSE:Tools baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/97066 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=38 -- 2.51.1 From 4f4f99bb42fb1f9d257cdbef452edb833a129a344dd3431bbe75be33085b9e89 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jan 2012 08:05:06 +0000 Subject: [PATCH 042/151] - update list of licenses as legal team found new cases OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=39 --- licenses_changes.txt | 18 +++++++----------- obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index ebd97a8..073106e 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -97,7 +97,6 @@ CC0-1.0 CC0-1.0 CDDL-1.0 CDDL CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 -CDDL-1.0 or LGPL-2.1 CDDLv1.0 | LGPLv2.1 CECILL-1.0 CECILL-1.0 CECILL-1.1English CECILL-1.1English CECILL-2.0 CECILL-2.0 @@ -139,7 +138,7 @@ MIT Expat MIT Expat License Fair Fair SUSE-FLTK Fltk -SUSE-GFDL-1.1 FDL v1.1 or later +SUSE-GFDL-1.1+ FDL v1.1 or later SUSE-GFDL-1.2+ FDL-1.2+ SUSE-GFDL-1.3+ FDL-1.3+ SUSE-GFDL-1.2+ FDLv1.2+ @@ -174,6 +173,7 @@ LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) LGPL-2.1+ GNU LGPL v2.1 or later LGPL-2.1 GNU LGPLv2.1 +SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception GPL-2.0 GPL 2.0 GPL-3.0 GPL 3 GPL-2.0 GPL v2 @@ -190,24 +190,19 @@ GPL-1.0 GPL-1.0 GPL-1.0+ GPL-1.0+ GPL-2.0 GPL-2 GPL-2.0 GPL-2.0 -GPL-2.0; GPL-2.0+ GPL-2.0 GPL-2.0+ GPL-2.0+ GPL-2.0 or later GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception GPL-2.0-with-font-exception GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -GPL-2.0; GPL-2.0+ GPL-2.0, GPL-2.0+ +SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception GPL-2.0+ GPL-2.0+ -Apache-2.0; GPL-2.0+ GPL-2.0+, Apache-2.0 -GPL-2.0+; LGPL-2.0+ GPL-2.0+,LGPL-2.0+ -GPL-2.0 GPL-2.Ã0 GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 GPL-3.0 GPL-3.0 GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -GPL-3.0; GPL-2.0+ GPL-3.0, GPL-2.0+ GPL-3.0+ GPL-3.0+ GPL-3.0+ GPL-3+ GPL-1.0+ GPL+ @@ -216,7 +211,6 @@ GPL-2.0+ GPL2+ GPL-3.0 GPL3 GPL-1.0+ GPLv1+ GPL-2.0 GPLv2 -GPL-2.0 or GPL-3.0 GPLv2 || GPLv3 GPL-2.0+ GPLv2 or later GPL-2.0+ GPLv2+ GPL-3.0 GPLv3 @@ -238,6 +232,7 @@ LGPL-2.0+ LGPL v2 or later LGPL-2.0 LGPL v2.0 only LGPL-2.0+ LGPL v2.0 or later LGPL-2.1 LGPL v2.1 +SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 LGPL-2.1 LGPL v2.1 only LGPL-2.1+ LGPL v2.1 or later LGPL-2.1+ LGPL v2.1+ @@ -312,7 +307,6 @@ OSL-1.0 OSL-1.0 OSL-2.0 OSL-2.0 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 -Artistic-1.0 or GPL-1.0+ Perl License PHP-3.0.1 PHP License PostgreSQL PostgreSQL SUSE-Public-Domain Public domain @@ -341,6 +335,7 @@ SimPL-2.0 SimPL-2.0 Sleepycat Sleepycat SPL-1.0 SPL-1.0 SugarCRM-1.1.3 SugarCRM-1.1.3 +SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) LPPL-1.3c TeX-License .. Apache-2.0 The Apache Software License PHP-3.0.1 The PHP License, version 3.01 @@ -368,4 +363,5 @@ ZPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.0 ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. \ No newline at end of file +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +Artistic-1.0 or GPL-1.0+ Perl License \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0729f76..2464f26 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 19 08:04:28 UTC 2012 - coolo@suse.com + +- update list of licenses as legal team found new cases + ------------------------------------------------------------------- Mon Dec 19 08:40:02 UTC 2011 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index d132ce5..226557f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 -- 2.51.1 From 360ddbd1c28892578c1777047f0bbe02eea9f1648143ac64e0e6fbc54eec96a1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jan 2012 14:07:38 +0000 Subject: [PATCH 043/151] - confirm license OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=40 --- COPYING | 340 +++++++++++++++++++++++++++ obs-service-format_spec_file.changes | 5 + obs-service-format_spec_file.spec | 6 +- 3 files changed, 349 insertions(+), 2 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..fdca310 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2464f26..c43dae0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 19 14:07:31 UTC 2012 - coolo@suse.com + +- confirm license + ------------------------------------------------------------------- Thu Jan 19 08:04:28 UTC 2012 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 226557f..789546f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -15,10 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard -License: GPL-2.0+ +License: GPL-2.0 Group: Development/Tools/Building Version: 0.4.1 Release: 0 @@ -28,6 +27,7 @@ Source1: format_spec_file.service Source2: prepare_spec Source3: patch_license Source4: licenses_changes.txt +Source100: COPYING Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,6 +44,7 @@ spec file instead of creating a new one. %prep %setup -q -D -T 0 -n . +cp -a %{SOURCE100} . %build @@ -56,6 +57,7 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file. %files %defattr(-,root,root) +%doc COPYING %dir /usr/lib/obs /usr/lib/obs/service -- 2.51.1 From 1330b47bf1d8343db1228827891425dba4646bb4af85c4396ae6b3d01461291e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 20 Jan 2012 13:05:20 +0000 Subject: [PATCH 044/151] trigger service run OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=16 -- 2.51.1 From 49fd3871bbaaccb57777018953b4486f3e4f6f46e9483253afb32c0f25b88492 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 24 Jan 2012 11:19:56 +0000 Subject: [PATCH 045/151] Accepting request 100743 from openSUSE:Tools - confirm license - update list of licenses as legal team found new cases OBS-URL: https://build.opensuse.org/request/show/100743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=17 --- COPYING | 340 +++++++++++++++++++++++++++ licenses_changes.txt | 18 +- obs-service-format_spec_file.changes | 10 + obs-service-format_spec_file.spec | 10 +- 4 files changed, 363 insertions(+), 15 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..fdca310 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/licenses_changes.txt b/licenses_changes.txt index ebd97a8..073106e 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -97,7 +97,6 @@ CC0-1.0 CC0-1.0 CDDL-1.0 CDDL CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 -CDDL-1.0 or LGPL-2.1 CDDLv1.0 | LGPLv2.1 CECILL-1.0 CECILL-1.0 CECILL-1.1English CECILL-1.1English CECILL-2.0 CECILL-2.0 @@ -139,7 +138,7 @@ MIT Expat MIT Expat License Fair Fair SUSE-FLTK Fltk -SUSE-GFDL-1.1 FDL v1.1 or later +SUSE-GFDL-1.1+ FDL v1.1 or later SUSE-GFDL-1.2+ FDL-1.2+ SUSE-GFDL-1.3+ FDL-1.3+ SUSE-GFDL-1.2+ FDLv1.2+ @@ -174,6 +173,7 @@ LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) LGPL-2.1+ GNU LGPL v2.1 or later LGPL-2.1 GNU LGPLv2.1 +SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception GPL-2.0 GPL 2.0 GPL-3.0 GPL 3 GPL-2.0 GPL v2 @@ -190,24 +190,19 @@ GPL-1.0 GPL-1.0 GPL-1.0+ GPL-1.0+ GPL-2.0 GPL-2 GPL-2.0 GPL-2.0 -GPL-2.0; GPL-2.0+ GPL-2.0 GPL-2.0+ GPL-2.0+ GPL-2.0 or later GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception GPL-2.0-with-font-exception GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -GPL-2.0; GPL-2.0+ GPL-2.0, GPL-2.0+ +SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception GPL-2.0+ GPL-2.0+ -Apache-2.0; GPL-2.0+ GPL-2.0+, Apache-2.0 -GPL-2.0+; LGPL-2.0+ GPL-2.0+,LGPL-2.0+ -GPL-2.0 GPL-2.Ã0 GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 GPL-3.0 GPL-3.0 GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -GPL-3.0; GPL-2.0+ GPL-3.0, GPL-2.0+ GPL-3.0+ GPL-3.0+ GPL-3.0+ GPL-3+ GPL-1.0+ GPL+ @@ -216,7 +211,6 @@ GPL-2.0+ GPL2+ GPL-3.0 GPL3 GPL-1.0+ GPLv1+ GPL-2.0 GPLv2 -GPL-2.0 or GPL-3.0 GPLv2 || GPLv3 GPL-2.0+ GPLv2 or later GPL-2.0+ GPLv2+ GPL-3.0 GPLv3 @@ -238,6 +232,7 @@ LGPL-2.0+ LGPL v2 or later LGPL-2.0 LGPL v2.0 only LGPL-2.0+ LGPL v2.0 or later LGPL-2.1 LGPL v2.1 +SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 LGPL-2.1 LGPL v2.1 only LGPL-2.1+ LGPL v2.1 or later LGPL-2.1+ LGPL v2.1+ @@ -312,7 +307,6 @@ OSL-1.0 OSL-1.0 OSL-2.0 OSL-2.0 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 -Artistic-1.0 or GPL-1.0+ Perl License PHP-3.0.1 PHP License PostgreSQL PostgreSQL SUSE-Public-Domain Public domain @@ -341,6 +335,7 @@ SimPL-2.0 SimPL-2.0 Sleepycat Sleepycat SPL-1.0 SPL-1.0 SugarCRM-1.1.3 SugarCRM-1.1.3 +SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) LPPL-1.3c TeX-License .. Apache-2.0 The Apache Software License PHP-3.0.1 The PHP License, version 3.01 @@ -368,4 +363,5 @@ ZPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.0 ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. \ No newline at end of file +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +Artistic-1.0 or GPL-1.0+ Perl License \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0729f76..c43dae0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 19 14:07:31 UTC 2012 - coolo@suse.com + +- confirm license + +------------------------------------------------------------------- +Thu Jan 19 08:04:28 UTC 2012 - coolo@suse.com + +- update list of licenses as legal team found new cases + ------------------------------------------------------------------- Mon Dec 19 08:40:02 UTC 2011 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index cf1b31f..789546f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,12 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard -License: GPL-2.0+ +License: GPL-2.0 Group: Development/Tools/Building -Version: 0.4 +Version: 0.4.1 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file @@ -28,6 +27,7 @@ Source1: format_spec_file.service Source2: prepare_spec Source3: patch_license Source4: licenses_changes.txt +Source100: COPYING Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,6 +44,7 @@ spec file instead of creating a new one. %prep %setup -q -D -T 0 -n . +cp -a %{SOURCE100} . %build @@ -56,6 +57,7 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file. %files %defattr(-,root,root) +%doc COPYING %dir /usr/lib/obs /usr/lib/obs/service -- 2.51.1 From c8748925b1cc3b0022b5b82b66680dd9579452d3b5d7e79555a3d019baeb658e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 24 Jan 2012 11:20:04 +0000 Subject: [PATCH 046/151] Accepting request 100743 from openSUSE:Tools baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/100743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=42 -- 2.51.1 From 25238dbff1f7e0f65b9d5a4315f0144a8147f5e125a89360d9607b5fbe51f6a9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 25 Jan 2012 08:18:38 +0000 Subject: [PATCH 047/151] - another update from license list OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=43 --- licenses_changes.txt | 6 +++++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 073106e..0bfbe15 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -18,6 +18,7 @@ Apache-2.0 Apache License 2.0 Apache-2.0 Apache License, Version 2.0 Apache-2.0 Apache Software License .. Apache-2.0 Apache Software License +Apache-2.0 Apache Software License, Version 2.0 Apache-2.0 Apache v2.0 Apache-1.0 Apache-1.0 Apache-1.1 Apache-1.1 @@ -202,6 +203,7 @@ GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 GPL-3.0 GPL-3.0 GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception GPL-3.0+ GPL-3.0+ GPL-3.0+ GPL-3+ @@ -313,6 +315,7 @@ SUSE-Public-Domain Public domain SUSE-Public-Domain Public Domain SUSE-Public-Domain Public Domain, Freeware SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) Python-2.0 Python Python-2.0 Python .. Python-2.0 Python Copyright @@ -364,4 +367,5 @@ ZPL-2.0 ZPL-2.0 ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. -Artistic-1.0 or GPL-1.0+ Perl License \ No newline at end of file +Artistic-1.0 or GPL-1.0+ Perl License +SUSE-NonFree NonFree licenses \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c43dae0..4bdc99a 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 08:18:28 UTC 2012 - coolo@suse.com + +- another update from license list + ------------------------------------------------------------------- Thu Jan 19 14:07:31 UTC 2012 - coolo@suse.com -- 2.51.1 From 5dbb1cdd48388e91a0c6ee3dca5ad6c975d4dff7f5d630a18d07d5062bc554a6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 25 Jan 2012 08:45:08 +0000 Subject: [PATCH 048/151] trigger service run OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=44 -- 2.51.1 From 11e68ba570f967e4700153841a4ae8c0faa813e7edd7a415a73b0eb1eb68808a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 3 Feb 2012 09:24:06 +0000 Subject: [PATCH 049/151] - fix php license OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=47 --- licenses_changes.txt | 7 +++++-- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 0bfbe15..7700dae 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,4 +1,4 @@ -SPDX Name in Spec File +New format (spdx.org) Old format (fedora, PDB, etc) AAL AAL AFL-2.1 Academic Free License 2.1 AGPL-3.0 Affero GPL @@ -198,6 +198,8 @@ GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception GPL-2.0-with-font-exception GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception +SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception +SUSE-GPL-3.0+-with-openssl-exception GPLv2+ with openssl linking exception GPL-2.0+ GPL-2.0+ GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 @@ -309,7 +311,8 @@ OSL-1.0 OSL-1.0 OSL-2.0 OSL-2.0 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 -PHP-3.0.1 PHP License +PHP-3.01 PHP License +PHP-3.01 PHP-3.0.1 PostgreSQL PostgreSQL SUSE-Public-Domain Public domain SUSE-Public-Domain Public Domain diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4bdc99a..a47f3cc 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 3 09:23:51 UTC 2012 - coolo@suse.com + +- fix php license + ------------------------------------------------------------------- Wed Jan 25 08:18:28 UTC 2012 - coolo@suse.com -- 2.51.1 From 658a744b0e121a40583d1edef88a4146a190de439a178a51cec7c54e209a11c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 4 Feb 2012 09:36:01 +0000 Subject: [PATCH 050/151] handl OUTDIR=/space/openSUSE:Tools/obs-service-format_spec_file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=50 --- format_spec_file | 15 ++++++++++++--- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/format_spec_file b/format_spec_file index 1554799..365065b 100644 --- a/format_spec_file +++ b/format_spec_file @@ -31,9 +31,18 @@ for i in $MYSPECFILES; do echo "WARNING: no spec file found" exit 0 fi - /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 - # remove all file files which are indendical to committed files - cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" + if /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i.$$"; then + # remove all file files which are indendical to committed files + # be carefull for the case that $MYOUDIR is local dir + if cmp -s "$i" "$MYOUTDIR/$i.$$"; then + rm "$MYOUTDIR/$i.$$" + else + mv "$MYOUTDIR/$i.$$" "$MYOUTDIR/$i" + fi + else + rm "$MYOUTDIR/$i.$$" + RETURN=1 + fi done exit $RETURN diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a47f3cc..50712d8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 4 09:35:13 UTC 2012 - adrian@suse.de + +- handle failing prepare_spec when $OUTDIR=$PWD correct + ------------------------------------------------------------------- Fri Feb 3 09:23:51 UTC 2012 - coolo@suse.com -- 2.51.1 From 9d3b0c189e5f004133ce6d63a23596238f0aba5647724ada00d632d57a1567a9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 4 Feb 2012 09:36:14 +0000 Subject: [PATCH 051/151] fix description OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=51 --- licenses_changes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 7700dae..aaf8a26 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -199,7 +199,7 @@ GPL-2.0-with-font-exception GPL-2.0-with-font-exception GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-3.0+-with-openssl-exception GPLv2+ with openssl linking exception +SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception GPL-2.0+ GPL-2.0+ GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 @@ -371,4 +371,4 @@ ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses \ No newline at end of file +SUSE-NonFree NonFree licenses -- 2.51.1 From 0b5d3d0a9c8709a16c1d8655b236805141ed99f8ba1e989596dbe25cdb611993 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 6 Feb 2012 12:33:35 +0000 Subject: [PATCH 052/151] - one more update for php-2.0 and osl-1.1 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=54 --- licenses_changes.txt | 4 +++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index aaf8a26..896e06e 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -308,9 +308,11 @@ OFL-1.1 Open Font License OLDAP-2.8 openldap 2.8 OpenSSL OpenSSL OSL-1.0 OSL-1.0 +SUSE-OSL-1.1 OSL-1.1 OSL-2.0 OSL-2.0 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 +SUSE-PHP-2.02 PHP 2.02 PHP-3.01 PHP License PHP-3.01 PHP-3.0.1 PostgreSQL PostgreSQL @@ -371,4 +373,4 @@ ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses +SUSE-NonFree NonFree licenses \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 50712d8..c1fe3b7 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 6 12:33:12 UTC 2012 - coolo@suse.com + +- one more update for php-2.0 and osl-1.1 + ------------------------------------------------------------------- Sat Feb 4 09:35:13 UTC 2012 - adrian@suse.de -- 2.51.1 From e34b4c337cc85fe9089ab71c25fbf1054228a05b0004eb4e77ddead2505b6ca0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 9 Feb 2012 10:36:17 +0000 Subject: [PATCH 053/151] - fix the whitespace after the preamble OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=57 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c1fe3b7..3ad932c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 9 10:36:01 UTC 2012 - coolo@suse.com + +- fix the whitespace after the preamble + ------------------------------------------------------------------- Mon Feb 6 12:33:12 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index b100e5a..2c4756a 100644 --- a/prepare_spec +++ b/prepare_spec @@ -674,12 +674,14 @@ print "# needsrootforbuild\n" if $needsrootforbuild; print "# needsbinariesforbuild\n" if $needsbinariesforbuild; print "# nodebuginfo\n" if $nodebuginfo; print "# icecream $icecreamforbuild\n" if $icecreamforbuild ne ''; -print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne ''); +#print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne ''); -while ($oldspec[0] eq "XXXBLANKLINE") { +while ($oldspec[0] eq "XXXBLANKLINE" || $oldspec[0] eq "XXXDOUBLELINE") { shift @oldspec; } +print "\n\n"; + my $license_unique = !grep { $_ ne $main_license } values %seen_licenses; my $groups_unique = !grep { $_ ne $main_group } values %seen_groups; # we need to have unique groups in the spec file as long as we support SLE11 ;( @@ -689,6 +691,7 @@ my $first_summary = 1; my $line; while (@oldspec) { $line = shift @oldspec; + if ($line eq "XXXBLANKLINE") { print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); } elsif ($line eq "XXXDOUBLELINE") { -- 2.51.1 From 858a139153a3d1364370fdc04248cdbef0a3053a49f56f63c933e511b2b6a3f7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 9 Feb 2012 14:32:59 +0000 Subject: [PATCH 054/151] - even more legal updates OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=58 --- licenses_changes.txt | 7 +++++-- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 896e06e..4aa3a09 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -298,6 +298,7 @@ NGPL NGPL Nokia Nokia NPOSL-3.0 NPOSL-3.0 NTP NTP +SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice OCLC-2.0 OCLC-2.0 ODbL-1.0 ODbL-1.0 OFL-1.1 OFL @@ -339,6 +340,7 @@ SAX-PD SAX-PD IPA see IPA_Font_License_Agreement_v1.0.txt OFL-1.1 SIL Open Font License OFL-1.1 SIL Open Font License 1.1 +SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SimPL-2.0 SimPL-2.0 Sleepycat Sleepycat SPL-1.0 SPL-1.0 @@ -346,7 +348,7 @@ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) LPPL-1.3c TeX-License .. Apache-2.0 The Apache Software License -PHP-3.0.1 The PHP License, version 3.01 +PHP-3.01 The PHP License, version 3.01 VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License @@ -373,4 +375,5 @@ ZPL-2.1 ZPL-2.1 SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses \ No newline at end of file +SUSE-NonFree NonFree licenses +SUSE:NON-OSI-COMPLIANT:GPL-2.0-with-trademark-clause-with-exceptions LiberationFontsLicense \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 3ad932c..332fd8d 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 9 14:32:43 UTC 2012 - coolo@suse.com + +- even more legal updates + ------------------------------------------------------------------- Thu Feb 9 10:36:01 UTC 2012 - coolo@suse.com -- 2.51.1 From 808076ca3a6205b86cb755e64e0471d9f046fe1a7399ac5c534a0bd6864bbe59 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Feb 2012 11:05:53 +0000 Subject: [PATCH 055/151] - even more legal updates OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=61 --- licenses_changes.txt | 5 ++++- obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 4aa3a09..0a26f3b 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -115,6 +115,7 @@ CPL-1.0 CPL 1.0 CPL-1.0 CPL 1.0 ... CPL-1.0 CPL-1.0 CUA-OPL-1.0 CUA-OPL-1.0 +SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) ECL-1.0 ECL-1.0 ECL-2.0 ECL-2.0 EPL-1.0 Eclipse Public License @@ -221,8 +222,10 @@ GPL-3.0 GPLv3 GPL-3.0+ GPLv3+ gSOAP-1.3b gSOAP-1.3b SUSE-Gnuplot Gnuplot +SUSE-Freetype Freetype HPND HPND SUSE-IJG JPEG License +SUSE-ImageMagick ImageMagick IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. @@ -376,4 +379,4 @@ SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License SUSE-NonFree NonFree licenses -SUSE:NON-OSI-COMPLIANT:GPL-2.0-with-trademark-clause-with-exceptions LiberationFontsLicense \ No newline at end of file +SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) \ No newline at end of file diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 332fd8d..6761f38 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 14 11:05:24 UTC 2012 - coolo@suse.com + +- even more legal updates + ------------------------------------------------------------------- Thu Feb 9 14:32:43 UTC 2012 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 789546f..e442aba 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 -- 2.51.1 From 11c004c4e41f9547c1ba0065c7935cd4af03aae44bdebf18ef89996e500d7ca8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 20 Feb 2012 08:16:23 +0000 Subject: [PATCH 056/151] - not only break buildrequires per (sorted) line, but also Requires and Provides OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=63 --- obs-service-format_spec_file.changes | 6 ++++ prepare_spec | 43 ++++++++++++++++------------ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6761f38..e4610cf 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 20 08:15:52 UTC 2012 - coolo@suse.com + +- not only break buildrequires per (sorted) line, but also + Requires and Provides + ------------------------------------------------------------------- Tue Feb 14 11:05:24 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 2c4756a..24ddfbb 100644 --- a/prepare_spec +++ b/prepare_spec @@ -230,7 +230,7 @@ sub set_current_pkg { return ($curpack, $curlang); } -sub sort_buildrequires_helper { +sub sort_tags_helper { if (($a =~ /^[^#]*\(/) != ($b =~ /^[^#]*\(/)) { if ($a =~ /^[^#]*\(/) { 1; @@ -317,18 +317,23 @@ sub read_and_parse_old_spec { $_ =~ s/%{?epoch}?[:-]//g; $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); - if ( /^BuildRequires:/ ) { - my $cur_buildreq = $_; - $cur_buildreq =~ s/^BuildRequires:\s*//; + if ( /^BuildRequires:/i || /^Requires:/i || /^Provides:/i ) { + my $cur_tag = $_; + my $tag = ''; + if (m/^(\S+):\s*(.*)$/) { + $tag = $1; + $cur_tag = $2; + } + my %aa; - while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { $aa{$1}=1; } # ignore line if it looks like a "usedforbuild" line, i.e. # if it contains too many base packages next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - for my $br (sort keys(%aa)) { - push @oldspec, "BuildRequires: $br"; + for my $value (sort keys(%aa)) { + push (@oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value)); } next; } @@ -617,23 +622,24 @@ if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { read_and_parse_old_spec ( $specfile, $base_package ); -my $linesmoved = 1; -while ($linesmoved) { +for my $tag (qw(BuildRequires Requires Provides)) { + my $linesmoved = 1; + while ($linesmoved) { $linesmoved = 0; my @firstlines = (); - my @buildrequires = (); + my @tags = (); while ($oldspec[0]) { my $l = shift @oldspec; - if ($l =~ m/^BuildRequires:/ ) { - push(@buildrequires, $l); + if ($l =~ m/^$tag:/ ) { + push(@tags, $l); } else { - # if there are already buildrequires, we need to sort and exit - if (@buildrequires > 0) { - my @sortedbrs = sort sort_buildrequires_helper @buildrequires; - $linesmoved = !compare_arrays(\@buildrequires, \@sortedbrs); - @oldspec = (@firstlines, @sortedbrs, $l, @oldspec); + # if there are already tags, we need to sort and exit + if (@tags > 0) { + my @sortedtags = sort sort_tags_helper @tags; + $linesmoved = !compare_arrays(\@tags, \@sortedtags); + @oldspec = (@firstlines, @sortedtags, $l, @oldspec); @firstlines = (); - @buildrequires = (); + @tags = (); last; } else { push(@firstlines, $l); @@ -641,6 +647,7 @@ while ($linesmoved) { } } @oldspec = (@firstlines, @oldspec); + } } -- 2.51.1 From b2c2cb85efbb40dae1bd3cec789d02bc36a30b59541c16d99d8990e8e400ec73 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 20 Feb 2012 13:19:27 +0000 Subject: [PATCH 057/151] - fix sorting of tag lines that are not on the beginning of the file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=64 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index e4610cf..b2e50a9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 20 13:19:09 UTC 2012 - coolo@suse.com + +- fix sorting of tag lines that are not on the beginning of the file + ------------------------------------------------------------------- Mon Feb 20 08:15:52 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 24ddfbb..5c48ee0 100644 --- a/prepare_spec +++ b/prepare_spec @@ -624,7 +624,7 @@ read_and_parse_old_spec ( $specfile, $base_package ); for my $tag (qw(BuildRequires Requires Provides)) { my $linesmoved = 1; - while ($linesmoved) { + sortcycle: while ($linesmoved) { $linesmoved = 0; my @firstlines = (); my @tags = (); @@ -637,10 +637,16 @@ for my $tag (qw(BuildRequires Requires Provides)) { if (@tags > 0) { my @sortedtags = sort sort_tags_helper @tags; $linesmoved = !compare_arrays(\@tags, \@sortedtags); - @oldspec = (@firstlines, @sortedtags, $l, @oldspec); - @firstlines = (); - @tags = (); - last; + if ($linesmoved) { + @oldspec = (@firstlines, @sortedtags, $l, @oldspec); + @firstlines = (); + @tags = (); + next sortcycle; + } else { + @firstlines = (@firstlines, @tags, $l); + @tags = (); + next; + } } else { push(@firstlines, $l); } -- 2.51.1 From 8e24cb4db3f7ec592009c4ee84b26c40291b41c00fda492ed6aa9912f05bcfd6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 24 Feb 2012 09:49:42 +0000 Subject: [PATCH 058/151] - don't stop sorting at empty lines in %description - fix indenting of the script OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=66 --- obs-service-format_spec_file.changes | 6 + obs-service-format_spec_file.spec | 2 +- prepare_spec | 533 +++++++++++++-------------- 3 files changed, 271 insertions(+), 270 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index b2e50a9..13f009c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 24 09:48:57 UTC 2012 - coolo@suse.com + +- don't stop sorting at empty lines in %description +- fix indenting of the script + ------------------------------------------------------------------- Mon Feb 20 13:19:09 UTC 2012 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e442aba..dd0eb07 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,7 +30,7 @@ Source3: patch_license Source4: licenses_changes.txt Source100: COPYING Requires: osc-source_validator -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description diff --git a/prepare_spec b/prepare_spec index 5c48ee0..2e77a6e 100644 --- a/prepare_spec +++ b/prepare_spec @@ -34,51 +34,49 @@ my $ifhandler; my $definelist; my $debug = 0; -my @global_tags_list = -( - 'Autoreq', - 'Autoreqprov', - 'BuildArch', - 'BuildArchitectures', - 'BuildRequires', - 'Conflicts', - 'DocDir', - 'Enhances', - 'Enhances', - 'EssentialFor', - 'ExcludeArch', - 'ExclusiveArch', - 'Freshens', - 'Group', - 'Name', - 'NoPatch', - 'NoSource', - 'Obsoletes', - 'Patch\d*', - 'Prefix', - 'PreReq', - 'Provides', - 'Recommends', - 'Requires', - 'Source\d*', - 'Suggests', - 'Summary', - 'Supplements', - 'Url', +my @global_tags_list = ( + 'Autoreq', + 'Autoreqprov', + 'BuildArch', + 'BuildArchitectures', + 'BuildRequires', + 'Conflicts', + 'DocDir', + 'Enhances', + 'Enhances', + 'EssentialFor', + 'ExcludeArch', + 'ExclusiveArch', + 'Freshens', + 'Group', + 'Name', + 'NoPatch', + 'NoSource', + 'Obsoletes', + 'Patch\d*', + 'Prefix', + 'PreReq', + 'Provides', + 'Recommends', + 'Requires', + 'Source\d*', + 'Suggests', + 'Summary', + 'Supplements', + 'Url', ); my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . - 'description|files|triggerin|triggerun|triggerpostun)\b'; + 'description|files|triggerin|triggerun|triggerpostun)\b'; sub unify { my %h = map {$_ => 1} @_; return grep(delete($h{$_}), @_); } -sub capitalize_case($) -{ +sub capitalize_case($) { my ($tag) = @_; $tag = lc($tag); @@ -95,22 +93,22 @@ sub capitalize_case($) } sub compare_arrays { - my ($first, $second) = @_; - return 0 unless @$first == @$second; - for (my $i = 0; $i < @$first; $i++) { - return 0 if $first->[$i] ne $second->[$i]; - } - return 1; -} - -sub maybe_add_empty_line() -{ - push @oldspec, "XXXBLANKLINE" - if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); + my ($first, $second) = @_; + return 0 unless @$first == @$second; + for (my $i = 0; $i < @$first; $i++) { + return 0 if $first->[$i] ne $second->[$i]; + } + return 1; } -sub change_section($) -{ +sub maybe_add_empty_line() { + return if $current_section eq "description"; + + push @oldspec, "XXXBLANKLINE" + if ($oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); +} + +sub change_section($) { my ($new_section) = @_; maybe_add_empty_line(); @@ -122,91 +120,87 @@ sub change_section($) my %license_replace = (); use File::Basename; -sub load_license_map() -{ - return if defined $license_replace{"GPL-2.0"}; - my $scriptdir = File::Basename::dirname($0); - open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; - # ignore header - readline(*MAP); - my %spdx; - while () { - chomp; - my ($license, $oldstring) = split(/\t/, $_, 2); - #$license =~ s,\s*$,,; - #$oldstring =~ s,\s*$,,; - next unless length($license); - #print STDERR "$license\t$oldstring\n"; - die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; - $license_replace{$oldstring} = $license; - $spdx{$license} = 1; - } - close(MAP); - for (keys %spdx) { - $license_replace{$_} = $_; - } +sub load_license_map() { + return if defined $license_replace{"GPL-2.0"}; + my $scriptdir = File::Basename::dirname($0); + open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; + # ignore header + readline(*MAP); + my %spdx; + while () { + chomp; + my ($license, $oldstring) = split(/\t/, $_, 2); + #$license =~ s,\s*$,,; + #$oldstring =~ s,\s*$,,; + next unless length($license); + #print STDERR "$license\t$oldstring\n"; + die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; + $license_replace{$oldstring} = $license; + $spdx{$license} = 1; + } + close(MAP); + for (keys %spdx) { + $license_replace{$_} = $_; + } } -sub replace_single_spdx($) -{ - my ($l) = @_; +sub replace_single_spdx($) { + my ($l) = @_; - return '' if $l eq ''; + return '' if $l eq ''; - load_license_map(); - $l =~ s,ORlater,or later,g; - $l =~ s,ORsim,or similar,g; - $l =~ s,^\s+,,; - $l =~ s,\s+$,,; + load_license_map(); + $l =~ s,ORlater,or later,g; + $l =~ s,ORsim,or similar,g; + $l =~ s,^\s+,,; + $l =~ s,\s+$,,; - if (defined $license_replace{$l}) { - $l = $license_replace{$l}; - } else { - print STDERR "Unknown license '$l'\n"; - } - return $l; + if (defined $license_replace{$l}) { + $l = $license_replace{$l}; + } else { + print STDERR "Unknown license '$l'\n"; + } + return $l; } sub replace_spdx_and($); -sub replace_spdx_and($) -{ - my ($license) = @_; +sub replace_spdx_and($) { + my ($license) = @_; - # special case as or later is common in our spec files - $license =~ s,or later,ORlater,g; - $license =~ s,or similar,ORsim,g; - - #print STDERR "ORIG '$license'\n"; - my @licenses = (); - if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { - my ($head, $paren, $tail) = ($1, $2, $3); - if ($paren =~ /and|or/) { - $head = replace_spdx_and($head); - $tail = replace_spdx_and($tail); - $paren = replace_spdx_and($paren); - #print STDERR "AFTE '$head($paren)$tail'\n"; - return "$head($paren)$tail"; - } - } + # special case as or later is common in our spec files + $license =~ s,or later,ORlater,g; + $license =~ s,or similar,ORsim,g; - for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { - $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; - s/\s+/ /g; - push @licenses, $_; + #print STDERR "ORIG '$license'\n"; + my @licenses = (); + if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { + my ($head, $paren, $tail) = ($1, $2, $3); + if ($paren =~ /and|or/) { + $head = replace_spdx_and($head); + $tail = replace_spdx_and($tail); + $paren = replace_spdx_and($paren); + #print STDERR "AFTE '$head($paren)$tail'\n"; + return "$head($paren)$tail"; } - #print STDERR "AFTE '" . join('', @licenses) . "'\n"; - return join('', @licenses); + } + + for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + s/\s+/ /g; + push @licenses, $_; + } + #print STDERR "AFTE '" . join('', @licenses) . "'\n"; + return join('', @licenses); } -sub replace_spdx($) -{ - my ($license) = @_; +sub replace_spdx($) { + my ($license) = @_; - my @licenses = (); - for (split(/\s*;\s*/, $license)) { - push @licenses, replace_spdx_and($_); - } - return join(' ; ', @licenses); + my @licenses = (); + for (split(/\s*;\s*/, $license)) { + push @licenses, replace_spdx_and($_); + } + return join(' ; ', @licenses); } sub set_current_pkg { @@ -262,80 +256,80 @@ sub read_and_parse_old_spec { $_ = shift @readspec; if ( /^\s*$/ && $current_section ne "description") { - # stop preamble parsing on two blank lines - if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { - $print_comments = "true"; - push @oldspec, "XXXDOUBLELINE"; - next; - } - push @oldspec, "XXXBLANKLINE"; + # stop preamble parsing on two blank lines + if ($print_comments eq "false" && + $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { + $print_comments = "true"; + push @oldspec, "XXXDOUBLELINE"; next; + } + push @oldspec, "XXXBLANKLINE"; + next; } if ( /^# vim:/ ) { - $vim_modeline = $_; - next; + $vim_modeline = $_; + next; } - + if ( /^#\s*needsrootforbuild\s*$/ ) { - $needsrootforbuild = 1; - next; + $needsrootforbuild = 1; + next; } if ( /^#\s*needsbinariesforbuild\s*$/ ) { - $needsbinariesforbuild = 1; - next; + $needsbinariesforbuild = 1; + next; } if ( /^#\s*norootforbuild/ ) { - next; + next; } if ( /^#\s*nodebuginfo\s*$/ ) { - $nodebuginfo = 1; - next; + $nodebuginfo = 1; + next; } if ( /^#\s*icecream/ ) { - $icecreamforbuild = $_; - $icecreamforbuild =~ s/^#\s*icecream\s*//; - next; + $icecreamforbuild = $_; + $icecreamforbuild =~ s/^#\s*icecream\s*//; + next; } if ( /^#\s*Copyright\s*/ ) { - my $lastlineblank = 0; - for (;;) - { - # check if line is ONLY a standard copyright line, if so, ignore. - my $c = $_; - $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; - push(@copyrights, $_) if length $c > 5; - last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ - || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); - $_ = shift @readspec; - } - next; + my $lastlineblank = 0; + for (;;) { + # check if line is ONLY a standard copyright line, if so, ignore. + my $c = $_; + $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; + push(@copyrights, $_) if length $c > 5; + last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ + || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); + $_ = shift @readspec; + } + next; } # evil epoch removal next if ( /^Epoch:/ ); $_ =~ s/%{?epoch}?[:-]//g; $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); - if ( /^BuildRequires:/i || /^Requires:/i || /^Provides:/i ) { - my $cur_tag = $_; - my $tag = ''; - if (m/^(\S+):\s*(.*)$/) { - $tag = $1; - $cur_tag = $2; - } - - my %aa; - while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { - $aa{$1}=1; - } - # ignore line if it looks like a "usedforbuild" line, i.e. - # if it contains too many base packages - next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - for my $value (sort keys(%aa)) { - push (@oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value)); - } - next; + if ( /^BuildRequires:/i || /^Requires:/i || /^Provides:/i || /^Obsoletes:/i ) { + my $cur_tag = $_; + my $tag = ''; + if (m/^(\S+):\s*(.*)$/) { + $tag = $1; + $cur_tag = $2; + } + + my %aa; + while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + $aa{$1}=1; + } + # ignore line if it looks like a "usedforbuild" line, i.e. + # if it contains too many base packages + next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; + for my $value (sort keys(%aa)) { + push (@oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value)); + } + next; } next if ( /^#\s*usedforbuild/ ); if ( /^%\?__\*BuildRequires:/ ) { @@ -354,14 +348,14 @@ sub read_and_parse_old_spec { if ( /^#/ && $current_section ne "description") { warn "$_ $current_section\n" if $debug; if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { - push @oldspec, $_; + push @oldspec, $_; } next; } if ( /^%debug_package/ ) { - # remove, we add this ourselves - next; + # remove, we add this ourselves + next; } $print_comments = "true" unless /^#/; @@ -380,42 +374,42 @@ sub read_and_parse_old_spec { $ifhandler->{"depth"}++; my $if_not = 0; if ( $args[1] =~ /^\!/ ) { - $args[1] =~ s/^\!//; - $if_not = 1; + $args[1] =~ s/^\!//; + $if_not = 1; } $args[2] = "" unless $args[2]; if ( ($args[1] eq "0") - || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) - || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) - || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") - || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { - $ifhandler->{"disabled"} = $ifhandler->{"depth"}; - $ifhandler->{"last_if_disabled"} = 1; + || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) + || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) + || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") + || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") + || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { + $ifhandler->{"disabled"} = $ifhandler->{"depth"}; + $ifhandler->{"last_if_disabled"} = 1; } } elsif ( /^\s*%if/ ) { $ifhandler->{"last_if_disabled"} = 0; - $ifhandler->{"last_if_if"} = 0; + $ifhandler->{"last_if_if"} = 0; $ifhandler->{"depth"}++; } elsif ( /^\s*%endif/ ) { $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; $ifhandler->{"depth"}--; } elsif ( /^\s*%else/ ) { if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { - $ifhandler->{"disabled"} = 0; + $ifhandler->{"disabled"} = 0; } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { - $ifhandler->{"disabled"} = 1; + $ifhandler->{"disabled"} = 1; } } elsif ( /^\s*%define\s/ ) { my @args = split (/\s+/,$_); $_ =~ s/[\{\}\"]//g for (@args); $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { - $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; + $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; } while ($_ =~ /\\$/) { $_ = shift @readspec; @@ -432,11 +426,11 @@ sub read_and_parse_old_spec { } $_ =~ s/^(%\w+)/lc($1)/e; if ($debug) { - warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); + warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); } push @oldspec, $_; for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { - $_ =~ s/\Q$xx\E/$definelist->{$xx}/; + $_ =~ s/\Q$xx\E/$definelist->{$xx}/; } $_ =~ s/%{\?[^\}]*}//; if ($debug) { @@ -461,7 +455,7 @@ sub read_and_parse_old_spec { } if ( /^%changelog\b/i ) { change_section("changelog"); - # changelog comes always from *.changes. Skip what is in spec file + # changelog comes always from *.changes. Skip what is in spec file # at the moment. next; } @@ -471,8 +465,8 @@ sub read_and_parse_old_spec { } if ( /^%/ ) { if ( m/$section_tags_re/oi ) { - $_ =~ s/^(%\w+)/lc($1)/e; - change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); + $_ =~ s/^(%\w+)/lc($1)/e; + change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); change_section("build") if m/\s*%build/i; warn "changed to $current_section for $_\n" if $debug; } @@ -486,65 +480,65 @@ sub read_and_parse_old_spec { $c_pack .= "_disabled" if $ifhandler->{"disabled"}; if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { - next; + next; } # remove default value of Autoreqprov if ( /^Autoreqprov\s*:\s*(.*)/i ) { - next if ( lc($1) eq "on" || lc($1) eq "yes"); + next if ( lc($1) eq "on" || lc($1) eq "yes"); } # reset Release if ( /^Release\s*:\s*(.*)/i ) { - if ($1 !~ m/^[0-9]*$/ && $oldspec[-1] eq "XXXRELEASE") { - pop @oldspec; - push @oldspec, sprintf("%-16s%s","Release:", $1); - } - # will be after Version - next; + if ($1 !~ m/^[0-9]*$/ && $oldspec[-1] eq "XXXRELEASE") { + pop @oldspec; + push @oldspec, sprintf("%-16s%s","Release:", $1); + } + # will be after Version + next; } if ( /^Summary\s*:\s*(.*)\s*$/i ) { - push @oldspec, sprintf("%-16s%s", "Summary:", $1); - push @oldspec, "XXXPOSTSUMMARY $current_package"; - next; + push @oldspec, sprintf("%-16s%s", "Summary:", $1); + push @oldspec, "XXXPOSTSUMMARY $current_package"; + next; } # remove license and print out after license later if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { - my $license = replace_spdx($1); - $main_license = $license if (!$main_license); - $seen_licenses{$current_package} = $license; - next; + my $license = replace_spdx($1); + $main_license = $license if (!$main_license); + $seen_licenses{$current_package} = $license; + next; } # remove groups and print out after summary later if ( /^Group\s*:\s*(.*)\s*$/i ) { - my $group = $1; - $main_group = $group if (!$main_group); - $seen_groups{$current_package} = $group; - next; + my $group = $1; + $main_group = $group if (!$main_group); + $seen_groups{$current_package} = $group; + next; } if ( /^BuildArchitectures\s*:/i ) { - $_ =~ s/^[^:]+:/BuildArch:/; + $_ =~ s/^[^:]+:/BuildArch:/; } if ( /^BuildRoot\s*:/i ) { - push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; - next; + push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; + next; } if ( m/$global_tags_re\s*(.*)/oi ) { - my ($tag, $value) = ($1, $2); - $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); - push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); - next; + my ($tag, $value) = ($1, $2); + $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); + push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); + next; } if ( /^Version:/ ) { warn "found Version, section = $current_section\n" if $debug; - $version{$c_pack} = $_; - $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; - push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, "XXXRELEASE"; - next; + $version{$c_pack} = $_; + $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; + push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, "XXXRELEASE"; + next; } } if ( $current_section ne "changelog" ) { @@ -595,8 +589,8 @@ while ( ) { $base_package =~ s/^\s*Name:\s*(\S*)\s*/$1/; $base_package =~ s/\Q$_\E/$xdefinelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$xdefinelist})); if ($debug) { - warn "DEBUG: base_package = $base_package\n"; - warn Dumper($xdefinelist); + warn "DEBUG: base_package = $base_package\n"; + warn Dumper($xdefinelist); } last; } @@ -608,6 +602,7 @@ warn ("base_package is $base_package\n") if $debug; if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { $base_package =~ s/[0-9]$//; } + if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { $base_package =~ s/\-[^\-]*$//; } @@ -622,38 +617,38 @@ if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { read_and_parse_old_spec ( $specfile, $base_package ); -for my $tag (qw(BuildRequires Requires Provides)) { - my $linesmoved = 1; +for my $tag (qw(BuildRequires Requires Provides Obsoletes)) { + my $linesmoved = 1; sortcycle: while ($linesmoved) { $linesmoved = 0; my @firstlines = (); my @tags = (); - while ($oldspec[0]) { - my $l = shift @oldspec; - if ($l =~ m/^$tag:/ ) { - push(@tags, $l); + while (defined $oldspec[0]) { + my $l = shift @oldspec; + if ($l =~ m/^$tag:/i ) { + push(@tags, $l); + } else { + # if there are already tags, we need to sort and exit + if (@tags > 0) { + my @sortedtags = sort sort_tags_helper @tags; + $linesmoved = !compare_arrays(\@tags, \@sortedtags); + if ($linesmoved) { + @oldspec = (@firstlines, @sortedtags, $l, @oldspec); + @firstlines = (); + @tags = (); + next sortcycle; + } else { + @firstlines = (@firstlines, @tags, $l); + @tags = (); + next; + } } else { - # if there are already tags, we need to sort and exit - if (@tags > 0) { - my @sortedtags = sort sort_tags_helper @tags; - $linesmoved = !compare_arrays(\@tags, \@sortedtags); - if ($linesmoved) { - @oldspec = (@firstlines, @sortedtags, $l, @oldspec); - @firstlines = (); - @tags = (); - next sortcycle; - } else { - @firstlines = (@firstlines, @tags, $l); - @tags = (); - next; - } - } else { - push(@firstlines, $l); - } + push(@firstlines, $l); } + } } @oldspec = (@firstlines, @oldspec); - } + } } @@ -703,24 +698,24 @@ my $first_summary = 1; my $line; while (@oldspec) { - $line = shift @oldspec; + $line = shift @oldspec; - if ($line eq "XXXBLANKLINE") { - print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); - } elsif ($line eq "XXXDOUBLELINE") { - print "\n\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); - } elsif ($line eq "XXXRELEASE") { - printf("%-16s%s\n", "Release:", "0") ; - } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { - my $current_package = $1; - my $license = $seen_licenses{$current_package} || $main_license; - printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary); - my $group = $seen_groups{$current_package} || $main_group; - printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary); - $first_summary = 0; - } else { - print "$line\n"; - } + if ($line eq "XXXBLANKLINE") { + print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); + } elsif ($line eq "XXXDOUBLELINE") { + print "\n\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); + } elsif ($line eq "XXXRELEASE") { + printf("%-16s%s\n", "Release:", "0") ; + } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { + my $current_package = $1; + my $license = $seen_licenses{$current_package} || $main_license; + printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary); + my $group = $seen_groups{$current_package} || $main_group; + printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary); + $first_summary = 0; + } else { + print "$line\n"; + } } print "\n" unless $line eq "XXXBLANKLINE"; -- 2.51.1 From 8b3f78b0d5accb84b257052bf0758a5831e7f0fcf6e0002658a3ad6e331cf98b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 24 Feb 2012 09:52:59 +0000 Subject: [PATCH 059/151] careful with tabs OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=67 --- obs-service-format_spec_file.spec | 2 +- prepare_spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index dd0eb07..e442aba 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,7 +30,7 @@ Source3: patch_license Source4: licenses_changes.txt Source100: COPYING Requires: osc-source_validator -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description diff --git a/prepare_spec b/prepare_spec index 2e77a6e..0630f3d 100644 --- a/prepare_spec +++ b/prepare_spec @@ -522,7 +522,7 @@ sub read_and_parse_old_spec { } if ( /^BuildRoot\s*:/i ) { - push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; + push @oldspec, sprintf("%-16s%s", "BuildRoot:", "%{_tmppath}/%{name}-%{version}-build"); next; } -- 2.51.1 From fb05f0e4dc377c95fa352a1d100d356c21fe575c0629800f9181682eb53e5cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Feb 2012 13:57:45 +0000 Subject: [PATCH 060/151] Accepting request 107160 from home:saschpe:branches:openSUSE:Tools - avoid breaking shell expansions OBS-URL: https://build.opensuse.org/request/show/107160 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=69 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 13f009c..659657f 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 27 13:12:13 UTC 2012 - saschpe@suse.de + +- avoid breaking shell expansions + ------------------------------------------------------------------- Fri Feb 24 09:48:57 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 0630f3d..5bd203e 100644 --- a/prepare_spec +++ b/prepare_spec @@ -320,7 +320,7 @@ sub read_and_parse_old_spec { } my %aa; - while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) { $aa{$1}=1; } # ignore line if it looks like a "usedforbuild" line, i.e. -- 2.51.1 From 0461e6f6d37e64abe339404cfbf890a6e8c96d39cdc7cfb2efc4151f7e3a5c20 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 9 Mar 2012 15:27:59 +0000 Subject: [PATCH 061/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=71 --- licenses_changes.txt | 5 ++++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 0a26f3b..e9301de 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -226,6 +226,8 @@ SUSE-Freetype Freetype HPND HPND SUSE-IJG JPEG License SUSE-ImageMagick ImageMagick +SUSE-Innernet-2.0 Inner Net License 2 +SUSE-Innernet-2.00 Inner Net License 2.00 IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. @@ -334,6 +336,7 @@ Python-2.0 Python-2.0 QPL-1.0 QPL QPL-1.0 QPL .. QPL-1.0 QPL-1.0 +SUSE-Qhull Qhull RHeCos-1.1 RHeCos-1.1 RPL-1.5 RPL-1.5 RPSL-1.0 RPSL-1.0 @@ -379,4 +382,4 @@ SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License SUSE-NonFree NonFree licenses -SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) \ No newline at end of file +SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 659657f..40552db 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 9 15:27:34 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Mon Feb 27 13:12:13 UTC 2012 - saschpe@suse.de -- 2.51.1 From 76a42657d4b6641b5e20b1b60ed33f9c2177498862c3d52190cc59c455742eb3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Mar 2012 14:12:36 +0000 Subject: [PATCH 062/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=73 --- licenses_changes.txt | 5 +++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index e9301de..10c2a33 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -54,6 +54,7 @@ BSD-3-Clause BSD 3-Clause BSD-3-Clause BSD 3-clause (or similar) BSD-2-Clause BSD-2-Clause BSD-2-Clause BSD-2c +BSD-3-Clause New BSD License BSD-3-Clause BSD-3 BSD-3-Clause BSD-3-Clause BSD-3-Clause BSD-3-clause (or similar) @@ -201,6 +202,7 @@ GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception +SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) GPL-2.0+ GPL-2.0+ GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 @@ -301,6 +303,7 @@ Naumen Naumen NCSA NCSA NGPL NGPL Nokia Nokia +SUSE-NetCDF SUSE-NetCDF NPOSL-3.0 NPOSL-3.0 NTP NTP SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice @@ -333,6 +336,7 @@ Python-2.0 Python Copyright Python-2.0 Python License .. Python-2.0 Python Software Foundation License Python-2.0 Python-2.0 +Python-2.0 PSF QPL-1.0 QPL QPL-1.0 QPL .. QPL-1.0 QPL-1.0 @@ -383,3 +387,4 @@ SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nat Artistic-1.0 or GPL-1.0+ Perl License SUSE-NonFree NonFree licenses SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) +SUSE-Vim diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 40552db..689a6a0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 21 14:12:24 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Fri Mar 9 15:27:34 UTC 2012 - coolo@suse.com -- 2.51.1 From a735885c1d3f083d5c919fc3d8d095d5413bd3facae0f183cb0cf2b9da4614c5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Mar 2012 14:13:01 +0000 Subject: [PATCH 063/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=74 --- licenses_changes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 10c2a33..3bd2c6d 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -387,4 +387,4 @@ SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nat Artistic-1.0 or GPL-1.0+ Perl License SUSE-NonFree NonFree licenses SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) -SUSE-Vim +SUSE-Vim SUSE-Vim -- 2.51.1 From cdf4b6b72f99f47c58eecd97c84a448483bbcc11ae62c08d804e3c5dac0bda65 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Mar 2012 07:14:27 +0000 Subject: [PATCH 064/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=76 --- licenses_changes.txt | 4 ++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 3bd2c6d..3ac4523 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -388,3 +388,7 @@ Artistic-1.0 or GPL-1.0+ Perl License SUSE-NonFree NonFree licenses SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) SUSE-Vim SUSE-Vim +SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license +SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility +SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) +SUSE-SNIA-1.1 SNIA 1.1 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 689a6a0..7dad60f 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 07:14:11 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Wed Mar 21 14:12:24 UTC 2012 - coolo@suse.com -- 2.51.1 From 9c4802e5a0518e7ca93cbce6c66c224936dbd61e51e3e7020baefbe794edc9c0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Mar 2012 10:16:17 +0000 Subject: [PATCH 065/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=78 --- fetch-licenses.sh | 5 + licenses_changes.txt | 382 ++++++++++++++------------- obs-service-format_spec_file.changes | 5 + 3 files changed, 207 insertions(+), 185 deletions(-) create mode 100644 fetch-licenses.sh diff --git a/fetch-licenses.sh b/fetch-licenses.sh new file mode 100644 index 0000000..bb96875 --- /dev/null +++ b/fetch-licenses.sh @@ -0,0 +1,5 @@ +curl "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt +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.txt ; done +sort -o licenses_changes.txt -u licenses_changes.txt +( echo "First line" ; cat licenses_changes.txt ) > t +mv t licenses_changes.txt diff --git a/licenses_changes.txt b/licenses_changes.txt index 3ac4523..61df0e0 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,28 +1,35 @@ -New format (spdx.org) Old format (fedora, PDB, etc) +First line AAL AAL -AFL-2.1 Academic Free License 2.1 -AGPL-3.0 Affero GPL -AFL-2.1 AFL 2.1 +AFL-1.1 AFL-1.1 AFL-1.2 AFL-1.2 AFL-2.0 AFL-2.0 +AFL-2.1 Academic Free License 2.1 +AFL-2.1 AFL 2.1 AFL-2.1 AFL-2.1 AFL-3.0 AFL-3.0 +AGPL-3.0 Affero GPL AGPL-3.0 AGPL-3.0 AGPL-3.0 AGPLv3 -SUSE-AGPL-3.0+ AGPLv3+ ANTLR-PD ANTLR-PD +Apache-1.0 Apache-1.0 +Apache-1.1 Apache-1.1 Apache-1.1 Apache 1.1 (Indiana University) +Apache-1.1 ASL 1.1 Apache-2.0 Apache 2.0 +Apache-2.0 Apache-2.0 Apache-2.0 Apache License Apache-2.0 Apache License 2.0 Apache-2.0 Apache License, Version 2.0 -Apache-2.0 Apache Software License .. Apache-2.0 Apache Software License +Apache-2.0 Apache Software License .. Apache-2.0 Apache Software License, Version 2.0 Apache-2.0 Apache v2.0 -Apache-1.0 Apache-1.0 -Apache-1.1 Apache-1.1 -Apache-2.0 Apache-2.0 +Apache-2.0 ASL2 +Apache-2.0 ASL 2.0 +Apache-2.0 ASLv.. +Apache-2.0 ASLv2 +Apache-2.0 ASLv2.0 +Apache-2.0 The Apache Software License APL-1.0 APL-1.0 APL-1.0 APL-1.0 (spdx.org/licenses) APSL-1.0 APSL-1.0 @@ -31,46 +38,37 @@ APSL-1.2 APSL-1.2 APSL-2.0 APSL-2.0 Artistic-1.0 Artistic Artistic-1.0 Artistic 1.0 -Artistic-2.0 Artistic 2.0 +Artistic-1.0 Artistic-1.0 Artistic-1.0 Artistic license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. -Artistic-1.0 Artistic-1.0 -SUSE-Artistic-1.0+ Artistic-1.0+ +Artistic-1.0 or GPL-1.0+ Perl License +Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 -Apache-1.1 ASL 1.1 -Apache-2.0 ASL 2.0 -Apache-2.0 ASL2 -Apache-2.0 ASLv.. -Apache-2.0 ASLv2 -Apache-2.0 ASLv2.0 -SUSE-Apache-2.0+ ASLv2.0+ -BSD-3-Clause BSD (3-Clause) -BSD-2-Clause BSD 2 clause -BSD-2-Clause BSD 2 Clause -BSD-2-Clause BSD 2-clause -BSD-2-Clause BSD 2-Clause -BSD-3-Clause BSD 3-Clause -BSD-3-Clause BSD 3-clause (or similar) -BSD-2-Clause BSD-2-Clause -BSD-2-Clause BSD-2c -BSD-3-Clause New BSD License -BSD-3-Clause BSD-3 -BSD-3-Clause BSD-3-Clause -BSD-3-Clause BSD-3-clause (or similar) -BSD-4-Clause BSD-4-Clause BSD-2-Clause BSD2c +BSD-2-Clause BSD-2c +BSD-2-Clause BSD 2 clause +BSD-2-Clause BSD 2-clause +BSD-2-Clause BSD 2 Clause +BSD-2-Clause BSD 2-Clause +BSD-2-Clause BSD-2-Clause BSD-3-Clause BSD3 +BSD-3-Clause BSD-3 BSD-3-Clause BSD3c +BSD-3-Clause BSD 3-Clause +BSD-3-Clause BSD (3-Clause) +BSD-3-Clause BSD-3-Clause +BSD-3-Clause BSD 3-clause (or similar) +BSD-3-Clause BSD-3-clause (or similar) BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) +BSD-3-Clause New BSD License BSD-4-Clause BSD4c +BSD-4-Clause BSD-4-Clause BSD-4-Clause BSD4c(or similar) BSL-1.0 BSL-1.0 CATOSL-1.1 CATOSL-1.1 -CC-BY-SA-3.0 CC BY-SA 3.0 -CC-BY-SA-2.5 CC by-sa V2.5 -CC-BY-SA-3.0 CC BY-SA V3.0 +CC0-1.0 CC0-1.0 CC-BY-1.0 CC-BY-1.0 CC-BY-2.0 CC-BY-2.0 CC-BY-2.5 CC-BY-2.5 @@ -94,206 +92,195 @@ CC-BY-ND-3.0 CC-BY-ND-3.0 CC-BY-SA-1.0 CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-2.5 +CC-BY-SA-2.5 CC by-sa V2.5 +CC-BY-SA-3.0 CC BY-SA 3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 -CC0-1.0 CC0-1.0 +CC-BY-SA-3.0 CC BY-SA V3.0 CDDL-1.0 CDDL CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 CECILL-1.0 CECILL-1.0 +CECILL-1.1 CECILL-1.1 CECILL-1.1English CECILL-1.1English CECILL-2.0 CECILL-2.0 CECILL-B CECILL-B CECILL-C CECILL-C ClArtistic ClArtistic -CPL-1.0 Common Public License - v 1.0 +CNRI-Python CNRI-Python +CNRI-Python-GPL-Compatible CNRI-Python-GPL-Compatible +CPAL-1.0 CPAL-1.0 CPL-1.0 Common Public License v1.0 +CPL-1.0 Common Public License - v 1.0 CPL-1.0 Common Public License v1.0 (CPL) CPL-1.0 Common Public License Version 1.0 CPL-1.0 Common Public License Version 1.0 (CPL1.0) -CPAL-1.0 CPAL-1.0 -CPL-1.0 CPL (Common Public License) v1 CPL-1.0 CPL 1.0 CPL-1.0 CPL 1.0 ... CPL-1.0 CPL-1.0 +CPL-1.0 CPL (Common Public License) v1 CUA-OPL-1.0 CUA-OPL-1.0 -SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) ECL-1.0 ECL-1.0 ECL-2.0 ECL-2.0 -EPL-1.0 Eclipse Public License -EPL-1.0 Eclipse-1.0 -EPL-1.0 Eclipse Public License 1.0 eCos-2.0 eCos-2.0 EFL-1.0 EFL-1.0 EFL-2.0 EFL-2.0 Entessa Entessa +EPL-1.0 Eclipse-1.0 +EPL-1.0 Eclipse Public License +EPL-1.0 Eclipse Public License 1.0 EPL-1.0 EPL +EPL-1.0 EPL-1 EPL-1.0 EPL 1.0 EPL-1.0 EPL 1.0 ... -EPL-1.0 EPL v1.0 -EPL-1.0 EPL-1 EPL-1.0 EPL-1.0 +EPL-1.0 EPL v1.0 ErlPL-1.1 Erlang Public License ErlPL-1.1 ErlPL-1.1 EUDatagrid EUDatagrid EUPL-1.0 EUPL-1.0 EUPL-1.1 EUPL-1.1 -MIT Expat -MIT Expat License Fair Fair -SUSE-FLTK Fltk -SUSE-GFDL-1.1+ FDL v1.1 or later -SUSE-GFDL-1.2+ FDL-1.2+ -SUSE-GFDL-1.3+ FDL-1.3+ -SUSE-GFDL-1.2+ FDLv1.2+ Frameworx-1.0 Frameworx-1.0 -SUSE-Freeware Freeware -SUSE-Freeware Freeware license GFDL-1.1 GFDL 1.1 -GFDL-1.2 GFDL 1.2 -GFDL-1.1 GFDL v1.1 -GFDL-1.2 GFDL v1.2 GFDL-1.1 GFDL-1.1 -GFDL-1.2 GFDL-1.2 -GFDL-1.3 GFDL-1.3 GFDL-1.1 GFDLv1.1 -GFDL-1.2 GFDLv1.2 -SUSE-GFDL-1.2+ GFDLv1.2+ -GPL-2.0 GLPv2 +GFDL-1.1 GFDL v1.1 GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.2 GFDL 1.2 +GFDL-1.2 GFDL-1.2 +GFDL-1.2 GFDLv1.2 +GFDL-1.2 GFDL v1.2 GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.3 GFDL-1.3 GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) +GPL-1.0+ GPL+ +GPL-1.0+ GPL-1.0+ +GPL-1.0 GPL-1.0 +GPL-1.0+ GPLv1+ +GPL-2.0 GLPv2 GPL-2.0 GNU General Public License (GPL) v2 GPL-2.0 GNU General Public License version 2 (GPL v2) GPL-2.0+ GNU General Public License version 2 or later -GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) -GPL-3.0 GNU General Public License version 3 (GPLv3) +GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) GPL-2.0 GNU GPL v2 -GPL-3.0+ GNU GPL v3 or later -GPL-3.0 GNU GPL version 3 -LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 -LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) -LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) -LGPL-2.1+ GNU LGPL v2.1 or later -LGPL-2.1 GNU LGPLv2.1 -SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception -GPL-2.0 GPL 2.0 -GPL-3.0 GPL 3 -GPL-2.0 GPL v2 -GPL-2.0 GPL v2 only -GPL-2.0+ GPL v2 or later -GPL-2.0+ GPL v2 or later -GPL-2.0 GPL v2.0 -GPL-2.0+ GPL v2.0 or later -GPL-2.0+ GPL v2+ -GPL-3.0 GPL v3 -GPL-3.0 GPL v3 only -GPL-3.0+ GPL v3 or later -GPL-1.0 GPL-1.0 -GPL-1.0+ GPL-1.0+ +GPL-2.0+ GPL2+ +GPL-2.0 GPL2 +GPL-2.0+ GPL-2+ GPL-2.0 GPL-2 +GPL-2.0+ GPL-2.0+ +GPL-2.0 GPL 2.0 GPL-2.0 GPL-2.0 GPL-2.0+ GPL-2.0 or later +GPL-2.0+ GPLv2+ +GPL-2.0 GPLv2 +GPL-2.0+ GPL v2+ +GPL-2.0 GPL v2 +GPL-2.0 GPL v2.0 +GPL-2.0+ GPL v2.0 or later +GPL-2.0 GPL v2 only +GPL-2.0+ GPLv2 or later +GPL-2.0+ GPL v2 or later +GPL-2.0+ GPL v2 or later +GPL-2.0+ libGeoIPUpdate is GPLv2 or later GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception GPL-2.0-with-font-exception GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception -SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception -SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) -GPL-2.0+ GPL-2.0+ -GPL-2.0+ GPL-2+ -GPL-3.0 GPL-3 -GPL-3.0 GPL-3.0 -GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception -SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions -GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -GPL-3.0+ GPL-3.0+ -GPL-3.0+ GPL-3+ -GPL-1.0+ GPL+ -GPL-2.0 GPL2 -GPL-2.0+ GPL2+ +GPL-3.0 GNU General Public License version 3 (GPLv3) +GPL-3.0+ GNU GPL v3 or later +GPL-3.0 GNU GPL version 3 GPL-3.0 GPL3 -GPL-1.0+ GPLv1+ -GPL-2.0 GPLv2 -GPL-2.0+ GPLv2 or later -GPL-2.0+ GPLv2+ -GPL-3.0 GPLv3 +GPL-3.0+ GPL-3+ +GPL-3.0 GPL 3 +GPL-3.0 GPL-3 +GPL-3.0+ GPL-3.0+ +GPL-3.0 GPL-3.0 GPL-3.0+ GPLv3+ +GPL-3.0 GPLv3 +GPL-3.0 GPL v3 +GPL-3.0 GPL v3 only +GPL-3.0+ GPL v3 or later +GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception gSOAP-1.3b gSOAP-1.3b -SUSE-Gnuplot Gnuplot -SUSE-Freetype Freetype HPND HPND -SUSE-IJG JPEG License -SUSE-ImageMagick ImageMagick -SUSE-Innernet-2.0 Inner Net License 2 -SUSE-Innernet-2.00 Inner Net License 2.00 +IPA IPA +IPA see IPA_Font_License_Agreement_v1.0.txt IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. -IPA IPA IPL-1.0 IPL-1.0 ISC ISC ISC ISC License -LGPL-2.1 LGPL 2.1 +LGPL-2.0+ LGPL-2.0+ +LGPL-2.0 LGPL-2.0 +LGPL-2.0 LGPLv2 LGPL-2.0 LGPL v2 -LGPL-2.0+ LGPL v2 or later +LGPL-2.0+ LGPLv2.0+ +LGPL-2.0 LGPLv2.0 LGPL-2.0 LGPL v2.0 only LGPL-2.0+ LGPL v2.0 or later -LGPL-2.1 LGPL v2.1 -SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 -LGPL-2.1 LGPL v2.1 only -LGPL-2.1+ LGPL v2.1 or later -LGPL-2.1+ LGPL v2.1+ +LGPL-2.0+ LGPL v2 or later +LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) +LGPL-2.1 GNU LGPLv2.1 +LGPL-2.1+ GNU LGPL v2.1 or later +LGPL-2.1+ LGPL-2.0.1 or later +LGPL-2.1 LGPL2.1 +LGPL-2.1+ LGPL-2.1+ +LGPL-2.1 LGPL 2.1 +LGPL-2.1 LGPL-2.1 +LGPL-2.1+ LGPLv2+ LGPL-2.1+ LGPL v2+ LGPL-2.1+ LGPL V2+ -LGPL-3.0+ LGPL v3 or later -LGPL-2.0 LGPL-2.0 -LGPL-2.1+ LGPL-2.0.1 or later -LGPL-2.0+ LGPL-2.0+ -LGPL-2.1 LGPL-2.1 -LGPL-2.1+ LGPL-2.1+ -LGPL-3.0 LGPL-3.0 -LGPL-3.0+ LGPL-3.0+ -LGPL-2.1 LGPL2.1 -LGPL-2.0 LGPLv2 -LGPL-2.0 LGPLv2.0 -LGPL-2.0+ LGPLv2.0+ -LGPL-2.1 LGPLv2.1 LGPL-2.1+ LGPLv2.1+ -LGPL-2.1+ LGPLv2+ -LGPL-3.0 LGPLv3 +LGPL-2.1 LGPLv2.1 +LGPL-2.1+ LGPL v2.1+ +LGPL-2.1 LGPL v2.1 +LGPL-2.1 LGPL v2.1 only +LGPL-2.1+ LGPL v2.1 or later +LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 +LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) +LGPL-3.0+ LGPL-3.0+ +LGPL-3.0 LGPL-3.0 LGPL-3.0+ LGPLv3+ -GPL-2.0+ libGeoIPUpdate is GPLv2 or later +LGPL-3.0 LGPLv3 +LGPL-3.0+ LGPL v3 or later Libpng Libpng LPL-1.02 LPL-1.02 -LPPL-1.3c LPPL .. +LPL-1.0 LPL-1.0 LPPL-1.0 LPPL-1.0 LPPL-1.1 LPPL-1.1 LPPL-1.2 LPPL-1.2 +LPPL-1.3c LPPL .. LPPL-1.3c LPPL-1.3c +LPPL-1.3c TeX-License .. MirOS MirOS +MIT Expat +MIT Expat License MIT MIT MIT MIT licence +MIT MIT-Licence MIT MIT license MIT MIT License MIT MIT License (or similar) -MIT MIT-Licence +MIT MIT/X11 MIT MIT/X Consortium License MIT MIT/X License -MIT MIT/X11 +MIT X11 +MIT X11 (BSD like) +MIT X11 MIT +MIT X11/MIT Motosoto Motosoto -MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) -MPL-1.1 Mozilla Public License 1.1 -SUSE-MPL-1.1+ MPL 1.1 or later MPL-1.0 MPL-1.0 -MPL-1.1 MPL-1.1 MPL-1.0 MPLv1.0 +MPL-1.1 Mozilla Public License 1.1 +MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) +MPL-1.1 MPL-1.1 MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. -SUSE-MPL-1.1+ MPLv1.1+ +MPL-2.0 MPL-2.0 MS-PL Ms-Pl MS-PL MS-PL MS-RL MS-RL @@ -303,92 +290,117 @@ Naumen Naumen NCSA NCSA NGPL NGPL Nokia Nokia -SUSE-NetCDF SUSE-NetCDF NPOSL-3.0 NPOSL-3.0 NTP NTP -SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice OCLC-2.0 OCLC-2.0 ODbL-1.0 ODbL-1.0 +OFL-1.0 OFL-1.0 OFL-1.1 OFL OFL-1.1 OFL-1.1 +OFL-1.1 Open Font License +OFL-1.1 SIL Open Font License +OFL-1.1 SIL Open Font License 1.1 OGTSL OGTSL OLDAP-2.8 OLDAP-2.8 -OFL-1.1 Open Font License OLDAP-2.8 openldap 2.8 OpenSSL OpenSSL OSL-1.0 OSL-1.0 -SUSE-OSL-1.1 OSL-1.1 OSL-2.0 OSL-2.0 +OSL-2.1 OSL-2.1 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 -SUSE-PHP-2.02 PHP 2.02 -PHP-3.01 PHP License PHP-3.01 PHP-3.0.1 +PHP-3.01 PHP License +PHP-3.01 The PHP License, version 3.01 +PHP-3.0 PHP-3.0 PostgreSQL PostgreSQL -SUSE-Public-Domain Public domain -SUSE-Public-Domain Public Domain -SUSE-Public-Domain Public Domain, Freeware -SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw -SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) +Python-2.0 PSF Python-2.0 Python Python-2.0 Python .. +Python-2.0 Python-2.0 Python-2.0 Python Copyright Python-2.0 Python License .. Python-2.0 Python Software Foundation License -Python-2.0 Python-2.0 -Python-2.0 PSF QPL-1.0 QPL QPL-1.0 QPL .. QPL-1.0 QPL-1.0 -SUSE-Qhull Qhull RHeCos-1.1 RHeCos-1.1 RPL-1.5 RPL-1.5 RPSL-1.0 RPSL-1.0 RSCPL RSCPL Ruby Ruby SAX-PD SAX-PD -IPA see IPA_Font_License_Agreement_v1.0.txt -OFL-1.1 SIL Open Font License -OFL-1.1 SIL Open Font License 1.1 -SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SimPL-2.0 SimPL-2.0 Sleepycat Sleepycat SPL-1.0 SPL-1.0 SugarCRM-1.1.3 SugarCRM-1.1.3 +SUSE-AGPL-3.0+ AGPLv3+ +SUSE-Apache-2.0+ ASLv2.0+ +SUSE-Artistic-1.0+ Artistic-1.0+ +SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility +SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) +SUSE-Firmware Firmware license, redistributable unmodified +SUSE-FLTK Fltk +SUSE-Freetype Freetype +SUSE-Freeware Freeware +SUSE-Freeware Freeware license +SUSE-GFDL-1.1+ FDL v1.1 or later +SUSE-GFDL-1.2+ FDL-1.2+ +SUSE-GFDL-1.2+ FDLv1.2+ +SUSE-GFDL-1.2+ GFDLv1.2+ +SUSE-GFDL-1.3+ FDL-1.3+ +SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS +SUSE-Gnuplot Gnuplot +SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception +SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception +SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions +SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) +SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception +SUSE-IJG JPEG License +SUSE-ImageMagick ImageMagick +SUSE-Innernet-2.00 Inner Net License 2.00 +SUSE-Innernet-2.0 Inner Net License 2 +SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception +SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 +SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) +SUSE-MPL-1.1+ MPL 1.1 or later +SUSE-MPL-1.1+ MPLv1.1+ +SUSE-NetCDF SUSE-NetCDF +SUSE-NonFree NonFree licenses +SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice +SUSE-OML Open Market License (tracked by Fedora as OML) +SUSE-OSL-1.1 OSL-1.1 +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +SUSE-PHP-2.02 PHP 2.02 +SUSE-Public-Domain Public domain +SUSE-Public-Domain Public Domain +SUSE-Public-Domain Public Domain, Freeware +SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) +SUSE-Qhull Qhull +SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license +SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt +SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) +SUSE-SNIA-1.1 SNIA 1.1 SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) -LPPL-1.3c TeX-License .. -Apache-2.0 The Apache Software License -PHP-3.01 The PHP License, version 3.01 +SUSE-Vim SUSE-Vim VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License Watcom-1.0 Watcom-1.0 WXwindows WXwindows -MIT X11 -MIT X11 (BSD like) -MIT X11 MIT -MIT X11/MIT XFree86-1.1 XFree86-1.1 Xnet Xnet YPL-1.1 YPL-1.1 Zimbra-1.3 Zimbra-1.3 -Zlib Zlib Zlib zlib -Zlib Zlib License +Zlib Zlib Zlib zlib/libpng License +Zlib Zlib License +ZPL-1.1 ZPL-1.1 ZPL-2.0 Zope Public License ZPL-2.0 ZPL -ZPL-2.1 ZPL 2.1 -ZPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.0 +ZPL-2.1 ZPL 2.1 ZPL-2.1 ZPL-2.1 -SUSE-Firmware Firmware license, redistributable unmodified -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. -Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses -SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) -SUSE-Vim SUSE-Vim -SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license -SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility -SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) -SUSE-SNIA-1.1 SNIA 1.1 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7dad60f..6ace519 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 29 10:15:51 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Tue Mar 27 07:14:11 UTC 2012 - coolo@suse.com -- 2.51.1 From 2bb430d66ae2bf31f91be78f7ce84938ffeebce3364b2643df6be59ff872dadf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Mar 2012 11:51:22 +0000 Subject: [PATCH 066/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=79 --- obs-service-format_spec_file.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e442aba..022ff2f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -28,6 +28,7 @@ Source1: format_spec_file.service Source2: prepare_spec Source3: patch_license Source4: licenses_changes.txt +Source5: fetch-licenses.sh Source100: COPYING Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build -- 2.51.1 From cdfd0962ad68c0d961d1f2898e4e810a360053cbb5e7f83606fd770a8b8fd754 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 3 Apr 2012 08:30:25 +0000 Subject: [PATCH 067/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=81 --- licenses_changes.txt | 6 ++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 61df0e0..4a490de 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -336,7 +336,9 @@ SPL-1.0 SPL-1.0 SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-AGPL-3.0+ AGPLv3+ SUSE-Apache-2.0+ ASLv2.0+ +SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Artistic-1.0+ Artistic-1.0+ +SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) SUSE-Firmware Firmware license, redistributable unmodified @@ -360,11 +362,13 @@ SUSE-IJG JPEG License SUSE-ImageMagick ImageMagick SUSE-Innernet-2.00 Inner Net License 2.00 SUSE-Innernet-2.0 Inner Net License 2 +SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) SUSE-MPL-1.1+ MPL 1.1 or later SUSE-MPL-1.1+ MPLv1.1+ +SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license SUSE-NetCDF SUSE-NetCDF SUSE-NonFree NonFree licenses SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice @@ -378,6 +382,7 @@ SUSE-Public-Domain Public Domain, Freeware SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) SUSE-Qhull Qhull +SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt @@ -385,6 +390,7 @@ SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA SUSE-SNIA-1.1 SNIA 1.1 SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) SUSE-Vim SUSE-Vim +SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6ace519..a44c1e7 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 3 08:30:08 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Thu Mar 29 10:15:51 UTC 2012 - coolo@suse.com -- 2.51.1 From 1aa463499c3a5842f48e57c7fb7313cad623258fd13d8c869cef1cacd9755d96 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Apr 2012 10:42:45 +0000 Subject: [PATCH 068/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=83 --- licenses_changes.txt | 9 +++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 4a490de..d2c85de 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -52,6 +52,8 @@ BSD-2-Clause BSD 2-clause BSD-2-Clause BSD 2 Clause BSD-2-Clause BSD 2-Clause BSD-2-Clause BSD-2-Clause +BSD-2-Clause-FreeBSD BSD-2-Clause-FreeBSD +BSD-2-Clause-NetBSD BSD-2-Clause-NetBSD BSD-3-Clause BSD3 BSD-3-Clause BSD-3 BSD-3-Clause BSD3c @@ -66,6 +68,7 @@ BSD-3-Clause New BSD License BSD-4-Clause BSD4c BSD-4-Clause BSD-4-Clause BSD-4-Clause BSD4c(or similar) +BSD-4-Clause-UC BSD-4-Clause-UC BSL-1.0 BSL-1.0 CATOSL-1.1 CATOSL-1.1 CC0-1.0 CC0-1.0 @@ -99,6 +102,7 @@ CC-BY-SA-3.0 CC BY-SA V3.0 CDDL-1.0 CDDL CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 +CDDL-1.1 CDDL-1.1 CECILL-1.0 CECILL-1.0 CECILL-1.1 CECILL-1.1 CECILL-1.1English CECILL-1.1English @@ -309,6 +313,7 @@ OSL-2.0 OSL-2.0 OSL-2.1 OSL-2.1 OSL-3.0 OSL-3.0 PDDL-1.0 PDDL-1.0 +PHP-3.01 PHP-3.01 PHP-3.01 PHP-3.0.1 PHP-3.01 PHP License PHP-3.01 The PHP License, version 3.01 @@ -355,6 +360,7 @@ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-Gnuplot Gnuplot SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception +SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception @@ -383,12 +389,14 @@ SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) SUSE-Qhull Qhull SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ +SUSE-Repoze http://repoze.org/license.html SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) SUSE-SNIA-1.1 SNIA 1.1 SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) +SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-Vim SUSE-Vim SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense VSL-1.0 VSL-1.0 @@ -398,6 +406,7 @@ Watcom-1.0 Watcom-1.0 WXwindows WXwindows XFree86-1.1 XFree86-1.1 Xnet Xnet +YPL-1.0 YPL-1.0 YPL-1.1 YPL-1.1 Zimbra-1.3 Zimbra-1.3 Zlib zlib diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a44c1e7..a99364c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 19 10:41:40 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Tue Apr 3 08:30:08 UTC 2012 - coolo@suse.com -- 2.51.1 From 14b8a696f8cfc3308f21e42dad93bfbdb0fd0dcb25b00b5fac5b5842316af1a3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 11 May 2012 09:17:23 +0000 Subject: [PATCH 069/151] - licenses update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=85 --- licenses_changes.txt | 6 ++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index d2c85de..6fc67bd 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -346,6 +346,7 @@ SUSE-Artistic-1.0+ Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) +SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-Firmware Firmware license, redistributable unmodified SUSE-FLTK Fltk SUSE-Freetype Freetype @@ -369,9 +370,13 @@ SUSE-ImageMagick ImageMagick SUSE-Innernet-2.00 Inner Net License 2.00 SUSE-Innernet-2.0 Inner Net License 2 SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html +SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) +SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) +SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) +SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition SUSE-MPL-1.1+ MPL 1.1 or later SUSE-MPL-1.1+ MPLv1.1+ SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license @@ -399,6 +404,7 @@ SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-Vim SUSE-Vim SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense +SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a99364c..72bf5db 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 11 09:17:10 UTC 2012 - coolo@suse.com + +- licenses update + ------------------------------------------------------------------- Thu Apr 19 10:41:40 UTC 2012 - coolo@suse.com -- 2.51.1 From c4929972f5afd10593effa2719bd8c292070b780032ba3af1092c0c72258f402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 29 May 2012 09:51:48 +0000 Subject: [PATCH 070/151] do not break require lines using %() macros, eg. upcomming kiwi.spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=87 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 72bf5db..0a5a494 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 29 09:51:33 UTC 2012 - adrian@suse.de + +- do not break require lines using %() macros + ------------------------------------------------------------------- Fri May 11 09:17:10 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 5bd203e..638534a 100644 --- a/prepare_spec +++ b/prepare_spec @@ -320,8 +320,14 @@ sub read_and_parse_old_spec { } my %aa; - while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) { - $aa{$1}=1; + if ($cur_tag =~ /%\(/) { + # do not touch lines with shell execution + $aa{$cur_tag}=1; + } else { + # seperate tags of all other lines + while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) { + $aa{$1}=1; + } } # ignore line if it looks like a "usedforbuild" line, i.e. # if it contains too many base packages -- 2.51.1 From 307bf42573a852d6f3329e40996cfb1b2a6f3db422f20bf694885b649d8cb4f0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 20 Jun 2012 14:16:15 +0000 Subject: [PATCH 071/151] - updated licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=89 --- licenses_changes.txt | 10 ++++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 6fc67bd..062c25c 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -285,6 +285,7 @@ MPL-1.1 MPL-1.1 MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. MPL-2.0 MPL-2.0 +MPL-2.0-no-copyleft-exception MPL-2.0-no-copyleft-exception MS-PL Ms-Pl MS-PL MS-PL MS-RL MS-RL @@ -349,6 +350,7 @@ SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-Firmware Firmware license, redistributable unmodified SUSE-FLTK Fltk +SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en SUSE-Freetype Freetype SUSE-Freeware Freeware SUSE-Freeware Freeware license @@ -363,8 +365,11 @@ SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions +SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception +SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ +SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ SUSE-IJG JPEG License SUSE-ImageMagick ImageMagick SUSE-Innernet-2.00 Inner Net License 2.00 @@ -400,11 +405,16 @@ SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) SUSE-SNIA-1.1 SNIA 1.1 +SUSE-Sun-Laboratories http://pastebin.com/UubnS3se SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-Vim SUSE-Vim +SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense +SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) +SUSE-XFree86-1.0 The old version of the XFree86 license is not upstream at SPDX.org SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license +SUSE-xinetd Xinedt license (Fedora also uses a custom license here) VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0a5a494..c5f6f23 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 20 14:16:06 UTC 2012 - coolo@suse.com + +- updated licenses + ------------------------------------------------------------------- Tue May 29 09:51:33 UTC 2012 - adrian@suse.de -- 2.51.1 From 91e73d56d2871dbed012dddc2f7f5998c44304d8efed31140e780e567c650869 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 3 Sep 2012 08:46:39 +0000 Subject: [PATCH 072/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=91 --- licenses_changes.txt | 9 +++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 062c25c..4d0d9b1 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -334,6 +334,8 @@ RHeCos-1.1 RHeCos-1.1 RPL-1.5 RPL-1.5 RPSL-1.0 RPSL-1.0 RSCPL RSCPL +Ruby GPL-2.0+ or Ruby +Ruby GPLv2+ or Ruby Ruby Ruby SAX-PD SAX-PD SimPL-2.0 SimPL-2.0 @@ -346,7 +348,9 @@ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Artistic-1.0+ Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility +SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) +SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-Firmware Firmware license, redistributable unmodified SUSE-FLTK Fltk @@ -364,12 +368,14 @@ SUSE-Gnuplot Gnuplot SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception +SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ +SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense SUSE-IJG JPEG License SUSE-ImageMagick ImageMagick SUSE-Innernet-2.00 Inner Net License 2.00 @@ -380,6 +386,7 @@ SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) +SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition SUSE-MPL-1.1+ MPL 1.1 or later @@ -399,6 +406,7 @@ SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) SUSE-Qhull Qhull SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ +SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Repoze http://repoze.org/license.html SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license @@ -415,6 +423,7 @@ SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) SUSE-XFree86-1.0 The old version of the XFree86 license is not upstream at SPDX.org SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-xinetd Xinedt license (Fedora also uses a custom license here) +SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) VSL-1.0 VSL-1.0 W3C W3C W3C W3C Software License diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c5f6f23..4267ef4 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 3 08:46:29 UTC 2012 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Wed Jun 20 14:16:06 UTC 2012 - coolo@suse.com -- 2.51.1 From dd6458c9277e5846dfbe9c08fc1abc50b475e0bc95aa422b3c207348db02c47b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 13 Sep 2012 14:39:41 +0000 Subject: [PATCH 073/151] - replace ; with and in license tag OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=93 --- licenses_changes.txt | 1 + obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 4d0d9b1..c9dfd0b 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -409,6 +409,7 @@ SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Repoze http://repoze.org/license.html SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4267ef4..c83c7db 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 13 14:39:31 UTC 2012 - coolo@suse.com + +- replace ; with and in license tag + ------------------------------------------------------------------- Mon Sep 3 08:46:29 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 638534a..3e4f813 100644 --- a/prepare_spec +++ b/prepare_spec @@ -200,7 +200,7 @@ sub replace_spdx($) { for (split(/\s*;\s*/, $license)) { push @licenses, replace_spdx_and($_); } - return join(' ; ', @licenses); + return join(' and ', @licenses); } sub set_current_pkg { -- 2.51.1 From 4dff0052fb89980976894bf37b1bfb198ed5f479bb9739e7630097102cf48ba3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 20 Sep 2012 13:36:35 +0000 Subject: [PATCH 074/151] - one more license OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=95 --- licenses_changes.txt | 2 ++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index c9dfd0b..502cc30 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -350,6 +350,7 @@ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) +SUSE-Docbook-XSL Copyright---------Copyright (C) 1999-2007 Norman WalshCopyright (C) 2003 Ji KosekCopyright (C) 2004-2007 Steve BallCopyright (C) 2005-2008 The DocBook ProjectCopyright (C) 2011-2012 O'Reilly Media Permission is hereby granted, free of charge, to any personobtaining a copy of this software and associated documentationfiles (the ``Software''), to deal in the Software withoutrestriction, including without limitation the rights to use,copy, modify, merge, publish, distribute, sublicense, and/orsell copies of the Software, and to permit persons to whom theSoftware is furnished to do so, subject to the followingconditions: The above copyright notice and this permission notice shall beincluded in all copies or substantial portions of the Software. Except as contained in this notice, the names of individualscredited with contribution to this software shall not be used inadvertising or otherwise to promote the sale, use or otherdealings in this Software without prior written authorizationfrom the individuals in question. Any stylesheet derived from this Software that is publicallydistributed will be identified with a different name and theversion strings in any derived Software will be changed so thatno possibility of confusion between the derived package and thisSoftware will exist. Warranty--------THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIESOF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE ANDNONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHERCONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINGFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OROTHER DEALINGS IN THE SOFTWARE. SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-Firmware Firmware license, redistributable unmodified @@ -368,6 +369,7 @@ SUSE-Gnuplot Gnuplot SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception +SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c83c7db..235fd9c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 20 13:36:17 UTC 2012 - coolo@suse.com + +- one more license + ------------------------------------------------------------------- Thu Sep 13 14:39:31 UTC 2012 - coolo@suse.com -- 2.51.1 From 97230890e64952b20bfb41ac91fbdad12274f54a93f0eaeaaa0c153e2fb2350e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 25 Sep 2012 12:29:28 +0000 Subject: [PATCH 075/151] - even more licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=96 --- licenses_changes.txt | 4 +++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 502cc30..a818ae6 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -350,7 +350,7 @@ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) -SUSE-Docbook-XSL Copyright---------Copyright (C) 1999-2007 Norman WalshCopyright (C) 2003 Ji KosekCopyright (C) 2004-2007 Steve BallCopyright (C) 2005-2008 The DocBook ProjectCopyright (C) 2011-2012 O'Reilly Media Permission is hereby granted, free of charge, to any personobtaining a copy of this software and associated documentationfiles (the ``Software''), to deal in the Software withoutrestriction, including without limitation the rights to use,copy, modify, merge, publish, distribute, sublicense, and/orsell copies of the Software, and to permit persons to whom theSoftware is furnished to do so, subject to the followingconditions: The above copyright notice and this permission notice shall beincluded in all copies or substantial portions of the Software. Except as contained in this notice, the names of individualscredited with contribution to this software shall not be used inadvertising or otherwise to promote the sale, use or otherdealings in this Software without prior written authorizationfrom the individuals in question. Any stylesheet derived from this Software that is publicallydistributed will be identified with a different name and theversion strings in any derived Software will be changed so thatno possibility of confusion between the derived package and thisSoftware will exist. Warranty--------THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIESOF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE ANDNONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHERCONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINGFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OROTHER DEALINGS IN THE SOFTWARE. +SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-Firmware Firmware license, redistributable unmodified @@ -370,11 +370,13 @@ SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) +SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception +SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 235fd9c..5a06dd0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 25 12:29:17 UTC 2012 - coolo@suse.com + +- even more licenses + ------------------------------------------------------------------- Thu Sep 20 13:36:17 UTC 2012 - coolo@suse.com -- 2.51.1 From 1b7bbf21d7250cb7b0fcc89b7e55b0667c2d99b9f402475c7565d728071b6133 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 6 Oct 2012 13:08:37 +0000 Subject: [PATCH 076/151] - allow a + variant for all spdx licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=97 --- fetch-licenses.sh | 5 +- licenses_changes.txt | 163 +++++++++++++++++++++++++++ obs-service-format_spec_file.changes | 5 + 3 files changed, 172 insertions(+), 1 deletion(-) diff --git a/fetch-licenses.sh b/fetch-licenses.sh index bb96875..e850cd3 100644 --- a/fetch-licenses.sh +++ b/fetch-licenses.sh @@ -1,5 +1,8 @@ curl "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt -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.txt ; 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 + echo "$i $i" >> licenses_changes.txt ; + echo "$i+ $i+" >> licenses_changes.txt ; +done sort -o licenses_changes.txt -u licenses_changes.txt ( echo "First line" ; cat licenses_changes.txt ) > t mv t licenses_changes.txt diff --git a/licenses_changes.txt b/licenses_changes.txt index a818ae6..daea58d 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,20 +1,31 @@ First line +AAL+ AAL+ AAL AAL +AFL-1.1+ AFL-1.1+ AFL-1.1 AFL-1.1 +AFL-1.2+ AFL-1.2+ AFL-1.2 AFL-1.2 +AFL-2.0+ AFL-2.0+ AFL-2.0 AFL-2.0 AFL-2.1 Academic Free License 2.1 +AFL-2.1+ AFL-2.1+ AFL-2.1 AFL 2.1 AFL-2.1 AFL-2.1 +AFL-3.0+ AFL-3.0+ AFL-3.0 AFL-3.0 AGPL-3.0 Affero GPL +AGPL-3.0+ AGPL-3.0+ AGPL-3.0 AGPL-3.0 AGPL-3.0 AGPLv3 +ANTLR-PD+ ANTLR-PD+ ANTLR-PD ANTLR-PD +Apache-1.0+ Apache-1.0+ Apache-1.0 Apache-1.0 +Apache-1.1+ Apache-1.1+ Apache-1.1 Apache-1.1 Apache-1.1 Apache 1.1 (Indiana University) Apache-1.1 ASL 1.1 +Apache-2.0+ Apache-2.0+ Apache-2.0 Apache 2.0 Apache-2.0 Apache-2.0 Apache-2.0 Apache License @@ -30,33 +41,44 @@ Apache-2.0 ASLv.. Apache-2.0 ASLv2 Apache-2.0 ASLv2.0 Apache-2.0 The Apache Software License +APL-1.0+ APL-1.0+ APL-1.0 APL-1.0 APL-1.0 APL-1.0 (spdx.org/licenses) +APSL-1.0+ APSL-1.0+ APSL-1.0 APSL-1.0 +APSL-1.1+ APSL-1.1+ APSL-1.1 APSL-1.1 +APSL-1.2+ APSL-1.2+ APSL-1.2 APSL-1.2 +APSL-2.0+ APSL-2.0+ APSL-2.0 APSL-2.0 Artistic-1.0 Artistic +Artistic-1.0+ Artistic-1.0+ Artistic-1.0 Artistic 1.0 Artistic-1.0 Artistic-1.0 Artistic-1.0 Artistic license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. Artistic-1.0 or GPL-1.0+ Perl License +Artistic-2.0+ Artistic-2.0+ Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 BSD-2-Clause BSD2c BSD-2-Clause BSD-2c BSD-2-Clause BSD 2 clause BSD-2-Clause BSD 2-clause +BSD-2-Clause+ BSD-2-Clause+ BSD-2-Clause BSD 2 Clause BSD-2-Clause BSD 2-Clause BSD-2-Clause BSD-2-Clause +BSD-2-Clause-FreeBSD+ BSD-2-Clause-FreeBSD+ BSD-2-Clause-FreeBSD BSD-2-Clause-FreeBSD +BSD-2-Clause-NetBSD+ BSD-2-Clause-NetBSD+ BSD-2-Clause-NetBSD BSD-2-Clause-NetBSD BSD-3-Clause BSD3 BSD-3-Clause BSD-3 BSD-3-Clause BSD3c +BSD-3-Clause+ BSD-3-Clause+ BSD-3-Clause BSD 3-Clause BSD-3-Clause BSD (3-Clause) BSD-3-Clause BSD-3-Clause @@ -66,98 +88,157 @@ BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) BSD-3-Clause New BSD License BSD-4-Clause BSD4c +BSD-4-Clause+ BSD-4-Clause+ BSD-4-Clause BSD-4-Clause BSD-4-Clause BSD4c(or similar) +BSD-4-Clause-UC+ BSD-4-Clause-UC+ BSD-4-Clause-UC BSD-4-Clause-UC +BSL-1.0+ BSL-1.0+ BSL-1.0 BSL-1.0 +CATOSL-1.1+ CATOSL-1.1+ CATOSL-1.1 CATOSL-1.1 +CC0-1.0+ CC0-1.0+ CC0-1.0 CC0-1.0 +CC-BY-1.0+ CC-BY-1.0+ CC-BY-1.0 CC-BY-1.0 +CC-BY-2.0+ CC-BY-2.0+ CC-BY-2.0 CC-BY-2.0 +CC-BY-2.5+ CC-BY-2.5+ CC-BY-2.5 CC-BY-2.5 +CC-BY-3.0+ CC-BY-3.0+ CC-BY-3.0 CC-BY-3.0 +CC-BY-NC-1.0+ CC-BY-NC-1.0+ CC-BY-NC-1.0 CC-BY-NC-1.0 +CC-BY-NC-2.0+ CC-BY-NC-2.0+ CC-BY-NC-2.0 CC-BY-NC-2.0 +CC-BY-NC-2.5+ CC-BY-NC-2.5+ CC-BY-NC-2.5 CC-BY-NC-2.5 +CC-BY-NC-3.0+ CC-BY-NC-3.0+ CC-BY-NC-3.0 CC-BY-NC-3.0 +CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 +CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 +CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 +CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 +CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 +CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 +CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 +CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 +CC-BY-ND-1.0+ CC-BY-ND-1.0+ CC-BY-ND-1.0 CC-BY-ND-1.0 +CC-BY-ND-2.0+ CC-BY-ND-2.0+ CC-BY-ND-2.0 CC-BY-ND-2.0 +CC-BY-ND-2.5+ CC-BY-ND-2.5+ CC-BY-ND-2.5 CC-BY-ND-2.5 +CC-BY-ND-3.0+ CC-BY-ND-3.0+ CC-BY-ND-3.0 CC-BY-ND-3.0 +CC-BY-SA-1.0+ CC-BY-SA-1.0+ CC-BY-SA-1.0 CC-BY-SA-1.0 +CC-BY-SA-2.0+ CC-BY-SA-2.0+ CC-BY-SA-2.0 CC-BY-SA-2.0 +CC-BY-SA-2.5+ CC-BY-SA-2.5+ CC-BY-SA-2.5 CC-BY-SA-2.5 CC-BY-SA-2.5 CC by-sa V2.5 +CC-BY-SA-3.0+ CC-BY-SA-3.0+ CC-BY-SA-3.0 CC BY-SA 3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 CC BY-SA V3.0 CDDL-1.0 CDDL +CDDL-1.0+ CDDL-1.0+ CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 +CDDL-1.1+ CDDL-1.1+ CDDL-1.1 CDDL-1.1 +CECILL-1.0+ CECILL-1.0+ CECILL-1.0 CECILL-1.0 +CECILL-1.1+ CECILL-1.1+ CECILL-1.1 CECILL-1.1 CECILL-1.1English CECILL-1.1English +CECILL-2.0+ CECILL-2.0+ CECILL-2.0 CECILL-2.0 +CECILL-B+ CECILL-B+ CECILL-B CECILL-B +CECILL-C+ CECILL-C+ CECILL-C CECILL-C +ClArtistic+ ClArtistic+ ClArtistic ClArtistic +CNRI-Python+ CNRI-Python+ CNRI-Python CNRI-Python +CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible CNRI-Python-GPL-Compatible +CPAL-1.0+ CPAL-1.0+ CPAL-1.0 CPAL-1.0 CPL-1.0 Common Public License v1.0 CPL-1.0 Common Public License - v 1.0 CPL-1.0 Common Public License v1.0 (CPL) CPL-1.0 Common Public License Version 1.0 CPL-1.0 Common Public License Version 1.0 (CPL1.0) +CPL-1.0+ CPL-1.0+ CPL-1.0 CPL 1.0 CPL-1.0 CPL 1.0 ... CPL-1.0 CPL-1.0 CPL-1.0 CPL (Common Public License) v1 +CUA-OPL-1.0+ CUA-OPL-1.0+ CUA-OPL-1.0 CUA-OPL-1.0 +ECL-1.0+ ECL-1.0+ ECL-1.0 ECL-1.0 +ECL-2.0+ ECL-2.0+ ECL-2.0 ECL-2.0 +eCos-2.0+ eCos-2.0+ eCos-2.0 eCos-2.0 +EFL-1.0+ EFL-1.0+ EFL-1.0 EFL-1.0 +EFL-2.0+ EFL-2.0+ EFL-2.0 EFL-2.0 +Entessa+ Entessa+ Entessa Entessa EPL-1.0 Eclipse-1.0 EPL-1.0 Eclipse Public License EPL-1.0 Eclipse Public License 1.0 EPL-1.0 EPL EPL-1.0 EPL-1 +EPL-1.0+ EPL-1.0+ EPL-1.0 EPL 1.0 EPL-1.0 EPL 1.0 ... EPL-1.0 EPL-1.0 EPL-1.0 EPL v1.0 ErlPL-1.1 Erlang Public License +ErlPL-1.1+ ErlPL-1.1+ ErlPL-1.1 ErlPL-1.1 +EUDatagrid+ EUDatagrid+ EUDatagrid EUDatagrid +EUPL-1.0+ EUPL-1.0+ EUPL-1.0 EUPL-1.0 +EUPL-1.1+ EUPL-1.1+ EUPL-1.1 EUPL-1.1 +Fair+ Fair+ Fair Fair +Frameworx-1.0+ Frameworx-1.0+ Frameworx-1.0 Frameworx-1.0 +GFDL-1.1+ GFDL-1.1+ GFDL-1.1 GFDL 1.1 GFDL-1.1 GFDL-1.1 GFDL-1.1 GFDLv1.1 GFDL-1.1 GFDL v1.1 GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.2+ GFDL-1.2+ GFDL-1.2 GFDL 1.2 GFDL-1.2 GFDL-1.2 GFDL-1.2 GFDLv1.2 GFDL-1.2 GFDL v1.2 GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.3+ GFDL-1.3+ GFDL-1.3 GFDL-1.3 GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) GPL-1.0+ GPL+ +GPL-1.0++ GPL-1.0++ GPL-1.0+ GPL-1.0+ GPL-1.0 GPL-1.0 GPL-1.0+ GPLv1+ @@ -172,6 +253,7 @@ GPL-2.0+ GPL2+ GPL-2.0 GPL2 GPL-2.0+ GPL-2+ GPL-2.0 GPL-2 +GPL-2.0++ GPL-2.0++ GPL-2.0+ GPL-2.0+ GPL-2.0 GPL 2.0 GPL-2.0 GPL-2.0 @@ -187,10 +269,15 @@ GPL-2.0+ GPLv2 or later GPL-2.0+ GPL v2 or later GPL-2.0+ GPL v2 or later GPL-2.0+ libGeoIPUpdate is GPLv2 or later +GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception +GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception +GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception +GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception GPL-2.0-with-font-exception +GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception GPL-3.0 GNU General Public License version 3 (GPLv3) GPL-3.0+ GNU GPL v3 or later @@ -199,6 +286,7 @@ GPL-3.0 GPL3 GPL-3.0+ GPL-3+ GPL-3.0 GPL 3 GPL-3.0 GPL-3 +GPL-3.0++ GPL-3.0++ GPL-3.0+ GPL-3.0+ GPL-3.0 GPL-3.0 GPL-3.0+ GPLv3+ @@ -206,18 +294,26 @@ GPL-3.0 GPLv3 GPL-3.0 GPL v3 GPL-3.0 GPL v3 only GPL-3.0+ GPL v3 or later +GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception +gSOAP-1.3b+ gSOAP-1.3b+ gSOAP-1.3b gSOAP-1.3b +HPND+ HPND+ HPND HPND +IPA+ IPA+ IPA IPA IPA see IPA_Font_License_Agreement_v1.0.txt IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. +IPL-1.0+ IPL-1.0+ IPL-1.0 IPL-1.0 +ISC+ ISC+ ISC ISC ISC ISC License +LGPL-2.0++ LGPL-2.0++ LGPL-2.0+ LGPL-2.0+ LGPL-2.0 LGPL-2.0 LGPL-2.0 LGPLv2 @@ -232,6 +328,7 @@ LGPL-2.1 GNU LGPLv2.1 LGPL-2.1+ GNU LGPL v2.1 or later LGPL-2.1+ LGPL-2.0.1 or later LGPL-2.1 LGPL2.1 +LGPL-2.1++ LGPL-2.1++ LGPL-2.1+ LGPL-2.1+ LGPL-2.1 LGPL 2.1 LGPL-2.1 LGPL-2.1 @@ -246,23 +343,33 @@ LGPL-2.1 LGPL v2.1 only LGPL-2.1+ LGPL v2.1 or later LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) +LGPL-3.0++ LGPL-3.0++ LGPL-3.0+ LGPL-3.0+ LGPL-3.0 LGPL-3.0 LGPL-3.0+ LGPLv3+ LGPL-3.0 LGPLv3 LGPL-3.0+ LGPL v3 or later +Libpng+ Libpng+ Libpng Libpng +LPL-1.02+ LPL-1.02+ LPL-1.02 LPL-1.02 +LPL-1.0+ LPL-1.0+ LPL-1.0 LPL-1.0 +LPPL-1.0+ LPPL-1.0+ LPPL-1.0 LPPL-1.0 +LPPL-1.1+ LPPL-1.1+ LPPL-1.1 LPPL-1.1 +LPPL-1.2+ LPPL-1.2+ LPPL-1.2 LPPL-1.2 LPPL-1.3c LPPL .. +LPPL-1.3c+ LPPL-1.3c+ LPPL-1.3c LPPL-1.3c LPPL-1.3c TeX-License .. +MirOS+ MirOS+ MirOS MirOS MIT Expat MIT Expat License +MIT+ MIT+ MIT MIT MIT MIT licence MIT MIT-Licence @@ -276,71 +383,113 @@ MIT X11 MIT X11 (BSD like) MIT X11 MIT MIT X11/MIT +Motosoto+ Motosoto+ Motosoto Motosoto +MPL-1.0+ MPL-1.0+ MPL-1.0 MPL-1.0 MPL-1.0 MPLv1.0 MPL-1.1 Mozilla Public License 1.1 MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) +MPL-1.1+ MPL-1.1+ MPL-1.1 MPL-1.1 MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. +MPL-2.0+ MPL-2.0+ MPL-2.0 MPL-2.0 +MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception MPL-2.0-no-copyleft-exception MS-PL Ms-Pl +MS-PL+ MS-PL+ MS-PL MS-PL +MS-RL+ MS-RL+ MS-RL MS-RL +Multics+ Multics+ Multics Multics +NASA-1.3+ NASA-1.3+ NASA-1.3 NASA-1.3 +Naumen+ Naumen+ Naumen Naumen +NCSA+ NCSA+ NCSA NCSA +NGPL+ NGPL+ NGPL NGPL +Nokia+ Nokia+ Nokia Nokia +NPOSL-3.0+ NPOSL-3.0+ NPOSL-3.0 NPOSL-3.0 +NTP+ NTP+ NTP NTP +OCLC-2.0+ OCLC-2.0+ OCLC-2.0 OCLC-2.0 +ODbL-1.0+ ODbL-1.0+ ODbL-1.0 ODbL-1.0 +OFL-1.0+ OFL-1.0+ OFL-1.0 OFL-1.0 OFL-1.1 OFL +OFL-1.1+ OFL-1.1+ OFL-1.1 OFL-1.1 OFL-1.1 Open Font License OFL-1.1 SIL Open Font License OFL-1.1 SIL Open Font License 1.1 +OGTSL+ OGTSL+ OGTSL OGTSL +OLDAP-2.8+ OLDAP-2.8+ OLDAP-2.8 OLDAP-2.8 OLDAP-2.8 openldap 2.8 +OpenSSL+ OpenSSL+ OpenSSL OpenSSL +OSL-1.0+ OSL-1.0+ OSL-1.0 OSL-1.0 +OSL-2.0+ OSL-2.0+ OSL-2.0 OSL-2.0 +OSL-2.1+ OSL-2.1+ OSL-2.1 OSL-2.1 +OSL-3.0+ OSL-3.0+ OSL-3.0 OSL-3.0 +PDDL-1.0+ PDDL-1.0+ PDDL-1.0 PDDL-1.0 +PHP-3.01+ PHP-3.01+ PHP-3.01 PHP-3.01 PHP-3.01 PHP-3.0.1 PHP-3.01 PHP License PHP-3.01 The PHP License, version 3.01 +PHP-3.0+ PHP-3.0+ PHP-3.0 PHP-3.0 +PostgreSQL+ PostgreSQL+ PostgreSQL PostgreSQL Python-2.0 PSF Python-2.0 Python Python-2.0 Python .. +Python-2.0+ Python-2.0+ Python-2.0 Python-2.0 Python-2.0 Python Copyright Python-2.0 Python License .. Python-2.0 Python Software Foundation License QPL-1.0 QPL QPL-1.0 QPL .. +QPL-1.0+ QPL-1.0+ QPL-1.0 QPL-1.0 +RHeCos-1.1+ RHeCos-1.1+ RHeCos-1.1 RHeCos-1.1 +RPL-1.5+ RPL-1.5+ RPL-1.5 RPL-1.5 +RPSL-1.0+ RPSL-1.0+ RPSL-1.0 RPSL-1.0 +RSCPL+ RSCPL+ RSCPL RSCPL Ruby GPL-2.0+ or Ruby Ruby GPLv2+ or Ruby +Ruby+ Ruby+ Ruby Ruby +SAX-PD+ SAX-PD+ SAX-PD SAX-PD +SimPL-2.0+ SimPL-2.0+ SimPL-2.0 SimPL-2.0 +Sleepycat+ Sleepycat+ Sleepycat Sleepycat +SPL-1.0+ SPL-1.0+ SPL-1.0 SPL-1.0 +SugarCRM-1.1.3+ SugarCRM-1.1.3+ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-AGPL-3.0+ AGPLv3+ SUSE-Apache-2.0+ ASLv2.0+ @@ -377,6 +526,7 @@ SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS lice SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) +SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense @@ -429,23 +579,36 @@ SUSE-XFree86-1.0 The old version of the XFree86 license is not upstream at SPDX. SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) +VSL-1.0+ VSL-1.0+ VSL-1.0 VSL-1.0 +W3C+ W3C+ W3C W3C W3C W3C Software License +Watcom-1.0+ Watcom-1.0+ Watcom-1.0 Watcom-1.0 +WXwindows+ WXwindows+ WXwindows WXwindows +XFree86-1.1+ XFree86-1.1+ XFree86-1.1 XFree86-1.1 +Xnet+ Xnet+ Xnet Xnet +YPL-1.0+ YPL-1.0+ YPL-1.0 YPL-1.0 +YPL-1.1+ YPL-1.1+ YPL-1.1 YPL-1.1 +Zimbra-1.3+ Zimbra-1.3+ Zimbra-1.3 Zimbra-1.3 Zlib zlib +Zlib+ Zlib+ Zlib Zlib Zlib zlib/libpng License Zlib Zlib License +ZPL-1.1+ ZPL-1.1+ ZPL-1.1 ZPL-1.1 ZPL-2.0 Zope Public License ZPL-2.0 ZPL +ZPL-2.0+ ZPL-2.0+ ZPL-2.0 ZPL-2.0 +ZPL-2.1+ ZPL-2.1+ ZPL-2.1 ZPL 2.1 ZPL-2.1 ZPL-2.1 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 5a06dd0..38d8721 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 6 13:08:22 UTC 2012 - coolo@suse.com + +- allow a + variant for all spdx licenses + ------------------------------------------------------------------- Tue Sep 25 12:29:17 UTC 2012 - coolo@suse.com -- 2.51.1 From 5422c76a85933312ef2666f2529bdcd265ecf712a9ced1adaf6b56e54802528a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Oct 2012 11:03:29 +0000 Subject: [PATCH 077/151] - fix duplicate for Artistic-1.0+ OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=99 --- licenses_changes.txt | 2 +- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index daea58d..e8ee75f 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -494,7 +494,7 @@ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-AGPL-3.0+ AGPLv3+ SUSE-Apache-2.0+ ASLv2.0+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE -SUSE-Artistic-1.0+ Artistic-1.0+ +SUSE-Artistic-1.0+ SUSE-Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 38d8721..5c925a0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 8 11:03:10 UTC 2012 - coolo@suse.com + +- fix duplicate for Artistic-1.0+ + ------------------------------------------------------------------- Sat Oct 6 13:08:22 UTC 2012 - coolo@suse.com -- 2.51.1 From 964b0d8d109d57cf3ab5f81f4e12abb6a701ef50395f5bbdbfa84fe8a869dd9c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Oct 2012 11:45:44 +0000 Subject: [PATCH 078/151] - remove SUSE- prefix for licenses that only have a + OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=100 --- fetch-licenses.sh | 3 ++- licenses_changes.txt | 26 ++++++++++++++++---------- obs-service-format_spec_file.changes | 5 +++++ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/fetch-licenses.sh b/fetch-licenses.sh index e850cd3..abc5d9b 100644 --- a/fetch-licenses.sh +++ b/fetch-licenses.sh @@ -1,4 +1,4 @@ -curl "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt +curl -s "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt 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.txt ; echo "$i+ $i+" >> licenses_changes.txt ; @@ -6,3 +6,4 @@ done sort -o licenses_changes.txt -u licenses_changes.txt ( echo "First line" ; cat licenses_changes.txt ) > t mv t licenses_changes.txt + diff --git a/licenses_changes.txt b/licenses_changes.txt index e8ee75f..9d8d0ed 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -16,7 +16,9 @@ AFL-3.0 AFL-3.0 AGPL-3.0 Affero GPL AGPL-3.0+ AGPL-3.0+ AGPL-3.0 AGPL-3.0 +AGPL-3.0+ AGPLv3+ AGPL-3.0 AGPLv3 +AGPL-3.0+ SUSE-AGPL-3.0+ ANTLR-PD+ ANTLR-PD+ ANTLR-PD ANTLR-PD Apache-1.0+ Apache-1.0+ @@ -39,7 +41,9 @@ Apache-2.0 ASL2 Apache-2.0 ASL 2.0 Apache-2.0 ASLv.. Apache-2.0 ASLv2 +Apache-2.0+ ASLv2.0+ Apache-2.0 ASLv2.0 +Apache-2.0+ SUSE-Apache-2.0+ Apache-2.0 The Apache Software License APL-1.0+ APL-1.0+ APL-1.0 APL-1.0 @@ -60,6 +64,7 @@ Artistic-1.0 Artistic license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. Artistic-1.0 or GPL-1.0+ Perl License +Artistic-1.0+ SUSE-Artistic-1.0+ Artistic-2.0+ Artistic-2.0+ Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 @@ -222,21 +227,29 @@ Fair+ Fair+ Fair Fair Frameworx-1.0+ Frameworx-1.0+ Frameworx-1.0 Frameworx-1.0 +GFDL-1.1+ FDL v1.1 or later GFDL-1.1+ GFDL-1.1+ GFDL-1.1 GFDL 1.1 GFDL-1.1 GFDL-1.1 GFDL-1.1 GFDLv1.1 GFDL-1.1 GFDL v1.1 GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.1+ SUSE-GFDL-1.1+ +GFDL-1.2+ FDL-1.2+ +GFDL-1.2+ FDLv1.2+ GFDL-1.2+ GFDL-1.2+ GFDL-1.2 GFDL 1.2 GFDL-1.2 GFDL-1.2 +GFDL-1.2+ GFDLv1.2+ GFDL-1.2 GFDLv1.2 GFDL-1.2 GFDL v1.2 GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.2+ SUSE-GFDL-1.2+ +GFDL-1.3+ FDL-1.3+ GFDL-1.3+ GFDL-1.3+ GFDL-1.3 GFDL-1.3 GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) +GFDL-1.3+ SUSE-GFDL-1.3+ GPL-1.0+ GPL+ GPL-1.0++ GPL-1.0++ GPL-1.0+ GPL-1.0+ @@ -392,8 +405,11 @@ MPL-1.1 Mozilla Public License 1.1 MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) MPL-1.1+ MPL-1.1+ MPL-1.1 MPL-1.1 +MPL-1.1+ MPL 1.1 or later +MPL-1.1+ MPLv1.1+ MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. +MPL-1.1+ SUSE-MPL-1.1+ MPL-2.0+ MPL-2.0+ MPL-2.0 MPL-2.0 MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception+ @@ -491,10 +507,7 @@ SPL-1.0+ SPL-1.0+ SPL-1.0 SPL-1.0 SugarCRM-1.1.3+ SugarCRM-1.1.3+ SugarCRM-1.1.3 SugarCRM-1.1.3 -SUSE-AGPL-3.0+ AGPLv3+ -SUSE-Apache-2.0+ ASLv2.0+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE -SUSE-Artistic-1.0+ SUSE-Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 @@ -508,11 +521,6 @@ SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en SUSE-Freetype Freetype SUSE-Freeware Freeware SUSE-Freeware Freeware license -SUSE-GFDL-1.1+ FDL v1.1 or later -SUSE-GFDL-1.2+ FDL-1.2+ -SUSE-GFDL-1.2+ FDLv1.2+ -SUSE-GFDL-1.2+ GFDLv1.2+ -SUSE-GFDL-1.3+ FDL-1.3+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-Gnuplot Gnuplot SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception @@ -543,8 +551,6 @@ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition -SUSE-MPL-1.1+ MPL 1.1 or later -SUSE-MPL-1.1+ MPLv1.1+ SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license SUSE-NetCDF SUSE-NetCDF SUSE-NonFree NonFree licenses diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 5c925a0..27c14f2 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 8 11:45:31 UTC 2012 - coolo@suse.com + +- remove SUSE- prefix for licenses that only have a + + ------------------------------------------------------------------- Mon Oct 8 11:03:10 UTC 2012 - coolo@suse.com -- 2.51.1 From adf2f36de591e546e0ca85bd7ad1a43ccd6d008e52a1ff8e61a7c392210cc6a1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 24 Oct 2012 05:24:55 +0000 Subject: [PATCH 079/151] - more licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=102 --- licenses_changes.txt | 2 ++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 9d8d0ed..74156c2 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -510,6 +510,7 @@ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility +SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh @@ -542,6 +543,7 @@ SUSE-IJG JPEG License SUSE-ImageMagick ImageMagick SUSE-Innernet-2.00 Inner Net License 2.00 SUSE-Innernet-2.0 Inner Net License 2 +SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 27c14f2..7e70f29 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 24 05:24:39 UTC 2012 - coolo@suse.com + +- more licenses + ------------------------------------------------------------------- Mon Oct 8 11:45:31 UTC 2012 - coolo@suse.com -- 2.51.1 From ee33a0a3c735439e178ca08224935459b7bece7092157b6b782299185666b69f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 7 Nov 2012 13:55:11 +0000 Subject: [PATCH 080/151] - one more license OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=104 --- licenses_changes.txt | 1 + obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 74156c2..09f79f6 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -546,6 +546,7 @@ SUSE-Innernet-2.0 Inner Net License 2 SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception +SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7e70f29..838819b 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 13:54:57 UTC 2012 - coolo@suse.com + +- one more license + ------------------------------------------------------------------- Wed Oct 24 05:24:39 UTC 2012 - coolo@suse.com -- 2.51.1 From 4e1cfac214b817e47131ea81304196fa68660ffeee3fafa6f37545abf3f2c664 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 24 Jan 2013 06:11:35 +0000 Subject: [PATCH 081/151] - more licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=106 --- licenses_changes.txt | 77 ++++++++++++++++++++++++++++ obs-service-format_spec_file.changes | 5 ++ obs-service-format_spec_file.spec | 2 +- 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 09f79f6..a366bac 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -19,6 +19,8 @@ AGPL-3.0 AGPL-3.0 AGPL-3.0+ AGPLv3+ AGPL-3.0 AGPLv3 AGPL-3.0+ SUSE-AGPL-3.0+ +Aladdin+ Aladdin+ +Aladdin Aladdin ANTLR-PD+ ANTLR-PD+ ANTLR-PD ANTLR-PD Apache-1.0+ Apache-1.0+ @@ -68,6 +70,10 @@ Artistic-1.0+ SUSE-Artistic-1.0+ Artistic-2.0+ Artistic-2.0+ Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 +BitTorrent-1.0+ BitTorrent-1.0+ +BitTorrent-1.0 BitTorrent-1.0 +BitTorrent-1.1+ BitTorrent-1.1+ +BitTorrent-1.1 BitTorrent-1.1 BSD-2-Clause BSD2c BSD-2-Clause BSD-2c BSD-2-Clause BSD 2 clause @@ -91,6 +97,8 @@ BSD-3-Clause BSD 3-clause (or similar) BSD-3-Clause BSD-3-clause (or similar) BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) +BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ +BSD-3-Clause-Clear BSD-3-Clause-Clear BSD-3-Clause New BSD License BSD-4-Clause BSD4c BSD-4-Clause+ BSD-4-Clause+ @@ -178,6 +186,8 @@ CNRI-Python+ CNRI-Python+ CNRI-Python CNRI-Python CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible CNRI-Python-GPL-Compatible +Condor-1.1+ Condor-1.1+ +Condor-1.1 Condor-1.1 CPAL-1.0+ CPAL-1.0+ CPAL-1.0 CPAL-1.0 CPL-1.0 Common Public License v1.0 @@ -227,6 +237,8 @@ Fair+ Fair+ Fair Fair Frameworx-1.0+ Frameworx-1.0+ Frameworx-1.0 Frameworx-1.0 +FTL+ FTL+ +FTL FTL GFDL-1.1+ FDL v1.1 or later GFDL-1.1+ GFDL-1.1+ GFDL-1.1 GFDL 1.1 @@ -315,6 +327,12 @@ gSOAP-1.3b+ gSOAP-1.3b+ gSOAP-1.3b gSOAP-1.3b HPND+ HPND+ HPND HPND +IJG+ IJG+ +IJG IJG +Imlib2+ Imlib2+ +Imlib2 Imlib2 +Intel+ Intel+ +Intel Intel IPA+ IPA+ IPA IPA IPA see IPA_Font_License_Agreement_v1.0.txt @@ -326,6 +344,8 @@ IPL-1.0 IPL-1.0 ISC+ ISC+ ISC ISC ISC ISC License +JSON+ JSON+ +JSON JSON LGPL-2.0++ LGPL-2.0++ LGPL-2.0+ LGPL-2.0+ LGPL-2.0 LGPL-2.0 @@ -374,6 +394,8 @@ LPPL-1.1+ LPPL-1.1+ LPPL-1.1 LPPL-1.1 LPPL-1.2+ LPPL-1.2+ LPPL-1.2 LPPL-1.2 +LPPL-1.3a+ LPPL-1.3a+ +LPPL-1.3a LPPL-1.3a LPPL-1.3c LPPL .. LPPL-1.3c+ LPPL-1.3c+ LPPL-1.3c LPPL-1.3c @@ -425,12 +447,20 @@ NASA-1.3+ NASA-1.3+ NASA-1.3 NASA-1.3 Naumen+ Naumen+ Naumen Naumen +NBPL-1.0+ NBPL-1.0+ +NBPL-1.0 NBPL-1.0 NCSA+ NCSA+ NCSA NCSA NGPL+ NGPL+ NGPL NGPL Nokia+ Nokia+ Nokia Nokia +NOSL+ NOSL+ +NOSL NOSL +NPL-1.0+ NPL-1.0+ +NPL-1.0 NPL-1.0 +NPL-1.1+ NPL-1.1+ +NPL-1.1 NPL-1.1 NPOSL-3.0+ NPOSL-3.0+ NPOSL-3.0 NPOSL-3.0 NTP+ NTP+ @@ -449,11 +479,43 @@ OFL-1.1 SIL Open Font License OFL-1.1 SIL Open Font License 1.1 OGTSL+ OGTSL+ OGTSL OGTSL +OLDAP-1.1+ OLDAP-1.1+ +OLDAP-1.1 OLDAP-1.1 +OLDAP-1.2+ OLDAP-1.2+ +OLDAP-1.2 OLDAP-1.2 +OLDAP-1.3+ OLDAP-1.3+ +OLDAP-1.3 OLDAP-1.3 +OLDAP-1.4+ OLDAP-1.4+ +OLDAP-1.4 OLDAP-1.4 +OLDAP-2.0.1+ OLDAP-2.0.1+ +OLDAP-2.0.1 OLDAP-2.0.1 +OLDAP-2.0+ OLDAP-2.0+ +OLDAP-2.0 OLDAP-2.0 +OLDAP-2.1+ OLDAP-2.1+ +OLDAP-2.1 OLDAP-2.1 +OLDAP-2.2.1+ OLDAP-2.2.1+ +OLDAP-2.2.1 OLDAP-2.2.1 +OLDAP-2.2.2+ OLDAP-2.2.2+ +OLDAP-2.2.2 OLDAP-2.2.2 +OLDAP-2.2+ OLDAP-2.2+ +OLDAP-2.2 OLDAP-2.2 +OLDAP-2.3+ OLDAP-2.3+ +OLDAP-2.3 OLDAP-2.3 +OLDAP-2.4+ OLDAP-2.4+ +OLDAP-2.4 OLDAP-2.4 +OLDAP-2.5+ OLDAP-2.5+ +OLDAP-2.5 OLDAP-2.5 +OLDAP-2.6+ OLDAP-2.6+ +OLDAP-2.6 OLDAP-2.6 +OLDAP-2.7+ OLDAP-2.7+ +OLDAP-2.7 OLDAP-2.7 OLDAP-2.8+ OLDAP-2.8+ OLDAP-2.8 OLDAP-2.8 OLDAP-2.8 openldap 2.8 OpenSSL+ OpenSSL+ OpenSSL OpenSSL +OPL-1.0+ OPL-1.0+ +OPL-1.0 OPL-1.0 OSL-1.0+ OSL-1.0+ OSL-1.0 OSL-1.0 OSL-2.0+ OSL-2.0+ @@ -499,10 +561,20 @@ Ruby+ Ruby+ Ruby Ruby SAX-PD+ SAX-PD+ SAX-PD SAX-PD +SGI-B-1.0+ SGI-B-1.0+ +SGI-B-1.0 SGI-B-1.0 +SGI-B-1.1+ SGI-B-1.1+ +SGI-B-1.1 SGI-B-1.1 +SGI-B-2.0+ SGI-B-2.0+ +SGI-B-2.0 SGI-B-2.0 SimPL-2.0+ SimPL-2.0+ SimPL-2.0 SimPL-2.0 +SISSL+ SISSL+ +SISSL SISSL Sleepycat+ Sleepycat+ Sleepycat Sleepycat +SMLNJ+ SMLNJ+ +SMLNJ SMLNJ SPL-1.0+ SPL-1.0+ SPL-1.0 SPL-1.0 SugarCRM-1.1.3+ SugarCRM-1.1.3+ @@ -512,6 +584,7 @@ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 +SUSE-CPL-0.5 Common Public License 0.5 SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf @@ -595,8 +668,12 @@ W3C W3C W3C W3C Software License Watcom-1.0+ Watcom-1.0+ Watcom-1.0 Watcom-1.0 +WTFPL+ WTFPL+ +WTFPL WTFPL WXwindows+ WXwindows+ WXwindows WXwindows +X11+ X11+ +X11 X11 XFree86-1.1+ XFree86-1.1+ XFree86-1.1 XFree86-1.1 Xnet+ Xnet+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 838819b..ebb149e 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com + +- more licenses + ------------------------------------------------------------------- Wed Nov 7 13:54:57 UTC 2012 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 022ff2f..23aae5c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 -- 2.51.1 From 6b0c40686b1052291d74df9814c0d710db2a9a850c743bd1206c49ba3fb2cfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 08:02:08 +0000 Subject: [PATCH 082/151] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=108 --- licenses_changes.txt | 1 - obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index a366bac..6d79919 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -414,7 +414,6 @@ MIT MIT License (or similar) MIT MIT/X11 MIT MIT/X Consortium License MIT MIT/X License -MIT X11 MIT X11 (BSD like) MIT X11 MIT MIT X11/MIT diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index ebb149e..766a5a6 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.com + +- drop double definition of X11 license + ------------------------------------------------------------------- Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com -- 2.51.1 From 16e5e04467690d5b8dee66d2da61d119068864d6f61e018c841b9cd62ea6f0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 08:09:23 +0000 Subject: [PATCH 083/151] simple self check OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=109 --- obs-service-format_spec_file.changes | 3 ++- obs-service-format_spec_file.spec | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 766a5a6..927edff 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.com +Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.de - drop double definition of X11 license +- add basic self check on building package ------------------------------------------------------------------- Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 23aae5c..3977ebb 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -57,6 +57,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +%check +perl %{SOURCE2} %_topdir/SOURCES/%name.spec + %files %defattr(-,root,root) %doc COPYING -- 2.51.1 From a54a3cd83e33923fae060bdd45dbd23e9a81190935ec9c82ed5ab9af7d1ae3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 09:01:57 +0000 Subject: [PATCH 084/151] use new source validator package name OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=110 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 3977ebb..dbb66aa 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,7 +30,7 @@ Source3: patch_license Source4: licenses_changes.txt Source5: fetch-licenses.sh Source100: COPYING -Requires: osc-source_validator +Requires: obs-service-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -- 2.51.1 From 8005ddd5d841dd4739006c2618938084e760c76d803ce9477dfd8b3593c24033 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 25 Jan 2013 09:30:44 +0000 Subject: [PATCH 085/151] map X11 differently OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=111 --- licenses_changes.txt | 15 ++++++++------- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 6d79919..3fb2c91 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -411,12 +411,6 @@ MIT MIT-Licence MIT MIT license MIT MIT License MIT MIT License (or similar) -MIT MIT/X11 -MIT MIT/X Consortium License -MIT MIT/X License -MIT X11 (BSD like) -MIT X11 MIT -MIT X11/MIT Motosoto+ Motosoto+ Motosoto Motosoto MPL-1.0+ MPL-1.0+ @@ -656,10 +650,10 @@ SUSE-Vim SUSE-Vim SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) -SUSE-XFree86-1.0 The old version of the XFree86 license is not upstream at SPDX.org SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) +SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) VSL-1.0+ VSL-1.0+ VSL-1.0 VSL-1.0 W3C+ W3C+ @@ -671,8 +665,15 @@ WTFPL+ WTFPL+ WTFPL WTFPL WXwindows+ WXwindows+ WXwindows WXwindows +X11 MIT/X11 +X11 MIT/X Consortium License +X11 MIT/X License +X11 SUSE-XFree86-1.0 X11+ X11+ X11 X11 +X11 X11 (BSD like) +X11 X11 MIT +X11 X11/MIT XFree86-1.1+ XFree86-1.1+ XFree86-1.1 XFree86-1.1 Xnet+ Xnet+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 927edff..c7ec216 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 25 09:30:32 UTC 2013 - coolo@suse.com + +- official fix for the X11 license + ------------------------------------------------------------------- Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.de -- 2.51.1 From 54c7a40cb5f71ae7b66e8794625696bb98908c88da324d8434291251e593faf7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 1 Feb 2013 11:57:20 +0000 Subject: [PATCH 086/151] - add a + version for all SUSE licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=113 --- licenses_changes.txt | 82 +++++++++++++++++++++++++++- obs-service-format_spec_file.changes | 5 ++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 3fb2c91..26b1d80 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -573,87 +573,167 @@ SPL-1.0 SPL-1.0 SugarCRM-1.1.3+ SugarCRM-1.1.3+ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE +SUSE-Arphic+ SUSE-Arphic+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html +SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility +SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php +SUSE-CacertRoot+ SUSE-CacertRoot+ SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 +SUSE-CC-Sampling-Plus-1.0+ SUSE-CC-Sampling-Plus-1.0+ SUSE-CPL-0.5 Common Public License 0.5 +SUSE-CPL-0.5+ SUSE-CPL-0.5+ SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) +SUSE-DMTF+ SUSE-DMTF+ SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh +SUSE-Docbook-XSL+ SUSE-Docbook-XSL+ SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf +SUSE-Egenix-1.1.0+ SUSE-Egenix-1.1.0+ SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright +SUSE-FHS+ SUSE-FHS+ SUSE-Firmware Firmware license, redistributable unmodified +SUSE-Firmware+ SUSE-Firmware+ SUSE-FLTK Fltk +SUSE-FLTK+ SUSE-FLTK+ SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en +SUSE-Free-Art-1.3+ SUSE-Free-Art-1.3+ SUSE-Freetype Freetype +SUSE-Freetype+ SUSE-Freetype+ SUSE-Freeware Freeware SUSE-Freeware Freeware license +SUSE-Freeware+ SUSE-Freeware+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS +SUSE-GL2PS-2.0+ SUSE-GL2PS-2.0+ SUSE-Gnuplot Gnuplot +SUSE-Gnuplot+ SUSE-Gnuplot+ +SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception +SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ +SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) +SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them +SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries +SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions +SUSE-GPL-3.0+-with-autoconf-exception+ SUSE-GPL-3.0+-with-autoconf-exception+ SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses +SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) +SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) +SUSE-GPL-3.0-with-openssl-exception+ SUSE-GPL-3.0-with-openssl-exception+ +SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) +SUSE-GPL-3.0-with-template-exception+ SUSE-GPL-3.0-with-template-exception+ SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ +SUSE-IBPL-1.0+ SUSE-IBPL-1.0+ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ +SUSE-IDPL-1.0+ SUSE-IDPL-1.0+ SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense +SUSE-IEEE+ SUSE-IEEE+ SUSE-IJG JPEG License +SUSE-IJG+ SUSE-IJG+ SUSE-ImageMagick ImageMagick +SUSE-ImageMagick+ SUSE-ImageMagick+ SUSE-Innernet-2.00 Inner Net License 2.00 +SUSE-Innernet-2.00+ SUSE-Innernet-2.00+ SUSE-Innernet-2.0 Inner Net License 2 +SUSE-Innernet-2.0+ SUSE-Innernet-2.0+ SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint +SUSE-JSON+ SUSE-JSON+ SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html +SUSE-LDPL-2.0+ SUSE-LDPL-2.0+ +SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 +SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception +SUSE-LGPL-2.1+-with-GCC-exception+ SUSE-LGPL-2.1+-with-GCC-exception+ SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 +SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) +SUSE-Liberation+ SUSE-Liberation+ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) +SUSE-MakeIndex+ SUSE-MakeIndex+ SUSE-Manpages Manpages licenses (linux man pages e.g.) +SUSE-Manpages+ SUSE-Manpages+ SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) +SUSE-MgOpen+ SUSE-MgOpen+ SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition +SUSE-mirror+ SUSE-mirror+ SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license +SUSE-mplus+ SUSE-mplus+ +SUSE-NetCDF+ SUSE-NetCDF+ SUSE-NetCDF SUSE-NetCDF SUSE-NonFree NonFree licenses +SUSE-NonFree+ SUSE-NonFree+ +SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice +SUSE-OldFSFDocLicense+ SUSE-OldFSFDocLicense+ +SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) SUSE-OML Open Market License (tracked by Fedora as OML) +SUSE-OML+ SUSE-OML+ SUSE-OSL-1.1 OSL-1.1 +SUSE-OSL-1.1+ SUSE-OSL-1.1+ SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +SUSE-Permissive+ SUSE-Permissive+ SUSE-PHP-2.02 PHP 2.02 +SUSE-PHP-2.02+ SUSE-PHP-2.02+ SUSE-Public-Domain Public domain SUSE-Public-Domain Public Domain SUSE-Public-Domain Public Domain, Freeware SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +SUSE-Public-Domain+ SUSE-Public-Domain+ SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) +SUSE-Python-1.6+ SUSE-Python-1.6+ SUSE-Qhull Qhull +SUSE-Qhull+ SUSE-Qhull+ SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ +SUSE-QWT-1.0+ SUSE-QWT-1.0+ +SUSE-Redistributable-Content+ SUSE-Redistributable-Content+ SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Repoze http://repoze.org/license.html +SUSE-Repoze+ SUSE-Repoze+ SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-Sendmail+ SUSE-Sendmail+ SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) +SUSE-SGI-FreeB-2.0+ SUSE-SGI-FreeB-2.0+ SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license +SUSE-SIP+ SUSE-SIP+ SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt +SUSE-SLIB+ SUSE-SLIB+ SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) +SUSE-SNIA-1.0+ SUSE-SNIA-1.0+ SUSE-SNIA-1.1 SNIA 1.1 +SUSE-SNIA-1.1+ SUSE-SNIA-1.1+ SUSE-Sun-Laboratories http://pastebin.com/UubnS3se +SUSE-Sun-Laboratories+ SUSE-Sun-Laboratories+ SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) +SUSE-TCL+ SUSE-TCL+ SUSE-TeX http://en.wikipedia.org/wiki/TeX#License +SUSE-TeX+ SUSE-TeX+ +SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vpazbrt2beddyhgwcch4sduhnmmefdotlyelojxg4tyzllhb4a/tgppl.html +SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ +SUSE-Vim+ SUSE-Vim+ SUSE-Vim SUSE-Vim SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ +SUSE-WTFPL-2.0+ SUSE-WTFPL-2.0+ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense +SUSE-Xano+ SUSE-Xano+ SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) +SUSE-Xenonsoft-1.00+ SUSE-Xenonsoft-1.00+ +SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license +SUSE-xinetd+ SUSE-xinetd+ SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) -SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) +SUSE-XSL-Lint+ SUSE-XSL-Lint+ VSL-1.0+ VSL-1.0+ VSL-1.0 VSL-1.0 W3C+ W3C+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c7ec216..30e34dd 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 1 11:57:05 UTC 2013 - coolo@suse.com + +- add a + version for all SUSE licenses + ------------------------------------------------------------------- Fri Jan 25 09:30:32 UTC 2013 - coolo@suse.com -- 2.51.1 From 15e64805b12adb2bf557b5cd0281ea9857b2d8306a3d8b0e3fcd964c3871dcf8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 17 Feb 2013 07:07:56 +0000 Subject: [PATCH 087/151] bump version OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=115 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index dbb66aa..0235b7c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 0.4.1 +Version: 0.4.2 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file Source: format_spec_file -- 2.51.1 From 5ca1d14ab3befca2decc3d886cdeb50e49c3adf231d63fe2f3ba473b0468c739 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 17 Feb 2013 07:10:58 +0000 Subject: [PATCH 088/151] - update fetch-licenses and bump version OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=116 --- fetch-licenses.sh | 5 ++++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fetch-licenses.sh b/fetch-licenses.sh index abc5d9b..aafa482 100644 --- a/fetch-licenses.sh +++ b/fetch-licenses.sh @@ -1,4 +1,8 @@ curl -s "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt +grep ^SUSE- licenses_changes.txt | cut -d' ' -f1 | while read l; do + echo "$l+ $l+" >> licenses_changes.txt ; +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 echo "$i $i" >> licenses_changes.txt ; echo "$i+ $i+" >> licenses_changes.txt ; @@ -6,4 +10,3 @@ done sort -o licenses_changes.txt -u licenses_changes.txt ( echo "First line" ; cat licenses_changes.txt ) > t mv t licenses_changes.txt - diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 30e34dd..29bfafe 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 17 07:10:40 UTC 2013 - coolo@suse.com + +- update fetch-licenses and bump version + ------------------------------------------------------------------- Fri Feb 1 11:57:05 UTC 2013 - coolo@suse.com -- 2.51.1 From fa7fd7be3ca90a06f403fb1f4b26b7f684b66b8ba5032d2e67c99b88815ab95b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 8 Mar 2013 06:24:49 +0000 Subject: [PATCH 089/151] - add SUSE-BSD-Mark-Modifications for aspell OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=118 --- licenses_changes.txt | 2 ++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 26b1d80..01acc7c 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -578,6 +578,8 @@ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ +SUSE-BSD-Mark-Modifications BSD-Mark-Modifications +SUSE-BSD-Mark-Modifications+ SUSE-BSD-Mark-Modifications+ SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php SUSE-CacertRoot+ SUSE-CacertRoot+ SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 29bfafe..0a09ec8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 8 06:24:40 UTC 2013 - coolo@suse.com + +- add SUSE-BSD-Mark-Modifications for aspell + ------------------------------------------------------------------- Sun Feb 17 07:10:40 UTC 2013 - coolo@suse.com -- 2.51.1 From 7beb118d7b60131d2eb19d9db31f781ea1a411972cb2d6af33e524e9b19efc66 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Apr 2013 07:51:22 +0000 Subject: [PATCH 090/151] - adding SUSE-Beerware OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=120 --- licenses_changes.txt | 11 +++++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 01acc7c..07d336d 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -13,6 +13,8 @@ AFL-2.1 AFL 2.1 AFL-2.1 AFL-2.1 AFL-3.0+ AFL-3.0+ AFL-3.0 AFL-3.0 +AGPL-1.0+ AGPL-1.0+ +AGPL-1.0 AGPL-1.0 AGPL-3.0 Affero GPL AGPL-3.0+ AGPL-3.0+ AGPL-3.0 AGPL-3.0 @@ -34,6 +36,7 @@ Apache-2.0 Apache 2.0 Apache-2.0 Apache-2.0 Apache-2.0 Apache License Apache-2.0 Apache License 2.0 +Apache-2.0 Apache License Version 2.0 Apache-2.0 Apache License, Version 2.0 Apache-2.0 Apache Software License Apache-2.0 Apache Software License .. @@ -200,8 +203,12 @@ CPL-1.0 CPL 1.0 CPL-1.0 CPL 1.0 ... CPL-1.0 CPL-1.0 CPL-1.0 CPL (Common Public License) v1 +CPOL-1.02+ CPOL-1.02+ +CPOL-1.02 CPOL-1.02 CUA-OPL-1.0+ CUA-OPL-1.0+ CUA-OPL-1.0 CUA-OPL-1.0 +D-FSL-1.0+ D-FSL-1.0+ +D-FSL-1.0 D-FSL-1.0 ECL-1.0+ ECL-1.0+ ECL-1.0 ECL-1.0 ECL-2.0+ ECL-2.0+ @@ -542,6 +549,8 @@ QPL-1.0+ QPL-1.0+ QPL-1.0 QPL-1.0 RHeCos-1.1+ RHeCos-1.1+ RHeCos-1.1 RHeCos-1.1 +RPL-1.1+ RPL-1.1+ +RPL-1.1 RPL-1.1 RPL-1.5+ RPL-1.5+ RPL-1.5 RPL-1.5 RPSL-1.0+ RPSL-1.0+ @@ -574,6 +583,8 @@ SugarCRM-1.1.3+ SugarCRM-1.1.3+ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Arphic+ SUSE-Arphic+ +SUSE-Beerware Beerware License like http://en.wikipedia.org/wiki/Beerware#License +SUSE-Beerware+ SUSE-Beerware+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0a09ec8..34d4b44 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 19 07:50:56 UTC 2013 - coolo@suse.com + +- adding SUSE-Beerware + ------------------------------------------------------------------- Fri Mar 8 06:24:40 UTC 2013 - coolo@suse.com -- 2.51.1 From 64363bbc6d7b52c80a2d6d663d5f835dd0a141309699b6572878f08bf6ff7bf3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 24 Apr 2013 08:27:28 +0000 Subject: [PATCH 091/151] - adding SUSE-Permissive-Modify-By-Patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=122 --- licenses_changes.txt | 2 ++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 07d336d..44aa7c0 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -694,6 +694,8 @@ SUSE-OML Open Market License (tracked by Fedora as OML) SUSE-OML+ SUSE-OML+ SUSE-OSL-1.1 OSL-1.1 SUSE-OSL-1.1+ SUSE-OSL-1.1+ +SUSE-Permissive-Modify-By-Patch Similar to SUSE-Permissive but copyright holder has specified that modification is only allowed by patch +SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. SUSE-Permissive+ SUSE-Permissive+ SUSE-PHP-2.02 PHP 2.02 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 34d4b44..eac5d89 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 24 08:27:12 UTC 2013 - coolo@suse.com + +- adding SUSE-Permissive-Modify-By-Patch + ------------------------------------------------------------------- Fri Apr 19 07:50:56 UTC 2013 - coolo@suse.com -- 2.51.1 From c25d3bcf462326f21aed4fd47dd89ad4b011dc85458ded322c7739e2f2b64f1d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Jun 2013 12:35:55 +0000 Subject: [PATCH 092/151] - add SUSE-GitSlave OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=124 --- licenses_changes.txt | 3 +++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 44aa7c0..75b5347 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -616,6 +616,8 @@ SUSE-Freetype+ SUSE-Freetype+ SUSE-Freeware Freeware SUSE-Freeware Freeware license SUSE-Freeware+ SUSE-Freeware+ +SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 +SUSE-Gitslave+ SUSE-Gitslave+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-GL2PS-2.0+ SUSE-GL2PS-2.0+ SUSE-Gnuplot Gnuplot @@ -703,6 +705,7 @@ SUSE-PHP-2.02+ SUSE-PHP-2.02+ SUSE-Public-Domain Public domain SUSE-Public-Domain Public Domain SUSE-Public-Domain Public Domain, Freeware +SUSE-Public-Domain Public Domain License SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw SUSE-Public-Domain+ SUSE-Public-Domain+ SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index eac5d89..a67a412 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 12:35:33 UTC 2013 - coolo@suse.com + +- add SUSE-GitSlave + ------------------------------------------------------------------- Wed Apr 24 08:27:12 UTC 2013 - coolo@suse.com -- 2.51.1 From 8596b543c5adda1cfca201ffdadb068942289ff5fb5c692187a84c58793863eb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 9 Dec 2013 19:28:31 +0000 Subject: [PATCH 093/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=126 --- licenses_changes.txt | 10 ++++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 75b5347..5c1b077 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -68,7 +68,11 @@ Artistic-1.0 Artistic-1.0 Artistic-1.0 Artistic license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. +Artistic-1.0-cl8+ Artistic-1.0-cl8+ +Artistic-1.0-cl8 Artistic-1.0-cl8 Artistic-1.0 or GPL-1.0+ Perl License +Artistic-1.0-Perl+ Artistic-1.0-Perl+ +Artistic-1.0-Perl Artistic-1.0-Perl Artistic-1.0+ SUSE-Artistic-1.0+ Artistic-2.0+ Artistic-2.0+ Artistic-2.0 Artistic 2.0 @@ -334,6 +338,8 @@ gSOAP-1.3b+ gSOAP-1.3b+ gSOAP-1.3b gSOAP-1.3b HPND+ HPND+ HPND HPND +IBM-pibs+ IBM-pibs+ +IBM-pibs IBM-pibs IJG+ IJG+ IJG IJG Imlib2+ Imlib2+ @@ -571,6 +577,8 @@ SGI-B-2.0+ SGI-B-2.0+ SGI-B-2.0 SGI-B-2.0 SimPL-2.0+ SimPL-2.0+ SimPL-2.0 SimPL-2.0 +SISSL-1.2+ SISSL-1.2+ +SISSL-1.2 SISSL-1.2 SISSL+ SISSL+ SISSL SISSL Sleepycat+ Sleepycat+ @@ -752,6 +760,8 @@ SUSE-xinetd+ SUSE-xinetd+ SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) SUSE-XSL-Lint+ SUSE-XSL-Lint+ +Unlicense+ Unlicense+ +Unlicense Unlicense VSL-1.0+ VSL-1.0+ VSL-1.0 VSL-1.0 W3C+ W3C+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a67a412..118aad8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 9 19:27:58 UTC 2013 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Tue Jun 18 12:35:33 UTC 2013 - coolo@suse.com -- 2.51.1 From 84dd3b88c54015bffbaf5f67a07e40bec2be6966971fbbdca060206747a34e7a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 27 Jan 2014 06:31:51 +0000 Subject: [PATCH 094/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=128 --- fetch-licenses.sh | 2 +- licenses_changes.txt | 840 ++++++++++++++------------- obs-service-format_spec_file.changes | 5 + obs-service-format_spec_file.spec | 2 +- 4 files changed, 428 insertions(+), 421 deletions(-) diff --git a/fetch-licenses.sh b/fetch-licenses.sh index aafa482..27d1cfe 100644 --- a/fetch-licenses.sh +++ b/fetch-licenses.sh @@ -7,6 +7,6 @@ for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | echo "$i $i" >> licenses_changes.txt ; echo "$i+ $i+" >> licenses_changes.txt ; done -sort -o licenses_changes.txt -u licenses_changes.txt +LC_ALL=C sort -o licenses_changes.txt -u licenses_changes.txt ( echo "First line" ; cat licenses_changes.txt ) > t mv t licenses_changes.txt diff --git a/licenses_changes.txt b/licenses_changes.txt index 5c1b077..3ae0ca2 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,39 +1,53 @@ First line -AAL+ AAL+ AAL AAL -AFL-1.1+ AFL-1.1+ +AAL+ AAL+ AFL-1.1 AFL-1.1 -AFL-1.2+ AFL-1.2+ +AFL-1.1+ AFL-1.1+ AFL-1.2 AFL-1.2 -AFL-2.0+ AFL-2.0+ +AFL-1.2+ AFL-1.2+ AFL-2.0 AFL-2.0 -AFL-2.1 Academic Free License 2.1 -AFL-2.1+ AFL-2.1+ +AFL-2.0+ AFL-2.0+ AFL-2.1 AFL 2.1 AFL-2.1 AFL-2.1 -AFL-3.0+ AFL-3.0+ +AFL-2.1 Academic Free License 2.1 +AFL-2.1+ AFL-2.1+ AFL-3.0 AFL-3.0 -AGPL-1.0+ AGPL-1.0+ +AFL-3.0+ AFL-3.0+ AGPL-1.0 AGPL-1.0 +AGPL-1.0+ AGPL-1.0+ +AGPL-3.0 AGPL-3.0 +AGPL-3.0 AGPLv3 AGPL-3.0 Affero GPL AGPL-3.0+ AGPL-3.0+ -AGPL-3.0 AGPL-3.0 AGPL-3.0+ AGPLv3+ -AGPL-3.0 AGPLv3 AGPL-3.0+ SUSE-AGPL-3.0+ -Aladdin+ Aladdin+ -Aladdin Aladdin -ANTLR-PD+ ANTLR-PD+ ANTLR-PD ANTLR-PD -Apache-1.0+ Apache-1.0+ +ANTLR-PD+ ANTLR-PD+ +APL-1.0 APL-1.0 +APL-1.0 APL-1.0 (spdx.org/licenses) +APL-1.0+ APL-1.0+ +APSL-1.0 APSL-1.0 +APSL-1.0+ APSL-1.0+ +APSL-1.1 APSL-1.1 +APSL-1.1+ APSL-1.1+ +APSL-1.2 APSL-1.2 +APSL-1.2+ APSL-1.2+ +APSL-2.0 APSL-2.0 +APSL-2.0+ APSL-2.0+ +Aladdin Aladdin +Aladdin+ Aladdin+ Apache-1.0 Apache-1.0 -Apache-1.1+ Apache-1.1+ -Apache-1.1 Apache-1.1 -Apache-1.1 Apache 1.1 (Indiana University) +Apache-1.0+ Apache-1.0+ Apache-1.1 ASL 1.1 -Apache-2.0+ Apache-2.0+ +Apache-1.1 Apache 1.1 (Indiana University) +Apache-1.1 Apache-1.1 +Apache-1.1+ Apache-1.1+ +Apache-2.0 ASL 2.0 +Apache-2.0 ASL2 +Apache-2.0 ASLv.. +Apache-2.0 ASLv2 +Apache-2.0 ASLv2.0 Apache-2.0 Apache 2.0 -Apache-2.0 Apache-2.0 Apache-2.0 Apache License Apache-2.0 Apache License 2.0 Apache-2.0 Apache License Version 2.0 @@ -42,569 +56,545 @@ Apache-2.0 Apache Software License Apache-2.0 Apache Software License .. Apache-2.0 Apache Software License, Version 2.0 Apache-2.0 Apache v2.0 -Apache-2.0 ASL2 -Apache-2.0 ASL 2.0 -Apache-2.0 ASLv.. -Apache-2.0 ASLv2 -Apache-2.0+ ASLv2.0+ -Apache-2.0 ASLv2.0 -Apache-2.0+ SUSE-Apache-2.0+ +Apache-2.0 Apache-2.0 Apache-2.0 The Apache Software License -APL-1.0+ APL-1.0+ -APL-1.0 APL-1.0 -APL-1.0 APL-1.0 (spdx.org/licenses) -APSL-1.0+ APSL-1.0+ -APSL-1.0 APSL-1.0 -APSL-1.1+ APSL-1.1+ -APSL-1.1 APSL-1.1 -APSL-1.2+ APSL-1.2+ -APSL-1.2 APSL-1.2 -APSL-2.0+ APSL-2.0+ -APSL-2.0 APSL-2.0 +Apache-2.0+ ASLv2.0+ +Apache-2.0+ Apache-2.0+ +Apache-2.0+ SUSE-Apache-2.0+ Artistic-1.0 Artistic -Artistic-1.0+ Artistic-1.0+ Artistic-1.0 Artistic 1.0 -Artistic-1.0 Artistic-1.0 -Artistic-1.0 Artistic license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. -Artistic-1.0-cl8+ Artistic-1.0-cl8+ -Artistic-1.0-cl8 Artistic-1.0-cl8 +Artistic-1.0 Artistic license +Artistic-1.0 Artistic-1.0 Artistic-1.0 or GPL-1.0+ Perl License -Artistic-1.0-Perl+ Artistic-1.0-Perl+ -Artistic-1.0-Perl Artistic-1.0-Perl +Artistic-1.0+ Artistic-1.0+ Artistic-1.0+ SUSE-Artistic-1.0+ -Artistic-2.0+ Artistic-2.0+ +Artistic-1.0-Perl Artistic-1.0-Perl +Artistic-1.0-Perl+ Artistic-1.0-Perl+ +Artistic-1.0-cl8 Artistic-1.0-cl8 +Artistic-1.0-cl8+ Artistic-1.0-cl8+ Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 -BitTorrent-1.0+ BitTorrent-1.0+ -BitTorrent-1.0 BitTorrent-1.0 -BitTorrent-1.1+ BitTorrent-1.1+ -BitTorrent-1.1 BitTorrent-1.1 -BSD-2-Clause BSD2c -BSD-2-Clause BSD-2c -BSD-2-Clause BSD 2 clause -BSD-2-Clause BSD 2-clause -BSD-2-Clause+ BSD-2-Clause+ +Artistic-2.0+ Artistic-2.0+ BSD-2-Clause BSD 2 Clause +BSD-2-Clause BSD 2 clause BSD-2-Clause BSD 2-Clause +BSD-2-Clause BSD 2-clause BSD-2-Clause BSD-2-Clause -BSD-2-Clause-FreeBSD+ BSD-2-Clause-FreeBSD+ +BSD-2-Clause BSD-2c +BSD-2-Clause BSD2c +BSD-2-Clause+ BSD-2-Clause+ BSD-2-Clause-FreeBSD BSD-2-Clause-FreeBSD -BSD-2-Clause-NetBSD+ BSD-2-Clause-NetBSD+ +BSD-2-Clause-FreeBSD+ BSD-2-Clause-FreeBSD+ BSD-2-Clause-NetBSD BSD-2-Clause-NetBSD -BSD-3-Clause BSD3 -BSD-3-Clause BSD-3 -BSD-3-Clause BSD3c -BSD-3-Clause+ BSD-3-Clause+ -BSD-3-Clause BSD 3-Clause +BSD-2-Clause-NetBSD+ BSD-2-Clause-NetBSD+ BSD-3-Clause BSD (3-Clause) -BSD-3-Clause BSD-3-Clause +BSD-3-Clause BSD 3-Clause BSD-3-Clause BSD 3-clause (or similar) +BSD-3-Clause BSD-3 +BSD-3-Clause BSD-3-Clause BSD-3-Clause BSD-3-clause (or similar) +BSD-3-Clause BSD3 +BSD-3-Clause BSD3c BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) -BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ -BSD-3-Clause-Clear BSD-3-Clause-Clear BSD-3-Clause New BSD License -BSD-4-Clause BSD4c -BSD-4-Clause+ BSD-4-Clause+ +BSD-3-Clause+ BSD-3-Clause+ +BSD-3-Clause-Clear BSD-3-Clause-Clear +BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ BSD-4-Clause BSD-4-Clause +BSD-4-Clause BSD4c BSD-4-Clause BSD4c(or similar) -BSD-4-Clause-UC+ BSD-4-Clause-UC+ +BSD-4-Clause+ BSD-4-Clause+ BSD-4-Clause-UC BSD-4-Clause-UC -BSL-1.0+ BSL-1.0+ +BSD-4-Clause-UC+ BSD-4-Clause-UC+ BSL-1.0 BSL-1.0 -CATOSL-1.1+ CATOSL-1.1+ +BSL-1.0+ BSL-1.0+ +BitTorrent-1.0 BitTorrent-1.0 +BitTorrent-1.0+ BitTorrent-1.0+ +BitTorrent-1.1 BitTorrent-1.1 +BitTorrent-1.1+ BitTorrent-1.1+ CATOSL-1.1 CATOSL-1.1 -CC0-1.0+ CC0-1.0+ -CC0-1.0 CC0-1.0 -CC-BY-1.0+ CC-BY-1.0+ +CATOSL-1.1+ CATOSL-1.1+ CC-BY-1.0 CC-BY-1.0 -CC-BY-2.0+ CC-BY-2.0+ +CC-BY-1.0+ CC-BY-1.0+ CC-BY-2.0 CC-BY-2.0 -CC-BY-2.5+ CC-BY-2.5+ +CC-BY-2.0+ CC-BY-2.0+ CC-BY-2.5 CC-BY-2.5 -CC-BY-3.0+ CC-BY-3.0+ +CC-BY-2.5+ CC-BY-2.5+ CC-BY-3.0 CC-BY-3.0 -CC-BY-NC-1.0+ CC-BY-NC-1.0+ +CC-BY-3.0+ CC-BY-3.0+ CC-BY-NC-1.0 CC-BY-NC-1.0 -CC-BY-NC-2.0+ CC-BY-NC-2.0+ +CC-BY-NC-1.0+ CC-BY-NC-1.0+ CC-BY-NC-2.0 CC-BY-NC-2.0 -CC-BY-NC-2.5+ CC-BY-NC-2.5+ +CC-BY-NC-2.0+ CC-BY-NC-2.0+ CC-BY-NC-2.5 CC-BY-NC-2.5 -CC-BY-NC-3.0+ CC-BY-NC-3.0+ +CC-BY-NC-2.5+ CC-BY-NC-2.5+ CC-BY-NC-3.0 CC-BY-NC-3.0 -CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0+ +CC-BY-NC-3.0+ CC-BY-NC-3.0+ CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 -CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.0+ +CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0+ CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 -CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5+ +CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 -CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0+ +CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5+ CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 -CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0+ +CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0+ CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 -CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.0+ +CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0+ CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 -CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5+ +CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 -CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0+ +CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5+ CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 -CC-BY-ND-1.0+ CC-BY-ND-1.0+ +CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0+ CC-BY-ND-1.0 CC-BY-ND-1.0 -CC-BY-ND-2.0+ CC-BY-ND-2.0+ +CC-BY-ND-1.0+ CC-BY-ND-1.0+ CC-BY-ND-2.0 CC-BY-ND-2.0 -CC-BY-ND-2.5+ CC-BY-ND-2.5+ +CC-BY-ND-2.0+ CC-BY-ND-2.0+ CC-BY-ND-2.5 CC-BY-ND-2.5 -CC-BY-ND-3.0+ CC-BY-ND-3.0+ +CC-BY-ND-2.5+ CC-BY-ND-2.5+ CC-BY-ND-3.0 CC-BY-ND-3.0 -CC-BY-SA-1.0+ CC-BY-SA-1.0+ +CC-BY-ND-3.0+ CC-BY-ND-3.0+ CC-BY-SA-1.0 CC-BY-SA-1.0 -CC-BY-SA-2.0+ CC-BY-SA-2.0+ +CC-BY-SA-1.0+ CC-BY-SA-1.0+ CC-BY-SA-2.0 CC-BY-SA-2.0 -CC-BY-SA-2.5+ CC-BY-SA-2.5+ -CC-BY-SA-2.5 CC-BY-SA-2.5 +CC-BY-SA-2.0+ CC-BY-SA-2.0+ CC-BY-SA-2.5 CC by-sa V2.5 -CC-BY-SA-3.0+ CC-BY-SA-3.0+ +CC-BY-SA-2.5 CC-BY-SA-2.5 +CC-BY-SA-2.5+ CC-BY-SA-2.5+ CC-BY-SA-3.0 CC BY-SA 3.0 -CC-BY-SA-3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 CC BY-SA V3.0 +CC-BY-SA-3.0 CC-BY-SA-3.0 +CC-BY-SA-3.0+ CC-BY-SA-3.0+ +CC0-1.0 CC0-1.0 +CC0-1.0+ CC0-1.0+ CDDL-1.0 CDDL -CDDL-1.0+ CDDL-1.0+ CDDL-1.0 CDDL 1.0 CDDL-1.0 CDDL-1.0 -CDDL-1.1+ CDDL-1.1+ +CDDL-1.0+ CDDL-1.0+ CDDL-1.1 CDDL-1.1 -CECILL-1.0+ CECILL-1.0+ +CDDL-1.1+ CDDL-1.1+ CECILL-1.0 CECILL-1.0 -CECILL-1.1+ CECILL-1.1+ +CECILL-1.0+ CECILL-1.0+ CECILL-1.1 CECILL-1.1 +CECILL-1.1+ CECILL-1.1+ CECILL-1.1English CECILL-1.1English -CECILL-2.0+ CECILL-2.0+ CECILL-2.0 CECILL-2.0 -CECILL-B+ CECILL-B+ +CECILL-2.0+ CECILL-2.0+ CECILL-B CECILL-B -CECILL-C+ CECILL-C+ +CECILL-B+ CECILL-B+ CECILL-C CECILL-C -ClArtistic+ ClArtistic+ -ClArtistic ClArtistic -CNRI-Python+ CNRI-Python+ +CECILL-C+ CECILL-C+ CNRI-Python CNRI-Python -CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible+ +CNRI-Python+ CNRI-Python+ CNRI-Python-GPL-Compatible CNRI-Python-GPL-Compatible -Condor-1.1+ Condor-1.1+ -Condor-1.1 Condor-1.1 -CPAL-1.0+ CPAL-1.0+ +CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible+ CPAL-1.0 CPAL-1.0 -CPL-1.0 Common Public License v1.0 -CPL-1.0 Common Public License - v 1.0 -CPL-1.0 Common Public License v1.0 (CPL) -CPL-1.0 Common Public License Version 1.0 -CPL-1.0 Common Public License Version 1.0 (CPL1.0) -CPL-1.0+ CPL-1.0+ +CPAL-1.0+ CPAL-1.0+ +CPL-1.0 CPL (Common Public License) v1 CPL-1.0 CPL 1.0 CPL-1.0 CPL 1.0 ... CPL-1.0 CPL-1.0 -CPL-1.0 CPL (Common Public License) v1 -CPOL-1.02+ CPOL-1.02+ +CPL-1.0 Common Public License - v 1.0 +CPL-1.0 Common Public License Version 1.0 +CPL-1.0 Common Public License Version 1.0 (CPL1.0) +CPL-1.0 Common Public License v1.0 +CPL-1.0 Common Public License v1.0 (CPL) +CPL-1.0+ CPL-1.0+ CPOL-1.02 CPOL-1.02 -CUA-OPL-1.0+ CUA-OPL-1.0+ +CPOL-1.02+ CPOL-1.02+ CUA-OPL-1.0 CUA-OPL-1.0 -D-FSL-1.0+ D-FSL-1.0+ +CUA-OPL-1.0+ CUA-OPL-1.0+ +ClArtistic ClArtistic +ClArtistic+ ClArtistic+ +Condor-1.1 Condor-1.1 +Condor-1.1+ Condor-1.1+ D-FSL-1.0 D-FSL-1.0 -ECL-1.0+ ECL-1.0+ +D-FSL-1.0+ D-FSL-1.0+ ECL-1.0 ECL-1.0 -ECL-2.0+ ECL-2.0+ +ECL-1.0+ ECL-1.0+ ECL-2.0 ECL-2.0 -eCos-2.0+ eCos-2.0+ -eCos-2.0 eCos-2.0 -EFL-1.0+ EFL-1.0+ +ECL-2.0+ ECL-2.0+ EFL-1.0 EFL-1.0 -EFL-2.0+ EFL-2.0+ +EFL-1.0+ EFL-1.0+ EFL-2.0 EFL-2.0 -Entessa+ Entessa+ -Entessa Entessa -EPL-1.0 Eclipse-1.0 -EPL-1.0 Eclipse Public License -EPL-1.0 Eclipse Public License 1.0 +EFL-2.0+ EFL-2.0+ EPL-1.0 EPL -EPL-1.0 EPL-1 -EPL-1.0+ EPL-1.0+ EPL-1.0 EPL 1.0 EPL-1.0 EPL 1.0 ... -EPL-1.0 EPL-1.0 EPL-1.0 EPL v1.0 +EPL-1.0 EPL-1 +EPL-1.0 EPL-1.0 +EPL-1.0 Eclipse Public License +EPL-1.0 Eclipse Public License 1.0 +EPL-1.0 Eclipse-1.0 +EPL-1.0+ EPL-1.0+ +EUDatagrid EUDatagrid +EUDatagrid+ EUDatagrid+ +EUPL-1.0 EUPL-1.0 +EUPL-1.0+ EUPL-1.0+ +EUPL-1.1 EUPL-1.1 +EUPL-1.1+ EUPL-1.1+ +Entessa Entessa +Entessa+ Entessa+ +ErlPL-1.1 ErlPL-1.1 ErlPL-1.1 Erlang Public License ErlPL-1.1+ ErlPL-1.1+ -ErlPL-1.1 ErlPL-1.1 -EUDatagrid+ EUDatagrid+ -EUDatagrid EUDatagrid -EUPL-1.0+ EUPL-1.0+ -EUPL-1.0 EUPL-1.0 -EUPL-1.1+ EUPL-1.1+ -EUPL-1.1 EUPL-1.1 -Fair+ Fair+ -Fair Fair -Frameworx-1.0+ Frameworx-1.0+ -Frameworx-1.0 Frameworx-1.0 -FTL+ FTL+ FTL FTL -GFDL-1.1+ FDL v1.1 or later -GFDL-1.1+ GFDL-1.1+ +FTL+ FTL+ +Fair Fair +Fair+ Fair+ +Frameworx-1.0 Frameworx-1.0 +Frameworx-1.0+ Frameworx-1.0+ GFDL-1.1 GFDL 1.1 +GFDL-1.1 GFDL v1.1 GFDL-1.1 GFDL-1.1 GFDL-1.1 GFDLv1.1 -GFDL-1.1 GFDL v1.1 GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) +GFDL-1.1+ FDL v1.1 or later +GFDL-1.1+ GFDL-1.1+ GFDL-1.1+ SUSE-GFDL-1.1+ +GFDL-1.2 GFDL 1.2 +GFDL-1.2 GFDL v1.2 +GFDL-1.2 GFDL-1.2 +GFDL-1.2 GFDLv1.2 +GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) GFDL-1.2+ FDL-1.2+ GFDL-1.2+ FDLv1.2+ GFDL-1.2+ GFDL-1.2+ -GFDL-1.2 GFDL 1.2 -GFDL-1.2 GFDL-1.2 GFDL-1.2+ GFDLv1.2+ -GFDL-1.2 GFDLv1.2 -GFDL-1.2 GFDL v1.2 -GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) GFDL-1.2+ SUSE-GFDL-1.2+ -GFDL-1.3+ FDL-1.3+ -GFDL-1.3+ GFDL-1.3+ GFDL-1.3 GFDL-1.3 GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) +GFDL-1.3+ FDL-1.3+ +GFDL-1.3+ GFDL-1.3+ GFDL-1.3+ SUSE-GFDL-1.3+ -GPL-1.0+ GPL+ -GPL-1.0++ GPL-1.0++ -GPL-1.0+ GPL-1.0+ GPL-1.0 GPL-1.0 +GPL-1.0+ GPL+ +GPL-1.0+ GPL-1.0+ GPL-1.0+ GPLv1+ +GPL-1.0++ GPL-1.0++ GPL-2.0 GLPv2 +GPL-2.0 GNU GPL v2 GPL-2.0 GNU General Public License (GPL) v2 GPL-2.0 GNU General Public License version 2 (GPL v2) -GPL-2.0+ GNU General Public License version 2 or later -GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) -GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) -GPL-2.0 GNU GPL v2 -GPL-2.0+ GPL2+ -GPL-2.0 GPL2 -GPL-2.0+ GPL-2+ -GPL-2.0 GPL-2 -GPL-2.0++ GPL-2.0++ -GPL-2.0+ GPL-2.0+ GPL-2.0 GPL 2.0 -GPL-2.0 GPL-2.0 -GPL-2.0+ GPL-2.0 or later -GPL-2.0+ GPLv2+ -GPL-2.0 GPLv2 -GPL-2.0+ GPL v2+ GPL-2.0 GPL v2 -GPL-2.0 GPL v2.0 -GPL-2.0+ GPL v2.0 or later GPL-2.0 GPL v2 only -GPL-2.0+ GPLv2 or later +GPL-2.0 GPL v2.0 +GPL-2.0 GPL-2 +GPL-2.0 GPL-2.0 +GPL-2.0 GPL2 +GPL-2.0 GPLv2 +GPL-2.0+ GNU General Public License version 2 or later +GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) +GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) GPL-2.0+ GPL v2 or later GPL-2.0+ GPL v2 or later +GPL-2.0+ GPL v2+ +GPL-2.0+ GPL v2.0 or later +GPL-2.0+ GPL-2+ +GPL-2.0+ GPL-2.0 or later +GPL-2.0+ GPL-2.0+ +GPL-2.0+ GPL2+ +GPL-2.0+ GPLv2 or later +GPL-2.0+ GPLv2+ GPL-2.0+ libGeoIPUpdate is GPLv2 or later -GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ -GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception -GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ -GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception -GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ -GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception -GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ -GPL-2.0-with-font-exception GPL-2.0-with-font-exception -GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ +GPL-2.0++ GPL-2.0++ GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -GPL-3.0 GNU General Public License version 3 (GPLv3) -GPL-3.0+ GNU GPL v3 or later +GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ +GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception +GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ +GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception +GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ +GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception +GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ +GPL-2.0-with-font-exception GPL-2.0-with-font-exception +GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ GPL-3.0 GNU GPL version 3 -GPL-3.0 GPL3 -GPL-3.0+ GPL-3+ +GPL-3.0 GNU General Public License version 3 (GPLv3) GPL-3.0 GPL 3 -GPL-3.0 GPL-3 -GPL-3.0++ GPL-3.0++ -GPL-3.0+ GPL-3.0+ -GPL-3.0 GPL-3.0 -GPL-3.0+ GPLv3+ -GPL-3.0 GPLv3 GPL-3.0 GPL v3 GPL-3.0 GPL v3 only +GPL-3.0 GPL-3 +GPL-3.0 GPL-3.0 +GPL-3.0 GPL3 +GPL-3.0 GPLv3 +GPL-3.0+ GNU GPL v3 or later GPL-3.0+ GPL v3 or later -GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ -GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception -GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ +GPL-3.0+ GPL-3+ +GPL-3.0+ GPL-3.0+ +GPL-3.0+ GPLv3+ +GPL-3.0++ GPL-3.0++ GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -gSOAP-1.3b+ gSOAP-1.3b+ -gSOAP-1.3b gSOAP-1.3b -HPND+ HPND+ +GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ +GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ HPND HPND -IBM-pibs+ IBM-pibs+ +HPND+ HPND+ IBM-pibs IBM-pibs -IJG+ IJG+ +IBM-pibs+ IBM-pibs+ IJG IJG -Imlib2+ Imlib2+ -Imlib2 Imlib2 -Intel+ Intel+ -Intel Intel -IPA+ IPA+ +IJG+ IJG+ IPA IPA IPA see IPA_Font_License_Agreement_v1.0.txt +IPA+ IPA+ IPL-1.0 IBM PL IPL-1.0 IBM Public License IPL-1.0 IBM Public License .. -IPL-1.0+ IPL-1.0+ IPL-1.0 IPL-1.0 -ISC+ ISC+ +IPL-1.0+ IPL-1.0+ ISC ISC ISC ISC License -JSON+ JSON+ +ISC+ ISC+ +Imlib2 Imlib2 +Imlib2+ Imlib2+ +Intel Intel +Intel+ Intel+ JSON JSON -LGPL-2.0++ LGPL-2.0++ -LGPL-2.0+ LGPL-2.0+ +JSON+ JSON+ +LGPL-2.0 LGPL v2 +LGPL-2.0 LGPL v2.0 only LGPL-2.0 LGPL-2.0 LGPL-2.0 LGPLv2 -LGPL-2.0 LGPL v2 -LGPL-2.0+ LGPLv2.0+ LGPL-2.0 LGPLv2.0 -LGPL-2.0 LGPL v2.0 only -LGPL-2.0+ LGPL v2.0 or later LGPL-2.0+ LGPL v2 or later -LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) +LGPL-2.0+ LGPL v2.0 or later +LGPL-2.0+ LGPL-2.0+ +LGPL-2.0+ LGPLv2.0+ +LGPL-2.0++ LGPL-2.0++ LGPL-2.1 GNU LGPLv2.1 -LGPL-2.1+ GNU LGPL v2.1 or later -LGPL-2.1+ LGPL-2.0.1 or later -LGPL-2.1 LGPL2.1 -LGPL-2.1++ LGPL-2.1++ -LGPL-2.1+ LGPL-2.1+ +LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) LGPL-2.1 LGPL 2.1 -LGPL-2.1 LGPL-2.1 -LGPL-2.1+ LGPLv2+ -LGPL-2.1+ LGPL v2+ -LGPL-2.1+ LGPL V2+ -LGPL-2.1+ LGPLv2.1+ -LGPL-2.1 LGPLv2.1 -LGPL-2.1+ LGPL v2.1+ LGPL-2.1 LGPL v2.1 LGPL-2.1 LGPL v2.1 only +LGPL-2.1 LGPL-2.1 +LGPL-2.1 LGPL2.1 +LGPL-2.1 LGPLv2.1 +LGPL-2.1+ GNU LGPL v2.1 or later +LGPL-2.1+ LGPL V2+ +LGPL-2.1+ LGPL v2+ LGPL-2.1+ LGPL v2.1 or later +LGPL-2.1+ LGPL v2.1+ +LGPL-2.1+ LGPL-2.0.1 or later +LGPL-2.1+ LGPL-2.1+ +LGPL-2.1+ LGPLv2+ +LGPL-2.1+ LGPLv2.1+ +LGPL-2.1++ LGPL-2.1++ LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) -LGPL-3.0++ LGPL-3.0++ -LGPL-3.0+ LGPL-3.0+ LGPL-3.0 LGPL-3.0 -LGPL-3.0+ LGPLv3+ LGPL-3.0 LGPLv3 LGPL-3.0+ LGPL v3 or later -Libpng+ Libpng+ -Libpng Libpng -LPL-1.02+ LPL-1.02+ -LPL-1.02 LPL-1.02 -LPL-1.0+ LPL-1.0+ +LGPL-3.0+ LGPL-3.0+ +LGPL-3.0+ LGPLv3+ +LGPL-3.0++ LGPL-3.0++ LPL-1.0 LPL-1.0 -LPPL-1.0+ LPPL-1.0+ +LPL-1.0+ LPL-1.0+ +LPL-1.02 LPL-1.02 +LPL-1.02+ LPL-1.02+ LPPL-1.0 LPPL-1.0 -LPPL-1.1+ LPPL-1.1+ +LPPL-1.0+ LPPL-1.0+ LPPL-1.1 LPPL-1.1 -LPPL-1.2+ LPPL-1.2+ +LPPL-1.1+ LPPL-1.1+ LPPL-1.2 LPPL-1.2 -LPPL-1.3a+ LPPL-1.3a+ +LPPL-1.2+ LPPL-1.2+ LPPL-1.3a LPPL-1.3a +LPPL-1.3a+ LPPL-1.3a+ LPPL-1.3c LPPL .. -LPPL-1.3c+ LPPL-1.3c+ LPPL-1.3c LPPL-1.3c LPPL-1.3c TeX-License .. -MirOS+ MirOS+ -MirOS MirOS +LPPL-1.3c+ LPPL-1.3c+ +Libpng Libpng +Libpng+ Libpng+ MIT Expat MIT Expat License -MIT+ MIT+ MIT MIT -MIT MIT licence -MIT MIT-Licence -MIT MIT license MIT MIT License MIT MIT License (or similar) -Motosoto+ Motosoto+ -Motosoto Motosoto -MPL-1.0+ MPL-1.0+ +MIT MIT licence +MIT MIT license +MIT MIT-Licence +MIT+ MIT+ MPL-1.0 MPL-1.0 MPL-1.0 MPLv1.0 -MPL-1.1 Mozilla Public License 1.1 +MPL-1.0+ MPL-1.0+ MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) -MPL-1.1+ MPL-1.1+ MPL-1.1 MPL-1.1 -MPL-1.1+ MPL 1.1 or later -MPL-1.1+ MPLv1.1+ MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. +MPL-1.1 Mozilla Public License 1.1 +MPL-1.1+ MPL 1.1 or later +MPL-1.1+ MPL-1.1+ +MPL-1.1+ MPLv1.1+ MPL-1.1+ SUSE-MPL-1.1+ -MPL-2.0+ MPL-2.0+ MPL-2.0 MPL-2.0 -MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception+ +MPL-2.0+ MPL-2.0+ MPL-2.0-no-copyleft-exception MPL-2.0-no-copyleft-exception +MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception+ +MS-PL MS-PL MS-PL Ms-Pl MS-PL+ MS-PL+ -MS-PL MS-PL -MS-RL+ MS-RL+ MS-RL MS-RL -Multics+ Multics+ +MS-RL+ MS-RL+ +MirOS MirOS +MirOS+ MirOS+ +Motosoto Motosoto +Motosoto+ Motosoto+ Multics Multics -NASA-1.3+ NASA-1.3+ +Multics+ Multics+ NASA-1.3 NASA-1.3 -Naumen+ Naumen+ -Naumen Naumen -NBPL-1.0+ NBPL-1.0+ +NASA-1.3+ NASA-1.3+ NBPL-1.0 NBPL-1.0 -NCSA+ NCSA+ +NBPL-1.0+ NBPL-1.0+ NCSA NCSA -NGPL+ NGPL+ +NCSA+ NCSA+ NGPL NGPL -Nokia+ Nokia+ -Nokia Nokia -NOSL+ NOSL+ +NGPL+ NGPL+ NOSL NOSL -NPL-1.0+ NPL-1.0+ +NOSL+ NOSL+ NPL-1.0 NPL-1.0 -NPL-1.1+ NPL-1.1+ +NPL-1.0+ NPL-1.0+ NPL-1.1 NPL-1.1 -NPOSL-3.0+ NPOSL-3.0+ +NPL-1.1+ NPL-1.1+ NPOSL-3.0 NPOSL-3.0 -NTP+ NTP+ +NPOSL-3.0+ NPOSL-3.0+ NTP NTP -OCLC-2.0+ OCLC-2.0+ +NTP+ NTP+ +Naumen Naumen +Naumen+ Naumen+ +Nokia Nokia +Nokia+ Nokia+ OCLC-2.0 OCLC-2.0 -ODbL-1.0+ ODbL-1.0+ +OCLC-2.0+ OCLC-2.0+ ODbL-1.0 ODbL-1.0 -OFL-1.0+ OFL-1.0+ +ODbL-1.0+ ODbL-1.0+ OFL-1.0 OFL-1.0 +OFL-1.0+ OFL-1.0+ OFL-1.1 OFL -OFL-1.1+ OFL-1.1+ OFL-1.1 OFL-1.1 OFL-1.1 Open Font License OFL-1.1 SIL Open Font License OFL-1.1 SIL Open Font License 1.1 -OGTSL+ OGTSL+ +OFL-1.1+ OFL-1.1+ OGTSL OGTSL -OLDAP-1.1+ OLDAP-1.1+ +OGTSL+ OGTSL+ OLDAP-1.1 OLDAP-1.1 -OLDAP-1.2+ OLDAP-1.2+ +OLDAP-1.1+ OLDAP-1.1+ OLDAP-1.2 OLDAP-1.2 -OLDAP-1.3+ OLDAP-1.3+ +OLDAP-1.2+ OLDAP-1.2+ OLDAP-1.3 OLDAP-1.3 -OLDAP-1.4+ OLDAP-1.4+ +OLDAP-1.3+ OLDAP-1.3+ OLDAP-1.4 OLDAP-1.4 -OLDAP-2.0.1+ OLDAP-2.0.1+ -OLDAP-2.0.1 OLDAP-2.0.1 -OLDAP-2.0+ OLDAP-2.0+ +OLDAP-1.4+ OLDAP-1.4+ OLDAP-2.0 OLDAP-2.0 -OLDAP-2.1+ OLDAP-2.1+ +OLDAP-2.0+ OLDAP-2.0+ +OLDAP-2.0.1 OLDAP-2.0.1 +OLDAP-2.0.1+ OLDAP-2.0.1+ OLDAP-2.1 OLDAP-2.1 -OLDAP-2.2.1+ OLDAP-2.2.1+ -OLDAP-2.2.1 OLDAP-2.2.1 -OLDAP-2.2.2+ OLDAP-2.2.2+ -OLDAP-2.2.2 OLDAP-2.2.2 -OLDAP-2.2+ OLDAP-2.2+ +OLDAP-2.1+ OLDAP-2.1+ OLDAP-2.2 OLDAP-2.2 -OLDAP-2.3+ OLDAP-2.3+ +OLDAP-2.2+ OLDAP-2.2+ +OLDAP-2.2.1 OLDAP-2.2.1 +OLDAP-2.2.1+ OLDAP-2.2.1+ +OLDAP-2.2.2 OLDAP-2.2.2 +OLDAP-2.2.2+ OLDAP-2.2.2+ OLDAP-2.3 OLDAP-2.3 -OLDAP-2.4+ OLDAP-2.4+ +OLDAP-2.3+ OLDAP-2.3+ OLDAP-2.4 OLDAP-2.4 -OLDAP-2.5+ OLDAP-2.5+ +OLDAP-2.4+ OLDAP-2.4+ OLDAP-2.5 OLDAP-2.5 -OLDAP-2.6+ OLDAP-2.6+ +OLDAP-2.5+ OLDAP-2.5+ OLDAP-2.6 OLDAP-2.6 -OLDAP-2.7+ OLDAP-2.7+ +OLDAP-2.6+ OLDAP-2.6+ OLDAP-2.7 OLDAP-2.7 -OLDAP-2.8+ OLDAP-2.8+ +OLDAP-2.7+ OLDAP-2.7+ OLDAP-2.8 OLDAP-2.8 OLDAP-2.8 openldap 2.8 -OpenSSL+ OpenSSL+ -OpenSSL OpenSSL -OPL-1.0+ OPL-1.0+ +OLDAP-2.8+ OLDAP-2.8+ OPL-1.0 OPL-1.0 -OSL-1.0+ OSL-1.0+ +OPL-1.0+ OPL-1.0+ OSL-1.0 OSL-1.0 -OSL-2.0+ OSL-2.0+ +OSL-1.0+ OSL-1.0+ OSL-2.0 OSL-2.0 -OSL-2.1+ OSL-2.1+ +OSL-2.0+ OSL-2.0+ OSL-2.1 OSL-2.1 -OSL-3.0+ OSL-3.0+ +OSL-2.1+ OSL-2.1+ OSL-3.0 OSL-3.0 -PDDL-1.0+ PDDL-1.0+ +OSL-3.0+ OSL-3.0+ +OpenSSL OpenSSL +OpenSSL+ OpenSSL+ PDDL-1.0 PDDL-1.0 -PHP-3.01+ PHP-3.01+ -PHP-3.01 PHP-3.01 -PHP-3.01 PHP-3.0.1 -PHP-3.01 PHP License -PHP-3.01 The PHP License, version 3.01 -PHP-3.0+ PHP-3.0+ +PDDL-1.0+ PDDL-1.0+ PHP-3.0 PHP-3.0 -PostgreSQL+ PostgreSQL+ +PHP-3.0+ PHP-3.0+ +PHP-3.01 PHP License +PHP-3.01 PHP-3.0.1 +PHP-3.01 PHP-3.01 +PHP-3.01 The PHP License, version 3.01 +PHP-3.01+ PHP-3.01+ PostgreSQL PostgreSQL +PostgreSQL+ PostgreSQL+ Python-2.0 PSF Python-2.0 Python Python-2.0 Python .. -Python-2.0+ Python-2.0+ -Python-2.0 Python-2.0 Python-2.0 Python Copyright Python-2.0 Python License .. Python-2.0 Python Software Foundation License +Python-2.0 Python-2.0 +Python-2.0+ Python-2.0+ QPL-1.0 QPL QPL-1.0 QPL .. -QPL-1.0+ QPL-1.0+ QPL-1.0 QPL-1.0 -RHeCos-1.1+ RHeCos-1.1+ +QPL-1.0+ QPL-1.0+ RHeCos-1.1 RHeCos-1.1 -RPL-1.1+ RPL-1.1+ +RHeCos-1.1+ RHeCos-1.1+ RPL-1.1 RPL-1.1 -RPL-1.5+ RPL-1.5+ +RPL-1.1+ RPL-1.1+ RPL-1.5 RPL-1.5 -RPSL-1.0+ RPSL-1.0+ +RPL-1.5+ RPL-1.5+ RPSL-1.0 RPSL-1.0 -RSCPL+ RSCPL+ +RPSL-1.0+ RPSL-1.0+ RSCPL RSCPL +RSCPL+ RSCPL+ Ruby GPL-2.0+ or Ruby Ruby GPLv2+ or Ruby -Ruby+ Ruby+ Ruby Ruby -SAX-PD+ SAX-PD+ +Ruby+ Ruby+ SAX-PD SAX-PD -SGI-B-1.0+ SGI-B-1.0+ +SAX-PD+ SAX-PD+ SGI-B-1.0 SGI-B-1.0 -SGI-B-1.1+ SGI-B-1.1+ +SGI-B-1.0+ SGI-B-1.0+ SGI-B-1.1 SGI-B-1.1 -SGI-B-2.0+ SGI-B-2.0+ +SGI-B-1.1+ SGI-B-1.1+ SGI-B-2.0 SGI-B-2.0 -SimPL-2.0+ SimPL-2.0+ -SimPL-2.0 SimPL-2.0 -SISSL-1.2+ SISSL-1.2+ -SISSL-1.2 SISSL-1.2 -SISSL+ SISSL+ +SGI-B-2.0+ SGI-B-2.0+ SISSL SISSL -Sleepycat+ Sleepycat+ -Sleepycat Sleepycat -SMLNJ+ SMLNJ+ +SISSL+ SISSL+ +SISSL-1.2 SISSL-1.2 +SISSL-1.2+ SISSL-1.2+ SMLNJ SMLNJ -SPL-1.0+ SPL-1.0+ +SMLNJ+ SMLNJ+ SPL-1.0 SPL-1.0 -SugarCRM-1.1.3+ SugarCRM-1.1.3+ -SugarCRM-1.1.3 SugarCRM-1.1.3 +SPL-1.0+ SPL-1.0+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Arphic+ SUSE-Arphic+ -SUSE-Beerware Beerware License like http://en.wikipedia.org/wiki/Beerware#License -SUSE-Beerware+ SUSE-Beerware+ -SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html -SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-Mark-Modifications BSD-Mark-Modifications SUSE-BSD-Mark-Modifications+ SUSE-BSD-Mark-Modifications+ -SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php -SUSE-CacertRoot+ SUSE-CacertRoot+ +SUSE-Beerware Beerware License like http://en.wikipedia.org/wiki/Beerware#License +SUSE-Beerware+ SUSE-Beerware+ +SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html +SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-CC-Sampling-Plus-1.0+ SUSE-CC-Sampling-Plus-1.0+ SUSE-CPL-0.5 Common Public License 0.5 SUSE-CPL-0.5+ SUSE-CPL-0.5+ +SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php +SUSE-CacertRoot+ SUSE-CacertRoot+ SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) SUSE-DMTF+ SUSE-DMTF+ SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh @@ -613,10 +603,10 @@ SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-b SUSE-Egenix-1.1.0+ SUSE-Egenix-1.1.0+ SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-FHS+ SUSE-FHS+ -SUSE-Firmware Firmware license, redistributable unmodified -SUSE-Firmware+ SUSE-Firmware+ SUSE-FLTK Fltk SUSE-FLTK+ SUSE-FLTK+ +SUSE-Firmware Firmware license, redistributable unmodified +SUSE-Firmware+ SUSE-Firmware+ SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en SUSE-Free-Art-1.3+ SUSE-Free-Art-1.3+ SUSE-Freetype Freetype @@ -624,36 +614,38 @@ SUSE-Freetype+ SUSE-Freetype+ SUSE-Freeware Freeware SUSE-Freeware Freeware license SUSE-Freeware+ SUSE-Freeware+ -SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 -SUSE-Gitslave+ SUSE-Gitslave+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-GL2PS-2.0+ SUSE-GL2PS-2.0+ -SUSE-Gnuplot Gnuplot -SUSE-Gnuplot+ SUSE-Gnuplot+ -SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ -SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception -SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ -SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) -SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ -SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them -SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-2.0+-with-sane-exception+ +SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception +SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ +SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) +SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ +SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception +SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ +SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them +SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions SUSE-GPL-3.0+-with-autoconf-exception+ SUSE-GPL-3.0+-with-autoconf-exception+ -SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses -SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception +SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ +SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses +SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ +SUSE-GPL-3.0-with-font-exception SUSE-GPL-3.0-with-font-exception +SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) SUSE-GPL-3.0-with-openssl-exception+ SUSE-GPL-3.0-with-openssl-exception+ -SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) SUSE-GPL-3.0-with-template-exception+ SUSE-GPL-3.0-with-template-exception+ +SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 +SUSE-Gitslave+ SUSE-Gitslave+ +SUSE-Gnuplot Gnuplot +SUSE-Gnuplot+ SUSE-Gnuplot+ SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ SUSE-IBPL-1.0+ SUSE-IBPL-1.0+ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ @@ -664,20 +656,20 @@ SUSE-IJG JPEG License SUSE-IJG+ SUSE-IJG+ SUSE-ImageMagick ImageMagick SUSE-ImageMagick+ SUSE-ImageMagick+ -SUSE-Innernet-2.00 Inner Net License 2.00 -SUSE-Innernet-2.00+ SUSE-Innernet-2.00+ SUSE-Innernet-2.0 Inner Net License 2 SUSE-Innernet-2.0+ SUSE-Innernet-2.0+ +SUSE-Innernet-2.00 Inner Net License 2.00 +SUSE-Innernet-2.00+ SUSE-Innernet-2.00+ SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint SUSE-JSON+ SUSE-JSON+ SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html SUSE-LDPL-2.0+ SUSE-LDPL-2.0+ -SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception -SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 -SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-digia-exception-1.1+ +SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception SUSE-LGPL-2.1+-with-GCC-exception+ SUSE-LGPL-2.1+-with-GCC-exception+ +SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 +SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) @@ -688,46 +680,40 @@ SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-Manpages+ SUSE-Manpages+ SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-MgOpen+ SUSE-MgOpen+ -SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition -SUSE-mirror+ SUSE-mirror+ -SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license -SUSE-mplus+ SUSE-mplus+ -SUSE-NetCDF+ SUSE-NetCDF+ SUSE-NetCDF SUSE-NetCDF +SUSE-NetCDF+ SUSE-NetCDF+ SUSE-NonFree NonFree licenses SUSE-NonFree+ SUSE-NonFree+ -SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice+ -SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice -SUSE-OldFSFDocLicense+ SUSE-OldFSFDocLicense+ -SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) SUSE-OML Open Market License (tracked by Fedora as OML) SUSE-OML+ SUSE-OML+ SUSE-OSL-1.1 OSL-1.1 SUSE-OSL-1.1+ SUSE-OSL-1.1+ -SUSE-Permissive-Modify-By-Patch Similar to SUSE-Permissive but copyright holder has specified that modification is only allowed by patch -SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive-Modify-By-Patch+ -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. -SUSE-Permissive+ SUSE-Permissive+ +SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice +SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice+ +SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) +SUSE-OldFSFDocLicense+ SUSE-OldFSFDocLicense+ SUSE-PHP-2.02 PHP 2.02 SUSE-PHP-2.02+ SUSE-PHP-2.02+ -SUSE-Public-Domain Public domain +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +SUSE-Permissive+ SUSE-Permissive+ +SUSE-Permissive-Modify-By-Patch Similar to SUSE-Permissive but copyright holder has specified that modification is only allowed by patch +SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive-Modify-By-Patch+ SUSE-Public-Domain Public Domain -SUSE-Public-Domain Public Domain, Freeware SUSE-Public-Domain Public Domain License +SUSE-Public-Domain Public Domain, Freeware SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw +SUSE-Public-Domain Public domain SUSE-Public-Domain+ SUSE-Public-Domain+ SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) SUSE-Python-1.6+ SUSE-Python-1.6+ -SUSE-Qhull Qhull -SUSE-Qhull+ SUSE-Qhull+ SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ SUSE-QWT-1.0+ SUSE-QWT-1.0+ -SUSE-Redistributable-Content+ SUSE-Redistributable-Content+ +SUSE-Qhull Qhull +SUSE-Qhull+ SUSE-Qhull+ SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. +SUSE-Redistributable-Content+ SUSE-Redistributable-Content+ SUSE-Repoze http://repoze.org/license.html SUSE-Repoze+ SUSE-Repoze+ -SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) -SUSE-Sendmail+ SUSE-Sendmail+ SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) SUSE-SGI-FreeB-2.0+ SUSE-SGI-FreeB-2.0+ SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license @@ -738,71 +724,87 @@ SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA SUSE-SNIA-1.0+ SUSE-SNIA-1.0+ SUSE-SNIA-1.1 SNIA 1.1 SUSE-SNIA-1.1+ SUSE-SNIA-1.1+ +SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-Sendmail+ SUSE-Sendmail+ SUSE-Sun-Laboratories http://pastebin.com/UubnS3se SUSE-Sun-Laboratories+ SUSE-Sun-Laboratories+ SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) SUSE-TCL+ SUSE-TCL+ -SUSE-TeX http://en.wikipedia.org/wiki/TeX#License -SUSE-TeX+ SUSE-TeX+ SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vpazbrt2beddyhgwcch4sduhnmmefdotlyelojxg4tyzllhb4a/tgppl.html SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ -SUSE-Vim+ SUSE-Vim+ +SUSE-TeX http://en.wikipedia.org/wiki/TeX#License +SUSE-TeX+ SUSE-TeX+ SUSE-Vim SUSE-Vim +SUSE-Vim+ SUSE-Vim+ SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ SUSE-WTFPL-2.0+ SUSE-WTFPL-2.0+ +SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license +SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ +SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) +SUSE-XSL-Lint+ SUSE-XSL-Lint+ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense SUSE-Xano+ SUSE-Xano+ SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) SUSE-Xenonsoft-1.00+ SUSE-Xenonsoft-1.00+ -SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ -SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license -SUSE-xinetd+ SUSE-xinetd+ +SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition +SUSE-mirror+ SUSE-mirror+ +SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license +SUSE-mplus+ SUSE-mplus+ SUSE-xinetd Xinedt license (Fedora also uses a custom license here) -SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) -SUSE-XSL-Lint+ SUSE-XSL-Lint+ -Unlicense+ Unlicense+ +SUSE-xinetd+ SUSE-xinetd+ +SimPL-2.0 SimPL-2.0 +SimPL-2.0+ SimPL-2.0+ +Sleepycat Sleepycat +Sleepycat+ Sleepycat+ +SugarCRM-1.1.3 SugarCRM-1.1.3 +SugarCRM-1.1.3+ SugarCRM-1.1.3+ Unlicense Unlicense -VSL-1.0+ VSL-1.0+ +Unlicense+ Unlicense+ VSL-1.0 VSL-1.0 -W3C+ W3C+ +VSL-1.0+ VSL-1.0+ W3C W3C W3C W3C Software License -Watcom-1.0+ Watcom-1.0+ -Watcom-1.0 Watcom-1.0 -WTFPL+ WTFPL+ +W3C+ W3C+ WTFPL WTFPL -WXwindows+ WXwindows+ +WTFPL+ WTFPL+ WXwindows WXwindows -X11 MIT/X11 +WXwindows+ WXwindows+ +Watcom-1.0 Watcom-1.0 +Watcom-1.0+ Watcom-1.0+ X11 MIT/X Consortium License X11 MIT/X License +X11 MIT/X11 X11 SUSE-XFree86-1.0 -X11+ X11+ X11 X11 X11 X11 (BSD like) X11 X11 MIT X11 X11/MIT -XFree86-1.1+ XFree86-1.1+ +X11+ X11+ XFree86-1.1 XFree86-1.1 -Xnet+ Xnet+ +XFree86-1.1+ XFree86-1.1+ Xnet Xnet -YPL-1.0+ YPL-1.0+ +Xnet+ Xnet+ YPL-1.0 YPL-1.0 -YPL-1.1+ YPL-1.1+ +YPL-1.0+ YPL-1.0+ YPL-1.1 YPL-1.1 -Zimbra-1.3+ Zimbra-1.3+ -Zimbra-1.3 Zimbra-1.3 -Zlib zlib -Zlib+ Zlib+ -Zlib Zlib -Zlib zlib/libpng License -Zlib Zlib License -ZPL-1.1+ ZPL-1.1+ +YPL-1.1+ YPL-1.1+ ZPL-1.1 ZPL-1.1 -ZPL-2.0 Zope Public License +ZPL-1.1+ ZPL-1.1+ ZPL-2.0 ZPL -ZPL-2.0+ ZPL-2.0+ ZPL-2.0 ZPL-2.0 -ZPL-2.1+ ZPL-2.1+ +ZPL-2.0 Zope Public License +ZPL-2.0+ ZPL-2.0+ ZPL-2.1 ZPL 2.1 ZPL-2.1 ZPL-2.1 +ZPL-2.1+ ZPL-2.1+ +Zimbra-1.3 Zimbra-1.3 +Zimbra-1.3+ Zimbra-1.3+ +Zlib Zlib +Zlib Zlib License +Zlib zlib +Zlib zlib/libpng License +Zlib+ Zlib+ +eCos-2.0 eCos-2.0 +eCos-2.0+ eCos-2.0+ +gSOAP-1.3b gSOAP-1.3b +gSOAP-1.3b+ gSOAP-1.3b+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 118aad8..4c6e82a 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 27 06:31:43 UTC 2014 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Mon Dec 9 19:27:58 UTC 2013 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 0235b7c..ac49939 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -- 2.51.1 From ad5616952fec884529adf6ef1960c88c75652356b7aad598333575635ab93dbc Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 28 Jan 2014 09:25:45 +0000 Subject: [PATCH 095/151] - add Unicode from spreadsheet OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=129 --- licenses_changes.txt | 1 + obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index 3ae0ca2..808288a 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -758,6 +758,7 @@ Sleepycat Sleepycat Sleepycat+ Sleepycat+ SugarCRM-1.1.3 SugarCRM-1.1.3 SugarCRM-1.1.3+ SugarCRM-1.1.3+ +Unicode http://www.unicode.org/copyright.html Unlicense Unlicense Unlicense+ Unlicense+ VSL-1.0 VSL-1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4c6e82a..a461fa0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 28 09:25:30 UTC 2014 - coolo@suse.com + +- add Unicode from spreadsheet + ------------------------------------------------------------------- Mon Jan 27 06:31:43 UTC 2014 - coolo@suse.com -- 2.51.1 From 1c113a3b809c94d84584f9400d3490736053ed9ed45177a769181397faab1ddd Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 6 Feb 2014 12:35:46 +0000 Subject: [PATCH 096/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=131 --- licenses_changes.txt | 4 +++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 808288a..53affdf 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -515,6 +515,7 @@ OLDAP-2.8 OLDAP-2.8 OLDAP-2.8 openldap 2.8 OLDAP-2.8+ OLDAP-2.8+ OPL-1.0 OPL-1.0 +OPL-1.0 Open Publication License 1.0 OPL-1.0+ OPL-1.0+ OSL-1.0 OSL-1.0 OSL-1.0+ OSL-1.0+ @@ -672,8 +673,9 @@ SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1+ +SUSE-LGPL-3.0-with-openssl-exception e.g python-psycopg2 +SUSE-LGPL-3.0-with-openssl-exception+ SUSE-LGPL-3.0-with-openssl-exception+ SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) -SUSE-Liberation+ SUSE-Liberation+ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) SUSE-MakeIndex+ SUSE-MakeIndex+ SUSE-Manpages Manpages licenses (linux man pages e.g.) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index a461fa0..d7af13e 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 6 12:31:26 UTC 2014 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Tue Jan 28 09:25:30 UTC 2014 - coolo@suse.com -- 2.51.1 From 78b434354f116ab76bd7c1fdd01b2ef2d762731ee658b4291b4b9f7b94800969 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Feb 2014 08:48:07 +0000 Subject: [PATCH 097/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=133 --- licenses_changes.txt | 4 ++-- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 53affdf..949d1ce 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -676,6 +676,7 @@ SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-3.0-with-openssl-exception e.g python-psycopg2 SUSE-LGPL-3.0-with-openssl-exception+ SUSE-LGPL-3.0-with-openssl-exception+ SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) +SUSE-Liberation+ SUSE-Liberation+ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) SUSE-MakeIndex+ SUSE-MakeIndex+ SUSE-Manpages Manpages licenses (linux man pages e.g.) @@ -738,8 +739,6 @@ SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-TeX+ SUSE-TeX+ SUSE-Vim SUSE-Vim SUSE-Vim+ SUSE-Vim+ -SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ -SUSE-WTFPL-2.0+ SUSE-WTFPL-2.0+ SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) @@ -770,6 +769,7 @@ W3C W3C Software License W3C+ W3C+ WTFPL WTFPL WTFPL+ WTFPL+ +WTFPL SUSE-WTFPL-2.0 WXwindows WXwindows WXwindows+ WXwindows+ Watcom-1.0 Watcom-1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index d7af13e..276ea50 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 11 08:47:54 UTC 2014 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Thu Feb 6 12:31:26 UTC 2014 - coolo@suse.com -- 2.51.1 From 220b7da293281f13105c0baa6f20f73143d92bb828772e9223c70a90c9bf11d6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 10 Apr 2014 08:54:06 +0000 Subject: [PATCH 098/151] - fetched new licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=135 --- licenses_changes.txt | 7 ++++++- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 949d1ce..e35f5e0 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -563,6 +563,7 @@ RSCPL+ RSCPL+ Ruby GPL-2.0+ or Ruby Ruby GPLv2+ or Ruby Ruby Ruby +Ruby same as ruby's Ruby+ Ruby+ SAX-PD SAX-PD SAX-PD+ SAX-PD+ @@ -681,6 +682,8 @@ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) SUSE-MakeIndex+ SUSE-MakeIndex+ SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-Manpages+ SUSE-Manpages+ +SUSE-Matplotlib E.g. python -matplotlib -> LICENSE/LICENSE +SUSE-Matplotlib+ SUSE-Matplotlib+ SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-MgOpen+ SUSE-MgOpen+ SUSE-NetCDF SUSE-NetCDF @@ -737,6 +740,8 @@ SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vp SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-TeX+ SUSE-TeX+ +SUSE-Ubuntu-Font-License-1.0 http://font.ubuntu.com/licence/ +SUSE-Ubuntu-Font-License-1.0+ SUSE-Ubuntu-Font-License-1.0+ SUSE-Vim SUSE-Vim SUSE-Vim+ SUSE-Vim+ SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license @@ -767,9 +772,9 @@ VSL-1.0+ VSL-1.0+ W3C W3C W3C W3C Software License W3C+ W3C+ +WTFPL SUSE-WTFPL-2.0 WTFPL WTFPL WTFPL+ WTFPL+ -WTFPL SUSE-WTFPL-2.0 WXwindows WXwindows WXwindows+ WXwindows+ Watcom-1.0 Watcom-1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 276ea50..294ead5 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 10 08:54:01 UTC 2014 - coolo@suse.com + +- fetched new licenses + ------------------------------------------------------------------- Tue Feb 11 08:47:54 UTC 2014 - coolo@suse.com -- 2.51.1 From 5dcb51217fbeac1f9d6c026a9de902ac5771f59fd9fe0a57d6a4739f1933ec60 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 10 Jul 2014 10:49:53 +0000 Subject: [PATCH 099/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=138 --- licenses_changes.txt | 5 +++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index e35f5e0..d5bc0b5 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -168,6 +168,7 @@ CC-BY-SA-3.0 CC BY-SA 3.0 CC-BY-SA-3.0 CC BY-SA V3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 CC-BY-SA-3.0+ CC-BY-SA-3.0+ +CC-BY-SA-4.0 http://creativecommons.org/licenses/by-sa/4.0/legalcode CC0-1.0 CC0-1.0 CC0-1.0+ CC0-1.0+ CDDL-1.0 CDDL @@ -601,6 +602,8 @@ SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki SUSE-DMTF+ SUSE-DMTF+ SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh SUSE-Docbook-XSL+ SUSE-Docbook-XSL+ +SUSE-EULA SUSE End User License Agreement +SUSE-EULA+ SUSE-EULA+ SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf SUSE-Egenix-1.1.0+ SUSE-Egenix-1.1.0+ SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright @@ -626,6 +629,8 @@ SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ +SUSE-GPL-2.0-with-linking-exception Copyright holder expressly allows GPL-2.0 component to be linked with components which are not GPL compatible +SUSE-GPL-2.0-with-linking-exception+ SUSE-GPL-2.0-with-linking-exception+ SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 294ead5..e3dc069 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 10 10:49:45 UTC 2014 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Thu Apr 10 08:54:01 UTC 2014 - coolo@suse.com -- 2.51.1 From 90a880a623868a86ca7dfea98a1d0e0c7710a09ec588925222a8fc86c4ddfe86 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 31 Jul 2014 13:47:43 +0000 Subject: [PATCH 100/151] - update prepare_spec from git to fix (bnc#889537) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=140 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index e3dc069..1141da6 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 31 15:44:36 CEST 2014 - ro@suse.de + +- update prepare_spec from git to fix (bnc#889537) + ------------------------------------------------------------------- Thu Jul 10 10:49:45 UTC 2014 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 3e4f813..cba0794 100644 --- a/prepare_spec +++ b/prepare_spec @@ -267,7 +267,7 @@ sub read_and_parse_old_spec { next; } - if ( /^# vim:/ ) { + if ( /^# vim:/ && $current_section eq "header" ) { $vim_modeline = $_; next; } @@ -320,7 +320,7 @@ sub read_and_parse_old_spec { } my %aa; - if ($cur_tag =~ /%\(/) { + if ($cur_tag =~ /%\(/ || $cur_tag =~ /%\{/) { # do not touch lines with shell execution $aa{$cur_tag}=1; } else { @@ -724,6 +724,6 @@ while (@oldspec) { } } -print "\n" unless $line eq "XXXBLANKLINE"; +print "\n" unless $line eq "XXXBLANKLINE" || $line eq ""; print "%changelog\n"; -- 2.51.1 From 17af0f0c80061b971f66cb5699624545697f2bcc8f1000f54d3ea97b49f6a5e2 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 13 Aug 2014 09:22:18 +0000 Subject: [PATCH 101/151] - update prepare_spec from git to fix (bnc#891152) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=142 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 1141da6..36d97e9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de + +- update prepare_spec from git to fix (bnc#891152) + ------------------------------------------------------------------- Thu Jul 31 15:44:36 CEST 2014 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index cba0794..65a07c3 100644 --- a/prepare_spec +++ b/prepare_spec @@ -715,9 +715,9 @@ while (@oldspec) { } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { my $current_package = $1; my $license = $seen_licenses{$current_package} || $main_license; - printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary); + printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary || $current_package eq $base_package); my $group = $seen_groups{$current_package} || $main_group; - printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary); + printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary || $current_package eq $base_package); $first_summary = 0; } else { print "$line\n"; -- 2.51.1 From 328bb85254ea4515f7f4b4b362e336e41b6cde390c375db0925612e76fc3b1b7 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 14 Aug 2014 00:28:18 +0000 Subject: [PATCH 102/151] - do not enter empty license line if not found (eg in include file) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=143 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 36d97e9..d61026e 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de + +- do not enter empty license line if not found (eg in include file) + ------------------------------------------------------------------- Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index 65a07c3..3fcb997 100644 --- a/prepare_spec +++ b/prepare_spec @@ -715,7 +715,7 @@ while (@oldspec) { } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { my $current_package = $1; my $license = $seen_licenses{$current_package} || $main_license; - printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary || $current_package eq $base_package); + printf("%-16s%s\n", "License:", $license) if $license && (!$license_unique || $first_summary || $current_package eq $base_package); my $group = $seen_groups{$current_package} || $main_group; printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary || $current_package eq $base_package); $first_summary = 0; -- 2.51.1 From 83b47ffc73740a67ea52c71e5544790848560adcacc959d4b3ce2c2140a671d2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 25 Aug 2014 05:13:29 +0000 Subject: [PATCH 103/151] - updated to SPDX License List v1.20 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=145 --- licenses_changes.txt | 182 +++++++++++++++++++++++++++ obs-service-format_spec_file.changes | 5 + 2 files changed, 187 insertions(+) diff --git a/licenses_changes.txt b/licenses_changes.txt index d5bc0b5..8ee19e3 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -1,6 +1,8 @@ First line AAL AAL AAL+ AAL+ +ADSL ADSL +ADSL+ ADSL+ AFL-1.1 AFL-1.1 AFL-1.1+ AFL-1.1+ AFL-1.2 AFL-1.2 @@ -21,8 +23,16 @@ AGPL-3.0 Affero GPL AGPL-3.0+ AGPL-3.0+ AGPL-3.0+ AGPLv3+ AGPL-3.0+ SUSE-AGPL-3.0+ +AMDPLPA AMDPLPA +AMDPLPA+ AMDPLPA+ +AML AML +AML+ AML+ +AMPAS AMPAS +AMPAS+ AMPAS+ ANTLR-PD ANTLR-PD ANTLR-PD+ ANTLR-PD+ +APAFML APAFML +APAFML+ APAFML+ APL-1.0 APL-1.0 APL-1.0 APL-1.0 (spdx.org/licenses) APL-1.0+ APL-1.0+ @@ -34,6 +44,14 @@ APSL-1.2 APSL-1.2 APSL-1.2+ APSL-1.2+ APSL-2.0 APSL-2.0 APSL-2.0+ APSL-2.0+ +Abstyles Abstyles +Abstyles+ Abstyles+ +Adobe-2006 Adobe-2006 +Adobe-2006+ Adobe-2006+ +Adobe-Glyph Adobe-Glyph +Adobe-Glyph+ Adobe-Glyph+ +Afmparse Afmparse +Afmparse+ Afmparse+ Aladdin Aladdin Aladdin+ Aladdin+ Apache-1.0 Apache-1.0 @@ -101,20 +119,34 @@ BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) BSD-3-Clause New BSD License BSD-3-Clause+ BSD-3-Clause+ +BSD-3-Clause-Attribution BSD-3-Clause-Attribution +BSD-3-Clause-Attribution+ BSD-3-Clause-Attribution+ BSD-3-Clause-Clear BSD-3-Clause-Clear BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ +BSD-3-Clause-LBNL BSD-3-Clause-LBNL +BSD-3-Clause-LBNL+ BSD-3-Clause-LBNL+ BSD-4-Clause BSD-4-Clause BSD-4-Clause BSD4c BSD-4-Clause BSD4c(or similar) BSD-4-Clause+ BSD-4-Clause+ BSD-4-Clause-UC BSD-4-Clause-UC BSD-4-Clause-UC+ BSD-4-Clause-UC+ +BSD-Protection BSD-Protection +BSD-Protection+ BSD-Protection+ BSL-1.0 BSL-1.0 BSL-1.0+ BSL-1.0+ +Bahyph Bahyph +Bahyph+ Bahyph+ +Barr Barr +Barr+ Barr+ +Beerware Beerware +Beerware+ Beerware+ BitTorrent-1.0 BitTorrent-1.0 BitTorrent-1.0+ BitTorrent-1.0+ BitTorrent-1.1 BitTorrent-1.1 BitTorrent-1.1+ BitTorrent-1.1+ +Borceux Borceux +Borceux+ Borceux+ CATOSL-1.1 CATOSL-1.1 CATOSL-1.1+ CATOSL-1.1+ CC-BY-1.0 CC-BY-1.0 @@ -125,6 +157,8 @@ CC-BY-2.5 CC-BY-2.5 CC-BY-2.5+ CC-BY-2.5+ CC-BY-3.0 CC-BY-3.0 CC-BY-3.0+ CC-BY-3.0+ +CC-BY-4.0 CC-BY-4.0 +CC-BY-4.0+ CC-BY-4.0+ CC-BY-NC-1.0 CC-BY-NC-1.0 CC-BY-NC-1.0+ CC-BY-NC-1.0+ CC-BY-NC-2.0 CC-BY-NC-2.0 @@ -133,6 +167,8 @@ CC-BY-NC-2.5 CC-BY-NC-2.5 CC-BY-NC-2.5+ CC-BY-NC-2.5+ CC-BY-NC-3.0 CC-BY-NC-3.0 CC-BY-NC-3.0+ CC-BY-NC-3.0+ +CC-BY-NC-4.0 CC-BY-NC-4.0 +CC-BY-NC-4.0+ CC-BY-NC-4.0+ CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0+ CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 @@ -141,6 +177,8 @@ CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5+ CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0+ +CC-BY-NC-ND-4.0 CC-BY-NC-ND-4.0 +CC-BY-NC-ND-4.0+ CC-BY-NC-ND-4.0+ CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0+ CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 @@ -149,6 +187,8 @@ CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5+ CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0+ +CC-BY-NC-SA-4.0 CC-BY-NC-SA-4.0 +CC-BY-NC-SA-4.0+ CC-BY-NC-SA-4.0+ CC-BY-ND-1.0 CC-BY-ND-1.0 CC-BY-ND-1.0+ CC-BY-ND-1.0+ CC-BY-ND-2.0 CC-BY-ND-2.0 @@ -157,6 +197,8 @@ CC-BY-ND-2.5 CC-BY-ND-2.5 CC-BY-ND-2.5+ CC-BY-ND-2.5+ CC-BY-ND-3.0 CC-BY-ND-3.0 CC-BY-ND-3.0+ CC-BY-ND-3.0+ +CC-BY-ND-4.0 CC-BY-ND-4.0 +CC-BY-ND-4.0+ CC-BY-ND-4.0+ CC-BY-SA-1.0 CC-BY-SA-1.0 CC-BY-SA-1.0+ CC-BY-SA-1.0+ CC-BY-SA-2.0 CC-BY-SA-2.0 @@ -168,7 +210,9 @@ CC-BY-SA-3.0 CC BY-SA 3.0 CC-BY-SA-3.0 CC BY-SA V3.0 CC-BY-SA-3.0 CC-BY-SA-3.0 CC-BY-SA-3.0+ CC-BY-SA-3.0+ +CC-BY-SA-4.0 CC-BY-SA-4.0 CC-BY-SA-4.0 http://creativecommons.org/licenses/by-sa/4.0/legalcode +CC-BY-SA-4.0+ CC-BY-SA-4.0+ CC0-1.0 CC0-1.0 CC0-1.0+ CC0-1.0+ CDDL-1.0 CDDL @@ -208,12 +252,24 @@ CPOL-1.02 CPOL-1.02 CPOL-1.02+ CPOL-1.02+ CUA-OPL-1.0 CUA-OPL-1.0 CUA-OPL-1.0+ CUA-OPL-1.0+ +Caldera Caldera +Caldera+ Caldera+ ClArtistic ClArtistic ClArtistic+ ClArtistic+ Condor-1.1 Condor-1.1 Condor-1.1+ Condor-1.1+ +Crossword Crossword +Crossword+ Crossword+ +Cube Cube +Cube+ Cube+ D-FSL-1.0 D-FSL-1.0 D-FSL-1.0+ D-FSL-1.0+ +DOC DOC +DOC+ DOC+ +DSDP DSDP +DSDP+ DSDP+ +Dotseqn Dotseqn +Dotseqn+ Dotseqn+ ECL-1.0 ECL-1.0 ECL-1.0+ ECL-1.0+ ECL-2.0 ECL-2.0 @@ -243,6 +299,12 @@ Entessa+ Entessa+ ErlPL-1.1 ErlPL-1.1 ErlPL-1.1 Erlang Public License ErlPL-1.1+ ErlPL-1.1+ +Eurosym Eurosym +Eurosym+ Eurosym+ +FSFUL FSFUL +FSFUL+ FSFUL+ +FSFULLR FSFULLR +FSFULLR+ FSFULLR+ FTL FTL FTL+ FTL+ Fair Fair @@ -272,6 +334,8 @@ GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) GFDL-1.3+ FDL-1.3+ GFDL-1.3+ GFDL-1.3+ GFDL-1.3+ SUSE-GFDL-1.3+ +GL2PS GL2PS +GL2PS+ GL2PS+ GPL-1.0 GPL-1.0 GPL-1.0+ GPL+ GPL-1.0+ GPL-1.0+ @@ -333,8 +397,16 @@ GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ +Giftware Giftware +Giftware+ Giftware+ +Glide Glide +Glide+ Glide+ +Glulxe Glulxe +Glulxe+ Glulxe+ HPND HPND HPND+ HPND+ +HaskellReport HaskellReport +HaskellReport+ HaskellReport+ IBM-pibs IBM-pibs IBM-pibs+ IBM-pibs+ IJG IJG @@ -350,12 +422,18 @@ IPL-1.0+ IPL-1.0+ ISC ISC ISC ISC License ISC+ ISC+ +ImageMagick ImageMagick +ImageMagick+ ImageMagick+ Imlib2 Imlib2 Imlib2+ Imlib2+ Intel Intel Intel+ Intel+ +Intel-ACPI Intel-ACPI +Intel-ACPI+ Intel-ACPI+ JSON JSON JSON+ JSON+ +JasPer-2.0 JasPer-2.0 +JasPer-2.0+ JasPer-2.0+ LGPL-2.0 LGPL v2 LGPL-2.0 LGPL v2.0 only LGPL-2.0 LGPL-2.0 @@ -408,6 +486,10 @@ LPPL-1.3c LPPL .. LPPL-1.3c LPPL-1.3c LPPL-1.3c TeX-License .. LPPL-1.3c+ LPPL-1.3c+ +Latex2e Latex2e +Latex2e+ Latex2e+ +Leptonica Leptonica +Leptonica+ Leptonica+ Libpng Libpng Libpng+ Libpng+ MIT Expat @@ -419,6 +501,16 @@ MIT MIT licence MIT MIT license MIT MIT-Licence MIT+ MIT+ +MIT-CMU MIT-CMU +MIT-CMU+ MIT-CMU+ +MIT-advertising MIT-advertising +MIT-advertising+ MIT-advertising+ +MIT-enna MIT-enna +MIT-enna+ MIT-enna+ +MIT-feh MIT-feh +MIT-feh+ MIT-feh+ +MITNFA MITNFA +MITNFA+ MITNFA+ MPL-1.0 MPL-1.0 MPL-1.0 MPLv1.0 MPL-1.0+ MPL-1.0+ @@ -440,12 +532,18 @@ MS-PL Ms-Pl MS-PL+ MS-PL+ MS-RL MS-RL MS-RL+ MS-RL+ +MTLL MTLL +MTLL+ MTLL+ +MakeIndex MakeIndex +MakeIndex+ MakeIndex+ MirOS MirOS MirOS+ MirOS+ Motosoto Motosoto Motosoto+ Motosoto+ Multics Multics Multics+ Multics+ +Mup Mup +Mup+ Mup+ NASA-1.3 NASA-1.3 NASA-1.3+ NASA-1.3+ NBPL-1.0 NBPL-1.0 @@ -454,6 +552,8 @@ NCSA NCSA NCSA+ NCSA+ NGPL NGPL NGPL+ NGPL+ +NLPL NLPL +NLPL+ NLPL+ NOSL NOSL NOSL+ NOSL+ NPL-1.0 NPL-1.0 @@ -462,12 +562,22 @@ NPL-1.1 NPL-1.1 NPL-1.1+ NPL-1.1+ NPOSL-3.0 NPOSL-3.0 NPOSL-3.0+ NPOSL-3.0+ +NRL NRL +NRL+ NRL+ NTP NTP NTP+ NTP+ Naumen Naumen Naumen+ Naumen+ +NetCDF NetCDF +NetCDF+ NetCDF+ +Newsletr Newsletr +Newsletr+ Newsletr+ Nokia Nokia Nokia+ Nokia+ +Noweb Noweb +Noweb+ Noweb+ +Nunit Nunit +Nunit+ Nunit+ OCLC-2.0 OCLC-2.0 OCLC-2.0+ OCLC-2.0+ ODbL-1.0 ODbL-1.0 @@ -515,11 +625,15 @@ OLDAP-2.7+ OLDAP-2.7+ OLDAP-2.8 OLDAP-2.8 OLDAP-2.8 openldap 2.8 OLDAP-2.8+ OLDAP-2.8+ +OML OML +OML+ OML+ OPL-1.0 OPL-1.0 OPL-1.0 Open Publication License 1.0 OPL-1.0+ OPL-1.0+ OSL-1.0 OSL-1.0 OSL-1.0+ OSL-1.0+ +OSL-1.1 OSL-1.1 +OSL-1.1+ OSL-1.1+ OSL-2.0 OSL-2.0 OSL-2.0+ OSL-2.0+ OSL-2.1 OSL-2.1 @@ -537,6 +651,8 @@ PHP-3.01 PHP-3.0.1 PHP-3.01 PHP-3.01 PHP-3.01 The PHP License, version 3.01 PHP-3.01+ PHP-3.01+ +Plexus Plexus +Plexus+ Plexus+ PostgreSQL PostgreSQL PostgreSQL+ PostgreSQL+ Python-2.0 PSF @@ -551,6 +667,8 @@ QPL-1.0 QPL QPL-1.0 QPL .. QPL-1.0 QPL-1.0 QPL-1.0+ QPL-1.0+ +Qhull Qhull +Qhull+ Qhull+ RHeCos-1.1 RHeCos-1.1 RHeCos-1.1+ RHeCos-1.1+ RPL-1.1 RPL-1.1 @@ -561,6 +679,8 @@ RPSL-1.0 RPSL-1.0 RPSL-1.0+ RPSL-1.0+ RSCPL RSCPL RSCPL+ RSCPL+ +Rdisc Rdisc +Rdisc+ Rdisc+ Ruby GPL-2.0+ or Ruby Ruby GPLv2+ or Ruby Ruby Ruby @@ -568,6 +688,8 @@ Ruby same as ruby's Ruby+ Ruby+ SAX-PD SAX-PD SAX-PD+ SAX-PD+ +SCEA SCEA +SCEA+ SCEA+ SGI-B-1.0 SGI-B-1.0 SGI-B-1.0+ SGI-B-1.0+ SGI-B-1.1 SGI-B-1.1 @@ -580,6 +702,8 @@ SISSL-1.2 SISSL-1.2 SISSL-1.2+ SISSL-1.2+ SMLNJ SMLNJ SMLNJ+ SMLNJ+ +SNIA SNIA +SNIA+ SNIA+ SPL-1.0 SPL-1.0 SPL-1.0+ SPL-1.0+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE @@ -763,17 +887,37 @@ SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#l SUSE-mplus+ SUSE-mplus+ SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-xinetd+ SUSE-xinetd+ +SWL SWL +SWL+ SWL+ +Saxpath Saxpath +Saxpath+ Saxpath+ SimPL-2.0 SimPL-2.0 SimPL-2.0+ SimPL-2.0+ Sleepycat Sleepycat Sleepycat+ Sleepycat+ +StandardML-NJ StandardML-NJ +StandardML-NJ+ StandardML-NJ+ SugarCRM-1.1.3 SugarCRM-1.1.3 SugarCRM-1.1.3+ SugarCRM-1.1.3+ +TCL TCL +TCL+ TCL+ +TMate TMate +TMate+ TMate+ +TORQUE-1.1 TORQUE-1.1 +TORQUE-1.1+ TORQUE-1.1+ +TOSL TOSL +TOSL+ TOSL+ Unicode http://www.unicode.org/copyright.html +Unicode-TOU Unicode-TOU +Unicode-TOU+ Unicode-TOU+ Unlicense Unlicense Unlicense+ Unlicense+ +VOSTROM VOSTROM +VOSTROM+ VOSTROM+ VSL-1.0 VSL-1.0 VSL-1.0+ VSL-1.0+ +Vim Vim +Vim+ Vim+ W3C W3C W3C W3C Software License W3C+ W3C+ @@ -784,6 +928,8 @@ WXwindows WXwindows WXwindows+ WXwindows+ Watcom-1.0 Watcom-1.0 Watcom-1.0+ Watcom-1.0+ +Wsuipa Wsuipa +Wsuipa+ Wsuipa+ X11 MIT/X Consortium License X11 MIT/X License X11 MIT/X11 @@ -795,6 +941,10 @@ X11 X11/MIT X11+ X11+ XFree86-1.1 XFree86-1.1 XFree86-1.1+ XFree86-1.1+ +XSkat XSkat +XSkat+ XSkat+ +Xerox Xerox +Xerox+ Xerox+ Xnet Xnet Xnet+ Xnet+ YPL-1.0 YPL-1.0 @@ -810,6 +960,10 @@ ZPL-2.0+ ZPL-2.0+ ZPL-2.1 ZPL 2.1 ZPL-2.1 ZPL-2.1 ZPL-2.1+ ZPL-2.1+ +Zed Zed +Zed+ Zed+ +Zend-2.0 Zend-2.0 +Zend-2.0+ Zend-2.0+ Zimbra-1.3 Zimbra-1.3 Zimbra-1.3+ Zimbra-1.3+ Zlib Zlib @@ -817,7 +971,35 @@ Zlib Zlib License Zlib zlib Zlib zlib/libpng License Zlib+ Zlib+ +bzip2-1.0.5 bzip2-1.0.5 +bzip2-1.0.5+ bzip2-1.0.5+ +bzip2-1.0.6 bzip2-1.0.6 +bzip2-1.0.6+ bzip2-1.0.6+ +diffmark diffmark +diffmark+ diffmark+ +dvipdfm dvipdfm +dvipdfm+ dvipdfm+ eCos-2.0 eCos-2.0 eCos-2.0+ eCos-2.0+ +eGenix eGenix +eGenix+ eGenix+ gSOAP-1.3b gSOAP-1.3b gSOAP-1.3b+ gSOAP-1.3b+ +gnuplot gnuplot +gnuplot+ gnuplot+ +iMatix iMatix +iMatix+ iMatix+ +libtiff libtiff +libtiff+ libtiff+ +mpich2 mpich2 +mpich2+ mpich2+ +psfrag psfrag +psfrag+ psfrag+ +psutils psutils +psutils+ psutils+ +xinetd xinetd +xinetd+ xinetd+ +xpp xpp +xpp+ xpp+ +zlib-acknowledgement zlib-acknowledgement +zlib-acknowledgement+ zlib-acknowledgement+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index d61026e..fcf5e71 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 25 05:13:17 UTC 2014 - coolo@suse.com + +- updated to SPDX License List v1.20 + ------------------------------------------------------------------- Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de -- 2.51.1 From b300c83d0d011122953c7b6dbd0b53b2da8823c9a98f3b5863a04ca7d48b04ea Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 25 Aug 2014 15:25:50 +0000 Subject: [PATCH 104/151] - cleaned up the SUSE specific list and moved to tar_scm service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=146 --- COPYING | 340 ------ _service | 17 + fetch-licenses.sh | 12 - format_spec_file | 49 - format_spec_file.service | 8 - licenses_changes.txt | 1005 ----------------- obs-service-format_spec_file-20140825.tar.bz2 | 3 + obs-service-format_spec_file.changes | 1 + obs-service-format_spec_file.spec | 24 +- patch_license | 564 --------- prepare_spec | 729 ------------ 11 files changed, 30 insertions(+), 2722 deletions(-) delete mode 100644 COPYING create mode 100644 _service delete mode 100644 fetch-licenses.sh delete mode 100644 format_spec_file delete mode 100644 format_spec_file.service delete mode 100644 licenses_changes.txt create mode 100644 obs-service-format_spec_file-20140825.tar.bz2 delete mode 100644 patch_license delete mode 100644 prepare_spec diff --git a/COPYING b/COPYING deleted file mode 100644 index fdca310..0000000 --- a/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - diff --git a/_service b/_service new file mode 100644 index 0000000..cfcb48e --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + git@github.com:openSUSE/obs-service-format_spec_file.git + git + .git + git-master + %ad + master + + + + *.tar + bz2 + + + + diff --git a/fetch-licenses.sh b/fetch-licenses.sh deleted file mode 100644 index 27d1cfe..0000000 --- a/fetch-licenses.sh +++ /dev/null @@ -1,12 +0,0 @@ -curl -s "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt -grep ^SUSE- licenses_changes.txt | cut -d' ' -f1 | while read l; do - echo "$l+ $l+" >> licenses_changes.txt ; -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 - echo "$i $i" >> licenses_changes.txt ; - echo "$i+ $i+" >> licenses_changes.txt ; -done -LC_ALL=C sort -o licenses_changes.txt -u licenses_changes.txt -( echo "First line" ; cat licenses_changes.txt ) > t -mv t licenses_changes.txt diff --git a/format_spec_file b/format_spec_file deleted file mode 100644 index 365065b..0000000 --- a/format_spec_file +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# just a wrapper for the perl script. - - -while test $# -gt 0; do - case $1 in - *-outdir) - MYOUTDIR="$2" - shift - ;; - *-specfile) - MYSPECFILES="$MYSPECFILES $2" - shift - ;; - *) - echo Unknown parameter $1. - echo 'Usage: this service is not excepting parameters' - exit 1 - ;; - esac - shift -done - -RETURN=0 -if [ -z "$MYSPECFILES" ]; then - MYSPECFILES=`echo *.spec` -fi -for i in $MYSPECFILES; do - if [ "$i" == '*.spec' ]; then - echo "WARNING: no spec file found" - exit 0 - fi - if /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i.$$"; then - # remove all file files which are indendical to committed files - # be carefull for the case that $MYOUDIR is local dir - if cmp -s "$i" "$MYOUTDIR/$i.$$"; then - rm "$MYOUTDIR/$i.$$" - else - mv "$MYOUTDIR/$i.$$" "$MYOUTDIR/$i" - fi - else - rm "$MYOUTDIR/$i.$$" - RETURN=1 - fi -done - -exit $RETURN - diff --git a/format_spec_file.service b/format_spec_file.service deleted file mode 100644 index 4379d57..0000000 --- a/format_spec_file.service +++ /dev/null @@ -1,8 +0,0 @@ - - Format the spec files - Formatting the spec files - - Just run on specified spec file instead all available - - - diff --git a/licenses_changes.txt b/licenses_changes.txt deleted file mode 100644 index 8ee19e3..0000000 --- a/licenses_changes.txt +++ /dev/null @@ -1,1005 +0,0 @@ -First line -AAL AAL -AAL+ AAL+ -ADSL ADSL -ADSL+ ADSL+ -AFL-1.1 AFL-1.1 -AFL-1.1+ AFL-1.1+ -AFL-1.2 AFL-1.2 -AFL-1.2+ AFL-1.2+ -AFL-2.0 AFL-2.0 -AFL-2.0+ AFL-2.0+ -AFL-2.1 AFL 2.1 -AFL-2.1 AFL-2.1 -AFL-2.1 Academic Free License 2.1 -AFL-2.1+ AFL-2.1+ -AFL-3.0 AFL-3.0 -AFL-3.0+ AFL-3.0+ -AGPL-1.0 AGPL-1.0 -AGPL-1.0+ AGPL-1.0+ -AGPL-3.0 AGPL-3.0 -AGPL-3.0 AGPLv3 -AGPL-3.0 Affero GPL -AGPL-3.0+ AGPL-3.0+ -AGPL-3.0+ AGPLv3+ -AGPL-3.0+ SUSE-AGPL-3.0+ -AMDPLPA AMDPLPA -AMDPLPA+ AMDPLPA+ -AML AML -AML+ AML+ -AMPAS AMPAS -AMPAS+ AMPAS+ -ANTLR-PD ANTLR-PD -ANTLR-PD+ ANTLR-PD+ -APAFML APAFML -APAFML+ APAFML+ -APL-1.0 APL-1.0 -APL-1.0 APL-1.0 (spdx.org/licenses) -APL-1.0+ APL-1.0+ -APSL-1.0 APSL-1.0 -APSL-1.0+ APSL-1.0+ -APSL-1.1 APSL-1.1 -APSL-1.1+ APSL-1.1+ -APSL-1.2 APSL-1.2 -APSL-1.2+ APSL-1.2+ -APSL-2.0 APSL-2.0 -APSL-2.0+ APSL-2.0+ -Abstyles Abstyles -Abstyles+ Abstyles+ -Adobe-2006 Adobe-2006 -Adobe-2006+ Adobe-2006+ -Adobe-Glyph Adobe-Glyph -Adobe-Glyph+ Adobe-Glyph+ -Afmparse Afmparse -Afmparse+ Afmparse+ -Aladdin Aladdin -Aladdin+ Aladdin+ -Apache-1.0 Apache-1.0 -Apache-1.0+ Apache-1.0+ -Apache-1.1 ASL 1.1 -Apache-1.1 Apache 1.1 (Indiana University) -Apache-1.1 Apache-1.1 -Apache-1.1+ Apache-1.1+ -Apache-2.0 ASL 2.0 -Apache-2.0 ASL2 -Apache-2.0 ASLv.. -Apache-2.0 ASLv2 -Apache-2.0 ASLv2.0 -Apache-2.0 Apache 2.0 -Apache-2.0 Apache License -Apache-2.0 Apache License 2.0 -Apache-2.0 Apache License Version 2.0 -Apache-2.0 Apache License, Version 2.0 -Apache-2.0 Apache Software License -Apache-2.0 Apache Software License .. -Apache-2.0 Apache Software License, Version 2.0 -Apache-2.0 Apache v2.0 -Apache-2.0 Apache-2.0 -Apache-2.0 The Apache Software License -Apache-2.0+ ASLv2.0+ -Apache-2.0+ Apache-2.0+ -Apache-2.0+ SUSE-Apache-2.0+ -Artistic-1.0 Artistic -Artistic-1.0 Artistic 1.0 -Artistic-1.0 Artistic License -Artistic-1.0 Artistic License .. -Artistic-1.0 Artistic license -Artistic-1.0 Artistic-1.0 -Artistic-1.0 or GPL-1.0+ Perl License -Artistic-1.0+ Artistic-1.0+ -Artistic-1.0+ SUSE-Artistic-1.0+ -Artistic-1.0-Perl Artistic-1.0-Perl -Artistic-1.0-Perl+ Artistic-1.0-Perl+ -Artistic-1.0-cl8 Artistic-1.0-cl8 -Artistic-1.0-cl8+ Artistic-1.0-cl8+ -Artistic-2.0 Artistic 2.0 -Artistic-2.0 Artistic-2.0 -Artistic-2.0+ Artistic-2.0+ -BSD-2-Clause BSD 2 Clause -BSD-2-Clause BSD 2 clause -BSD-2-Clause BSD 2-Clause -BSD-2-Clause BSD 2-clause -BSD-2-Clause BSD-2-Clause -BSD-2-Clause BSD-2c -BSD-2-Clause BSD2c -BSD-2-Clause+ BSD-2-Clause+ -BSD-2-Clause-FreeBSD BSD-2-Clause-FreeBSD -BSD-2-Clause-FreeBSD+ BSD-2-Clause-FreeBSD+ -BSD-2-Clause-NetBSD BSD-2-Clause-NetBSD -BSD-2-Clause-NetBSD+ BSD-2-Clause-NetBSD+ -BSD-3-Clause BSD (3-Clause) -BSD-3-Clause BSD 3-Clause -BSD-3-Clause BSD 3-clause (or similar) -BSD-3-Clause BSD-3 -BSD-3-Clause BSD-3-Clause -BSD-3-Clause BSD-3-clause (or similar) -BSD-3-Clause BSD3 -BSD-3-Clause BSD3c -BSD-3-Clause BSD3c (or similar) -BSD-3-Clause BSD3c(or similar) -BSD-3-Clause New BSD License -BSD-3-Clause+ BSD-3-Clause+ -BSD-3-Clause-Attribution BSD-3-Clause-Attribution -BSD-3-Clause-Attribution+ BSD-3-Clause-Attribution+ -BSD-3-Clause-Clear BSD-3-Clause-Clear -BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ -BSD-3-Clause-LBNL BSD-3-Clause-LBNL -BSD-3-Clause-LBNL+ BSD-3-Clause-LBNL+ -BSD-4-Clause BSD-4-Clause -BSD-4-Clause BSD4c -BSD-4-Clause BSD4c(or similar) -BSD-4-Clause+ BSD-4-Clause+ -BSD-4-Clause-UC BSD-4-Clause-UC -BSD-4-Clause-UC+ BSD-4-Clause-UC+ -BSD-Protection BSD-Protection -BSD-Protection+ BSD-Protection+ -BSL-1.0 BSL-1.0 -BSL-1.0+ BSL-1.0+ -Bahyph Bahyph -Bahyph+ Bahyph+ -Barr Barr -Barr+ Barr+ -Beerware Beerware -Beerware+ Beerware+ -BitTorrent-1.0 BitTorrent-1.0 -BitTorrent-1.0+ BitTorrent-1.0+ -BitTorrent-1.1 BitTorrent-1.1 -BitTorrent-1.1+ BitTorrent-1.1+ -Borceux Borceux -Borceux+ Borceux+ -CATOSL-1.1 CATOSL-1.1 -CATOSL-1.1+ CATOSL-1.1+ -CC-BY-1.0 CC-BY-1.0 -CC-BY-1.0+ CC-BY-1.0+ -CC-BY-2.0 CC-BY-2.0 -CC-BY-2.0+ CC-BY-2.0+ -CC-BY-2.5 CC-BY-2.5 -CC-BY-2.5+ CC-BY-2.5+ -CC-BY-3.0 CC-BY-3.0 -CC-BY-3.0+ CC-BY-3.0+ -CC-BY-4.0 CC-BY-4.0 -CC-BY-4.0+ CC-BY-4.0+ -CC-BY-NC-1.0 CC-BY-NC-1.0 -CC-BY-NC-1.0+ CC-BY-NC-1.0+ -CC-BY-NC-2.0 CC-BY-NC-2.0 -CC-BY-NC-2.0+ CC-BY-NC-2.0+ -CC-BY-NC-2.5 CC-BY-NC-2.5 -CC-BY-NC-2.5+ CC-BY-NC-2.5+ -CC-BY-NC-3.0 CC-BY-NC-3.0 -CC-BY-NC-3.0+ CC-BY-NC-3.0+ -CC-BY-NC-4.0 CC-BY-NC-4.0 -CC-BY-NC-4.0+ CC-BY-NC-4.0+ -CC-BY-NC-ND-1.0 CC-BY-NC-ND-1.0 -CC-BY-NC-ND-1.0+ CC-BY-NC-ND-1.0+ -CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.0 -CC-BY-NC-ND-2.0+ CC-BY-NC-ND-2.0+ -CC-BY-NC-ND-2.5 CC-BY-NC-ND-2.5 -CC-BY-NC-ND-2.5+ CC-BY-NC-ND-2.5+ -CC-BY-NC-ND-3.0 CC-BY-NC-ND-3.0 -CC-BY-NC-ND-3.0+ CC-BY-NC-ND-3.0+ -CC-BY-NC-ND-4.0 CC-BY-NC-ND-4.0 -CC-BY-NC-ND-4.0+ CC-BY-NC-ND-4.0+ -CC-BY-NC-SA-1.0 CC-BY-NC-SA-1.0 -CC-BY-NC-SA-1.0+ CC-BY-NC-SA-1.0+ -CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.0 -CC-BY-NC-SA-2.0+ CC-BY-NC-SA-2.0+ -CC-BY-NC-SA-2.5 CC-BY-NC-SA-2.5 -CC-BY-NC-SA-2.5+ CC-BY-NC-SA-2.5+ -CC-BY-NC-SA-3.0 CC-BY-NC-SA-3.0 -CC-BY-NC-SA-3.0+ CC-BY-NC-SA-3.0+ -CC-BY-NC-SA-4.0 CC-BY-NC-SA-4.0 -CC-BY-NC-SA-4.0+ CC-BY-NC-SA-4.0+ -CC-BY-ND-1.0 CC-BY-ND-1.0 -CC-BY-ND-1.0+ CC-BY-ND-1.0+ -CC-BY-ND-2.0 CC-BY-ND-2.0 -CC-BY-ND-2.0+ CC-BY-ND-2.0+ -CC-BY-ND-2.5 CC-BY-ND-2.5 -CC-BY-ND-2.5+ CC-BY-ND-2.5+ -CC-BY-ND-3.0 CC-BY-ND-3.0 -CC-BY-ND-3.0+ CC-BY-ND-3.0+ -CC-BY-ND-4.0 CC-BY-ND-4.0 -CC-BY-ND-4.0+ CC-BY-ND-4.0+ -CC-BY-SA-1.0 CC-BY-SA-1.0 -CC-BY-SA-1.0+ CC-BY-SA-1.0+ -CC-BY-SA-2.0 CC-BY-SA-2.0 -CC-BY-SA-2.0+ CC-BY-SA-2.0+ -CC-BY-SA-2.5 CC by-sa V2.5 -CC-BY-SA-2.5 CC-BY-SA-2.5 -CC-BY-SA-2.5+ CC-BY-SA-2.5+ -CC-BY-SA-3.0 CC BY-SA 3.0 -CC-BY-SA-3.0 CC BY-SA V3.0 -CC-BY-SA-3.0 CC-BY-SA-3.0 -CC-BY-SA-3.0+ CC-BY-SA-3.0+ -CC-BY-SA-4.0 CC-BY-SA-4.0 -CC-BY-SA-4.0 http://creativecommons.org/licenses/by-sa/4.0/legalcode -CC-BY-SA-4.0+ CC-BY-SA-4.0+ -CC0-1.0 CC0-1.0 -CC0-1.0+ CC0-1.0+ -CDDL-1.0 CDDL -CDDL-1.0 CDDL 1.0 -CDDL-1.0 CDDL-1.0 -CDDL-1.0+ CDDL-1.0+ -CDDL-1.1 CDDL-1.1 -CDDL-1.1+ CDDL-1.1+ -CECILL-1.0 CECILL-1.0 -CECILL-1.0+ CECILL-1.0+ -CECILL-1.1 CECILL-1.1 -CECILL-1.1+ CECILL-1.1+ -CECILL-1.1English CECILL-1.1English -CECILL-2.0 CECILL-2.0 -CECILL-2.0+ CECILL-2.0+ -CECILL-B CECILL-B -CECILL-B+ CECILL-B+ -CECILL-C CECILL-C -CECILL-C+ CECILL-C+ -CNRI-Python CNRI-Python -CNRI-Python+ CNRI-Python+ -CNRI-Python-GPL-Compatible CNRI-Python-GPL-Compatible -CNRI-Python-GPL-Compatible+ CNRI-Python-GPL-Compatible+ -CPAL-1.0 CPAL-1.0 -CPAL-1.0+ CPAL-1.0+ -CPL-1.0 CPL (Common Public License) v1 -CPL-1.0 CPL 1.0 -CPL-1.0 CPL 1.0 ... -CPL-1.0 CPL-1.0 -CPL-1.0 Common Public License - v 1.0 -CPL-1.0 Common Public License Version 1.0 -CPL-1.0 Common Public License Version 1.0 (CPL1.0) -CPL-1.0 Common Public License v1.0 -CPL-1.0 Common Public License v1.0 (CPL) -CPL-1.0+ CPL-1.0+ -CPOL-1.02 CPOL-1.02 -CPOL-1.02+ CPOL-1.02+ -CUA-OPL-1.0 CUA-OPL-1.0 -CUA-OPL-1.0+ CUA-OPL-1.0+ -Caldera Caldera -Caldera+ Caldera+ -ClArtistic ClArtistic -ClArtistic+ ClArtistic+ -Condor-1.1 Condor-1.1 -Condor-1.1+ Condor-1.1+ -Crossword Crossword -Crossword+ Crossword+ -Cube Cube -Cube+ Cube+ -D-FSL-1.0 D-FSL-1.0 -D-FSL-1.0+ D-FSL-1.0+ -DOC DOC -DOC+ DOC+ -DSDP DSDP -DSDP+ DSDP+ -Dotseqn Dotseqn -Dotseqn+ Dotseqn+ -ECL-1.0 ECL-1.0 -ECL-1.0+ ECL-1.0+ -ECL-2.0 ECL-2.0 -ECL-2.0+ ECL-2.0+ -EFL-1.0 EFL-1.0 -EFL-1.0+ EFL-1.0+ -EFL-2.0 EFL-2.0 -EFL-2.0+ EFL-2.0+ -EPL-1.0 EPL -EPL-1.0 EPL 1.0 -EPL-1.0 EPL 1.0 ... -EPL-1.0 EPL v1.0 -EPL-1.0 EPL-1 -EPL-1.0 EPL-1.0 -EPL-1.0 Eclipse Public License -EPL-1.0 Eclipse Public License 1.0 -EPL-1.0 Eclipse-1.0 -EPL-1.0+ EPL-1.0+ -EUDatagrid EUDatagrid -EUDatagrid+ EUDatagrid+ -EUPL-1.0 EUPL-1.0 -EUPL-1.0+ EUPL-1.0+ -EUPL-1.1 EUPL-1.1 -EUPL-1.1+ EUPL-1.1+ -Entessa Entessa -Entessa+ Entessa+ -ErlPL-1.1 ErlPL-1.1 -ErlPL-1.1 Erlang Public License -ErlPL-1.1+ ErlPL-1.1+ -Eurosym Eurosym -Eurosym+ Eurosym+ -FSFUL FSFUL -FSFUL+ FSFUL+ -FSFULLR FSFULLR -FSFULLR+ FSFULLR+ -FTL FTL -FTL+ FTL+ -Fair Fair -Fair+ Fair+ -Frameworx-1.0 Frameworx-1.0 -Frameworx-1.0+ Frameworx-1.0+ -GFDL-1.1 GFDL 1.1 -GFDL-1.1 GFDL v1.1 -GFDL-1.1 GFDL-1.1 -GFDL-1.1 GFDLv1.1 -GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) -GFDL-1.1+ FDL v1.1 or later -GFDL-1.1+ GFDL-1.1+ -GFDL-1.1+ SUSE-GFDL-1.1+ -GFDL-1.2 GFDL 1.2 -GFDL-1.2 GFDL v1.2 -GFDL-1.2 GFDL-1.2 -GFDL-1.2 GFDLv1.2 -GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) -GFDL-1.2+ FDL-1.2+ -GFDL-1.2+ FDLv1.2+ -GFDL-1.2+ GFDL-1.2+ -GFDL-1.2+ GFDLv1.2+ -GFDL-1.2+ SUSE-GFDL-1.2+ -GFDL-1.3 GFDL-1.3 -GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3) -GFDL-1.3+ FDL-1.3+ -GFDL-1.3+ GFDL-1.3+ -GFDL-1.3+ SUSE-GFDL-1.3+ -GL2PS GL2PS -GL2PS+ GL2PS+ -GPL-1.0 GPL-1.0 -GPL-1.0+ GPL+ -GPL-1.0+ GPL-1.0+ -GPL-1.0+ GPLv1+ -GPL-1.0++ GPL-1.0++ -GPL-2.0 GLPv2 -GPL-2.0 GNU GPL v2 -GPL-2.0 GNU General Public License (GPL) v2 -GPL-2.0 GNU General Public License version 2 (GPL v2) -GPL-2.0 GPL 2.0 -GPL-2.0 GPL v2 -GPL-2.0 GPL v2 only -GPL-2.0 GPL v2.0 -GPL-2.0 GPL-2 -GPL-2.0 GPL-2.0 -GPL-2.0 GPL2 -GPL-2.0 GPLv2 -GPL-2.0+ GNU General Public License version 2 or later -GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later) -GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later) -GPL-2.0+ GPL v2 or later -GPL-2.0+ GPL v2 or later -GPL-2.0+ GPL v2+ -GPL-2.0+ GPL v2.0 or later -GPL-2.0+ GPL-2+ -GPL-2.0+ GPL-2.0 or later -GPL-2.0+ GPL-2.0+ -GPL-2.0+ GPL2+ -GPL-2.0+ GPLv2 or later -GPL-2.0+ GPLv2+ -GPL-2.0+ libGeoIPUpdate is GPLv2 or later -GPL-2.0++ GPL-2.0++ -GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ -GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception -GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ -GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception -GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ -GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception -GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ -GPL-2.0-with-font-exception GPL-2.0-with-font-exception -GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ -GPL-3.0 GNU GPL version 3 -GPL-3.0 GNU General Public License version 3 (GPLv3) -GPL-3.0 GPL 3 -GPL-3.0 GPL v3 -GPL-3.0 GPL v3 only -GPL-3.0 GPL-3 -GPL-3.0 GPL-3.0 -GPL-3.0 GPL3 -GPL-3.0 GPLv3 -GPL-3.0+ GNU GPL v3 or later -GPL-3.0+ GPL v3 or later -GPL-3.0+ GPL-3+ -GPL-3.0+ GPL-3.0+ -GPL-3.0+ GPLv3+ -GPL-3.0++ GPL-3.0++ -GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ -GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception -GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ -Giftware Giftware -Giftware+ Giftware+ -Glide Glide -Glide+ Glide+ -Glulxe Glulxe -Glulxe+ Glulxe+ -HPND HPND -HPND+ HPND+ -HaskellReport HaskellReport -HaskellReport+ HaskellReport+ -IBM-pibs IBM-pibs -IBM-pibs+ IBM-pibs+ -IJG IJG -IJG+ IJG+ -IPA IPA -IPA see IPA_Font_License_Agreement_v1.0.txt -IPA+ IPA+ -IPL-1.0 IBM PL -IPL-1.0 IBM Public License -IPL-1.0 IBM Public License .. -IPL-1.0 IPL-1.0 -IPL-1.0+ IPL-1.0+ -ISC ISC -ISC ISC License -ISC+ ISC+ -ImageMagick ImageMagick -ImageMagick+ ImageMagick+ -Imlib2 Imlib2 -Imlib2+ Imlib2+ -Intel Intel -Intel+ Intel+ -Intel-ACPI Intel-ACPI -Intel-ACPI+ Intel-ACPI+ -JSON JSON -JSON+ JSON+ -JasPer-2.0 JasPer-2.0 -JasPer-2.0+ JasPer-2.0+ -LGPL-2.0 LGPL v2 -LGPL-2.0 LGPL v2.0 only -LGPL-2.0 LGPL-2.0 -LGPL-2.0 LGPLv2 -LGPL-2.0 LGPLv2.0 -LGPL-2.0+ LGPL v2 or later -LGPL-2.0+ LGPL v2.0 or later -LGPL-2.0+ LGPL-2.0+ -LGPL-2.0+ LGPLv2.0+ -LGPL-2.0++ LGPL-2.0++ -LGPL-2.1 GNU LGPLv2.1 -LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1) -LGPL-2.1 LGPL 2.1 -LGPL-2.1 LGPL v2.1 -LGPL-2.1 LGPL v2.1 only -LGPL-2.1 LGPL-2.1 -LGPL-2.1 LGPL2.1 -LGPL-2.1 LGPLv2.1 -LGPL-2.1+ GNU LGPL v2.1 or later -LGPL-2.1+ LGPL V2+ -LGPL-2.1+ LGPL v2+ -LGPL-2.1+ LGPL v2.1 or later -LGPL-2.1+ LGPL v2.1+ -LGPL-2.1+ LGPL-2.0.1 or later -LGPL-2.1+ LGPL-2.1+ -LGPL-2.1+ LGPLv2+ -LGPL-2.1+ LGPLv2.1+ -LGPL-2.1++ LGPL-2.1++ -LGPL-3.0 GNU Lesser General Public License (LGPL), Version 3 -LGPL-3.0 GNU Lesser General Public License version 3 (LGPL v3) -LGPL-3.0 LGPL-3.0 -LGPL-3.0 LGPLv3 -LGPL-3.0+ LGPL v3 or later -LGPL-3.0+ LGPL-3.0+ -LGPL-3.0+ LGPLv3+ -LGPL-3.0++ LGPL-3.0++ -LPL-1.0 LPL-1.0 -LPL-1.0+ LPL-1.0+ -LPL-1.02 LPL-1.02 -LPL-1.02+ LPL-1.02+ -LPPL-1.0 LPPL-1.0 -LPPL-1.0+ LPPL-1.0+ -LPPL-1.1 LPPL-1.1 -LPPL-1.1+ LPPL-1.1+ -LPPL-1.2 LPPL-1.2 -LPPL-1.2+ LPPL-1.2+ -LPPL-1.3a LPPL-1.3a -LPPL-1.3a+ LPPL-1.3a+ -LPPL-1.3c LPPL .. -LPPL-1.3c LPPL-1.3c -LPPL-1.3c TeX-License .. -LPPL-1.3c+ LPPL-1.3c+ -Latex2e Latex2e -Latex2e+ Latex2e+ -Leptonica Leptonica -Leptonica+ Leptonica+ -Libpng Libpng -Libpng+ Libpng+ -MIT Expat -MIT Expat License -MIT MIT -MIT MIT License -MIT MIT License (or similar) -MIT MIT licence -MIT MIT license -MIT MIT-Licence -MIT+ MIT+ -MIT-CMU MIT-CMU -MIT-CMU+ MIT-CMU+ -MIT-advertising MIT-advertising -MIT-advertising+ MIT-advertising+ -MIT-enna MIT-enna -MIT-enna+ MIT-enna+ -MIT-feh MIT-feh -MIT-feh+ MIT-feh+ -MITNFA MITNFA -MITNFA+ MITNFA+ -MPL-1.0 MPL-1.0 -MPL-1.0 MPLv1.0 -MPL-1.0+ MPL-1.0+ -MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) -MPL-1.1 MPL-1.1 -MPL-1.1 MPLv1.1 -MPL-1.1 MPLv1.1 .. -MPL-1.1 Mozilla Public License 1.1 -MPL-1.1+ MPL 1.1 or later -MPL-1.1+ MPL-1.1+ -MPL-1.1+ MPLv1.1+ -MPL-1.1+ SUSE-MPL-1.1+ -MPL-2.0 MPL-2.0 -MPL-2.0+ MPL-2.0+ -MPL-2.0-no-copyleft-exception MPL-2.0-no-copyleft-exception -MPL-2.0-no-copyleft-exception+ MPL-2.0-no-copyleft-exception+ -MS-PL MS-PL -MS-PL Ms-Pl -MS-PL+ MS-PL+ -MS-RL MS-RL -MS-RL+ MS-RL+ -MTLL MTLL -MTLL+ MTLL+ -MakeIndex MakeIndex -MakeIndex+ MakeIndex+ -MirOS MirOS -MirOS+ MirOS+ -Motosoto Motosoto -Motosoto+ Motosoto+ -Multics Multics -Multics+ Multics+ -Mup Mup -Mup+ Mup+ -NASA-1.3 NASA-1.3 -NASA-1.3+ NASA-1.3+ -NBPL-1.0 NBPL-1.0 -NBPL-1.0+ NBPL-1.0+ -NCSA NCSA -NCSA+ NCSA+ -NGPL NGPL -NGPL+ NGPL+ -NLPL NLPL -NLPL+ NLPL+ -NOSL NOSL -NOSL+ NOSL+ -NPL-1.0 NPL-1.0 -NPL-1.0+ NPL-1.0+ -NPL-1.1 NPL-1.1 -NPL-1.1+ NPL-1.1+ -NPOSL-3.0 NPOSL-3.0 -NPOSL-3.0+ NPOSL-3.0+ -NRL NRL -NRL+ NRL+ -NTP NTP -NTP+ NTP+ -Naumen Naumen -Naumen+ Naumen+ -NetCDF NetCDF -NetCDF+ NetCDF+ -Newsletr Newsletr -Newsletr+ Newsletr+ -Nokia Nokia -Nokia+ Nokia+ -Noweb Noweb -Noweb+ Noweb+ -Nunit Nunit -Nunit+ Nunit+ -OCLC-2.0 OCLC-2.0 -OCLC-2.0+ OCLC-2.0+ -ODbL-1.0 ODbL-1.0 -ODbL-1.0+ ODbL-1.0+ -OFL-1.0 OFL-1.0 -OFL-1.0+ OFL-1.0+ -OFL-1.1 OFL -OFL-1.1 OFL-1.1 -OFL-1.1 Open Font License -OFL-1.1 SIL Open Font License -OFL-1.1 SIL Open Font License 1.1 -OFL-1.1+ OFL-1.1+ -OGTSL OGTSL -OGTSL+ OGTSL+ -OLDAP-1.1 OLDAP-1.1 -OLDAP-1.1+ OLDAP-1.1+ -OLDAP-1.2 OLDAP-1.2 -OLDAP-1.2+ OLDAP-1.2+ -OLDAP-1.3 OLDAP-1.3 -OLDAP-1.3+ OLDAP-1.3+ -OLDAP-1.4 OLDAP-1.4 -OLDAP-1.4+ OLDAP-1.4+ -OLDAP-2.0 OLDAP-2.0 -OLDAP-2.0+ OLDAP-2.0+ -OLDAP-2.0.1 OLDAP-2.0.1 -OLDAP-2.0.1+ OLDAP-2.0.1+ -OLDAP-2.1 OLDAP-2.1 -OLDAP-2.1+ OLDAP-2.1+ -OLDAP-2.2 OLDAP-2.2 -OLDAP-2.2+ OLDAP-2.2+ -OLDAP-2.2.1 OLDAP-2.2.1 -OLDAP-2.2.1+ OLDAP-2.2.1+ -OLDAP-2.2.2 OLDAP-2.2.2 -OLDAP-2.2.2+ OLDAP-2.2.2+ -OLDAP-2.3 OLDAP-2.3 -OLDAP-2.3+ OLDAP-2.3+ -OLDAP-2.4 OLDAP-2.4 -OLDAP-2.4+ OLDAP-2.4+ -OLDAP-2.5 OLDAP-2.5 -OLDAP-2.5+ OLDAP-2.5+ -OLDAP-2.6 OLDAP-2.6 -OLDAP-2.6+ OLDAP-2.6+ -OLDAP-2.7 OLDAP-2.7 -OLDAP-2.7+ OLDAP-2.7+ -OLDAP-2.8 OLDAP-2.8 -OLDAP-2.8 openldap 2.8 -OLDAP-2.8+ OLDAP-2.8+ -OML OML -OML+ OML+ -OPL-1.0 OPL-1.0 -OPL-1.0 Open Publication License 1.0 -OPL-1.0+ OPL-1.0+ -OSL-1.0 OSL-1.0 -OSL-1.0+ OSL-1.0+ -OSL-1.1 OSL-1.1 -OSL-1.1+ OSL-1.1+ -OSL-2.0 OSL-2.0 -OSL-2.0+ OSL-2.0+ -OSL-2.1 OSL-2.1 -OSL-2.1+ OSL-2.1+ -OSL-3.0 OSL-3.0 -OSL-3.0+ OSL-3.0+ -OpenSSL OpenSSL -OpenSSL+ OpenSSL+ -PDDL-1.0 PDDL-1.0 -PDDL-1.0+ PDDL-1.0+ -PHP-3.0 PHP-3.0 -PHP-3.0+ PHP-3.0+ -PHP-3.01 PHP License -PHP-3.01 PHP-3.0.1 -PHP-3.01 PHP-3.01 -PHP-3.01 The PHP License, version 3.01 -PHP-3.01+ PHP-3.01+ -Plexus Plexus -Plexus+ Plexus+ -PostgreSQL PostgreSQL -PostgreSQL+ PostgreSQL+ -Python-2.0 PSF -Python-2.0 Python -Python-2.0 Python .. -Python-2.0 Python Copyright -Python-2.0 Python License .. -Python-2.0 Python Software Foundation License -Python-2.0 Python-2.0 -Python-2.0+ Python-2.0+ -QPL-1.0 QPL -QPL-1.0 QPL .. -QPL-1.0 QPL-1.0 -QPL-1.0+ QPL-1.0+ -Qhull Qhull -Qhull+ Qhull+ -RHeCos-1.1 RHeCos-1.1 -RHeCos-1.1+ RHeCos-1.1+ -RPL-1.1 RPL-1.1 -RPL-1.1+ RPL-1.1+ -RPL-1.5 RPL-1.5 -RPL-1.5+ RPL-1.5+ -RPSL-1.0 RPSL-1.0 -RPSL-1.0+ RPSL-1.0+ -RSCPL RSCPL -RSCPL+ RSCPL+ -Rdisc Rdisc -Rdisc+ Rdisc+ -Ruby GPL-2.0+ or Ruby -Ruby GPLv2+ or Ruby -Ruby Ruby -Ruby same as ruby's -Ruby+ Ruby+ -SAX-PD SAX-PD -SAX-PD+ SAX-PD+ -SCEA SCEA -SCEA+ SCEA+ -SGI-B-1.0 SGI-B-1.0 -SGI-B-1.0+ SGI-B-1.0+ -SGI-B-1.1 SGI-B-1.1 -SGI-B-1.1+ SGI-B-1.1+ -SGI-B-2.0 SGI-B-2.0 -SGI-B-2.0+ SGI-B-2.0+ -SISSL SISSL -SISSL+ SISSL+ -SISSL-1.2 SISSL-1.2 -SISSL-1.2+ SISSL-1.2+ -SMLNJ SMLNJ -SMLNJ+ SMLNJ+ -SNIA SNIA -SNIA+ SNIA+ -SPL-1.0 SPL-1.0 -SPL-1.0+ SPL-1.0+ -SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE -SUSE-Arphic+ SUSE-Arphic+ -SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility -SUSE-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ -SUSE-BSD-Mark-Modifications BSD-Mark-Modifications -SUSE-BSD-Mark-Modifications+ SUSE-BSD-Mark-Modifications+ -SUSE-Beerware Beerware License like http://en.wikipedia.org/wiki/Beerware#License -SUSE-Beerware+ SUSE-Beerware+ -SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html -SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ -SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 -SUSE-CC-Sampling-Plus-1.0+ SUSE-CC-Sampling-Plus-1.0+ -SUSE-CPL-0.5 Common Public License 0.5 -SUSE-CPL-0.5+ SUSE-CPL-0.5+ -SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php -SUSE-CacertRoot+ SUSE-CacertRoot+ -SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) -SUSE-DMTF+ SUSE-DMTF+ -SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh -SUSE-Docbook-XSL+ SUSE-Docbook-XSL+ -SUSE-EULA SUSE End User License Agreement -SUSE-EULA+ SUSE-EULA+ -SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf -SUSE-Egenix-1.1.0+ SUSE-Egenix-1.1.0+ -SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright -SUSE-FHS+ SUSE-FHS+ -SUSE-FLTK Fltk -SUSE-FLTK+ SUSE-FLTK+ -SUSE-Firmware Firmware license, redistributable unmodified -SUSE-Firmware+ SUSE-Firmware+ -SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en -SUSE-Free-Art-1.3+ SUSE-Free-Art-1.3+ -SUSE-Freetype Freetype -SUSE-Freetype+ SUSE-Freetype+ -SUSE-Freeware Freeware -SUSE-Freeware Freeware license -SUSE-Freeware+ SUSE-Freeware+ -SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS -SUSE-GL2PS-2.0+ SUSE-GL2PS-2.0+ -SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ -SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries -SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-2.0+-with-sane-exception+ -SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception -SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ -SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) -SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ -SUSE-GPL-2.0-with-linking-exception Copyright holder expressly allows GPL-2.0 component to be linked with components which are not GPL compatible -SUSE-GPL-2.0-with-linking-exception+ SUSE-GPL-2.0-with-linking-exception+ -SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception -SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ -SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications grant an exception that permits non-free plugins (e.g. from gstreamer) to be linked against them -SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0-with-plugin-exception+ -SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions -SUSE-GPL-3.0+-with-autoconf-exception+ SUSE-GPL-3.0+-with-autoconf-exception+ -SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) -SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-font-exception+ -SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception -SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ -SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses -SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ -SUSE-GPL-3.0-with-font-exception SUSE-GPL-3.0-with-font-exception -SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-font-exception+ -SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) -SUSE-GPL-3.0-with-openssl-exception+ SUSE-GPL-3.0-with-openssl-exception+ -SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) -SUSE-GPL-3.0-with-template-exception+ SUSE-GPL-3.0-with-template-exception+ -SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 -SUSE-Gitslave+ SUSE-Gitslave+ -SUSE-Gnuplot Gnuplot -SUSE-Gnuplot+ SUSE-Gnuplot+ -SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ -SUSE-IBPL-1.0+ SUSE-IBPL-1.0+ -SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ -SUSE-IDPL-1.0+ SUSE-IDPL-1.0+ -SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense -SUSE-IEEE+ SUSE-IEEE+ -SUSE-IJG JPEG License -SUSE-IJG+ SUSE-IJG+ -SUSE-ImageMagick ImageMagick -SUSE-ImageMagick+ SUSE-ImageMagick+ -SUSE-Innernet-2.0 Inner Net License 2 -SUSE-Innernet-2.0+ SUSE-Innernet-2.0+ -SUSE-Innernet-2.00 Inner Net License 2.00 -SUSE-Innernet-2.00+ SUSE-Innernet-2.00+ -SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint -SUSE-JSON+ SUSE-JSON+ -SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html -SUSE-LDPL-2.0+ SUSE-LDPL-2.0+ -SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception -SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception+ -SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception -SUSE-LGPL-2.1+-with-GCC-exception+ SUSE-LGPL-2.1+-with-GCC-exception+ -SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012 -SUSE-LGPL-2.1-with-digia-exception-1.1+ SUSE-LGPL-2.1-with-digia-exception-1.1+ -SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4 -SUSE-LGPL-2.1-with-nokia-exception-1.1+ SUSE-LGPL-2.1-with-nokia-exception-1.1+ -SUSE-LGPL-3.0-with-openssl-exception e.g python-psycopg2 -SUSE-LGPL-3.0-with-openssl-exception+ SUSE-LGPL-3.0-with-openssl-exception+ -SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) -SUSE-Liberation+ SUSE-Liberation+ -SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) -SUSE-MakeIndex+ SUSE-MakeIndex+ -SUSE-Manpages Manpages licenses (linux man pages e.g.) -SUSE-Manpages+ SUSE-Manpages+ -SUSE-Matplotlib E.g. python -matplotlib -> LICENSE/LICENSE -SUSE-Matplotlib+ SUSE-Matplotlib+ -SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) -SUSE-MgOpen+ SUSE-MgOpen+ -SUSE-NetCDF SUSE-NetCDF -SUSE-NetCDF+ SUSE-NetCDF+ -SUSE-NonFree NonFree licenses -SUSE-NonFree+ SUSE-NonFree+ -SUSE-OML Open Market License (tracked by Fedora as OML) -SUSE-OML+ SUSE-OML+ -SUSE-OSL-1.1 OSL-1.1 -SUSE-OSL-1.1+ SUSE-OSL-1.1+ -SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice -SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice+ -SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) -SUSE-OldFSFDocLicense+ SUSE-OldFSFDocLicense+ -SUSE-PHP-2.02 PHP 2.02 -SUSE-PHP-2.02+ SUSE-PHP-2.02+ -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. -SUSE-Permissive+ SUSE-Permissive+ -SUSE-Permissive-Modify-By-Patch Similar to SUSE-Permissive but copyright holder has specified that modification is only allowed by patch -SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive-Modify-By-Patch+ -SUSE-Public-Domain Public Domain -SUSE-Public-Domain Public Domain License -SUSE-Public-Domain Public Domain, Freeware -SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw -SUSE-Public-Domain Public domain -SUSE-Public-Domain+ SUSE-Public-Domain+ -SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) -SUSE-Python-1.6+ SUSE-Python-1.6+ -SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ -SUSE-QWT-1.0+ SUSE-QWT-1.0+ -SUSE-Qhull Qhull -SUSE-Qhull+ SUSE-Qhull+ -SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. -SUSE-Redistributable-Content+ SUSE-Redistributable-Content+ -SUSE-Repoze http://repoze.org/license.html -SUSE-Repoze+ SUSE-Repoze+ -SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) -SUSE-SGI-FreeB-2.0+ SUSE-SGI-FreeB-2.0+ -SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license -SUSE-SIP+ SUSE-SIP+ -SUSE-SLIB http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt -SUSE-SLIB+ SUSE-SLIB+ -SUSE-SNIA-1.0 SNIA Public License (https://fedoraproject.org/wiki/Licensing/SNIA_Public_License) -SUSE-SNIA-1.0+ SUSE-SNIA-1.0+ -SUSE-SNIA-1.1 SNIA 1.1 -SUSE-SNIA-1.1+ SUSE-SNIA-1.1+ -SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) -SUSE-Sendmail+ SUSE-Sendmail+ -SUSE-Sun-Laboratories http://pastebin.com/UubnS3se -SUSE-Sun-Laboratories+ SUSE-Sun-Laboratories+ -SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) -SUSE-TCL+ SUSE-TCL+ -SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vpazbrt2beddyhgwcch4sduhnmmefdotlyelojxg4tyzllhb4a/tgppl.html -SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ -SUSE-TeX http://en.wikipedia.org/wiki/TeX#License -SUSE-TeX+ SUSE-TeX+ -SUSE-Ubuntu-Font-License-1.0 http://font.ubuntu.com/licence/ -SUSE-Ubuntu-Font-License-1.0+ SUSE-Ubuntu-Font-License-1.0+ -SUSE-Vim SUSE-Vim -SUSE-Vim+ SUSE-Vim+ -SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license -SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ -SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) -SUSE-XSL-Lint+ SUSE-XSL-Lint+ -SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense -SUSE-Xano+ SUSE-Xano+ -SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) -SUSE-Xenonsoft-1.00+ SUSE-Xenonsoft-1.00+ -SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition -SUSE-mirror+ SUSE-mirror+ -SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license -SUSE-mplus+ SUSE-mplus+ -SUSE-xinetd Xinedt license (Fedora also uses a custom license here) -SUSE-xinetd+ SUSE-xinetd+ -SWL SWL -SWL+ SWL+ -Saxpath Saxpath -Saxpath+ Saxpath+ -SimPL-2.0 SimPL-2.0 -SimPL-2.0+ SimPL-2.0+ -Sleepycat Sleepycat -Sleepycat+ Sleepycat+ -StandardML-NJ StandardML-NJ -StandardML-NJ+ StandardML-NJ+ -SugarCRM-1.1.3 SugarCRM-1.1.3 -SugarCRM-1.1.3+ SugarCRM-1.1.3+ -TCL TCL -TCL+ TCL+ -TMate TMate -TMate+ TMate+ -TORQUE-1.1 TORQUE-1.1 -TORQUE-1.1+ TORQUE-1.1+ -TOSL TOSL -TOSL+ TOSL+ -Unicode http://www.unicode.org/copyright.html -Unicode-TOU Unicode-TOU -Unicode-TOU+ Unicode-TOU+ -Unlicense Unlicense -Unlicense+ Unlicense+ -VOSTROM VOSTROM -VOSTROM+ VOSTROM+ -VSL-1.0 VSL-1.0 -VSL-1.0+ VSL-1.0+ -Vim Vim -Vim+ Vim+ -W3C W3C -W3C W3C Software License -W3C+ W3C+ -WTFPL SUSE-WTFPL-2.0 -WTFPL WTFPL -WTFPL+ WTFPL+ -WXwindows WXwindows -WXwindows+ WXwindows+ -Watcom-1.0 Watcom-1.0 -Watcom-1.0+ Watcom-1.0+ -Wsuipa Wsuipa -Wsuipa+ Wsuipa+ -X11 MIT/X Consortium License -X11 MIT/X License -X11 MIT/X11 -X11 SUSE-XFree86-1.0 -X11 X11 -X11 X11 (BSD like) -X11 X11 MIT -X11 X11/MIT -X11+ X11+ -XFree86-1.1 XFree86-1.1 -XFree86-1.1+ XFree86-1.1+ -XSkat XSkat -XSkat+ XSkat+ -Xerox Xerox -Xerox+ Xerox+ -Xnet Xnet -Xnet+ Xnet+ -YPL-1.0 YPL-1.0 -YPL-1.0+ YPL-1.0+ -YPL-1.1 YPL-1.1 -YPL-1.1+ YPL-1.1+ -ZPL-1.1 ZPL-1.1 -ZPL-1.1+ ZPL-1.1+ -ZPL-2.0 ZPL -ZPL-2.0 ZPL-2.0 -ZPL-2.0 Zope Public License -ZPL-2.0+ ZPL-2.0+ -ZPL-2.1 ZPL 2.1 -ZPL-2.1 ZPL-2.1 -ZPL-2.1+ ZPL-2.1+ -Zed Zed -Zed+ Zed+ -Zend-2.0 Zend-2.0 -Zend-2.0+ Zend-2.0+ -Zimbra-1.3 Zimbra-1.3 -Zimbra-1.3+ Zimbra-1.3+ -Zlib Zlib -Zlib Zlib License -Zlib zlib -Zlib zlib/libpng License -Zlib+ Zlib+ -bzip2-1.0.5 bzip2-1.0.5 -bzip2-1.0.5+ bzip2-1.0.5+ -bzip2-1.0.6 bzip2-1.0.6 -bzip2-1.0.6+ bzip2-1.0.6+ -diffmark diffmark -diffmark+ diffmark+ -dvipdfm dvipdfm -dvipdfm+ dvipdfm+ -eCos-2.0 eCos-2.0 -eCos-2.0+ eCos-2.0+ -eGenix eGenix -eGenix+ eGenix+ -gSOAP-1.3b gSOAP-1.3b -gSOAP-1.3b+ gSOAP-1.3b+ -gnuplot gnuplot -gnuplot+ gnuplot+ -iMatix iMatix -iMatix+ iMatix+ -libtiff libtiff -libtiff+ libtiff+ -mpich2 mpich2 -mpich2+ mpich2+ -psfrag psfrag -psfrag+ psfrag+ -psutils psutils -psutils+ psutils+ -xinetd xinetd -xinetd+ xinetd+ -xpp xpp -xpp+ xpp+ -zlib-acknowledgement zlib-acknowledgement -zlib-acknowledgement+ zlib-acknowledgement+ diff --git a/obs-service-format_spec_file-20140825.tar.bz2 b/obs-service-format_spec_file-20140825.tar.bz2 new file mode 100644 index 0000000..5f80bb7 --- /dev/null +++ b/obs-service-format_spec_file-20140825.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53c6a961a2755fe89502328b30e26f623354ff43c163948d6b88df55351d3004 +size 26673 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index fcf5e71..88eb199 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -2,6 +2,7 @@ Mon Aug 25 05:13:17 UTC 2014 - coolo@suse.com - updated to SPDX License List v1.20 +- cleaned up the SUSE specific list and moved to tar_scm service ------------------------------------------------------------------- Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index ac49939..c44270f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,16 +20,11 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 0.4.2 +Version: 20140825 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file -Source: format_spec_file -Source1: format_spec_file.service -Source2: prepare_spec -Source3: patch_license -Source4: licenses_changes.txt -Source5: fetch-licenses.sh -Source100: COPYING +# osc service dr +Source: %{name}-%{version}.tar.bz2 Requires: obs-service-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,20 +40,19 @@ spec file instead of creating a new one. %prep -%setup -q -D -T 0 -n . -cp -a %{SOURCE100} . +%setup %build %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0755 format_spec_file $RPM_BUILD_ROOT/usr/lib/obs/service +install -m 0644 format_spec_file.service $RPM_BUILD_ROOT/usr/lib/obs/service +install -m 0755 prepare_spec patch_license $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +install -m 0644 licenses_changes.txt $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files %check -perl %{SOURCE2} %_topdir/SOURCES/%name.spec +perl prepare_spec %_topdir/SOURCES/%name.spec %files %defattr(-,root,root) diff --git a/patch_license b/patch_license deleted file mode 100644 index 6cdb58a..0000000 --- a/patch_license +++ /dev/null @@ -1,564 +0,0 @@ -#! /usr/bin/perl -w -# -# vim:sw=2:et -# - -BEGIN { - unshift @INC, "."; - unshift @INC, "/usr/lib/build/"; -} - -use Time::localtime; -use Data::Dumper; -use strict; - -my @oldspec = (); -my @newspec = (); -my $base_package = ""; -my $icecreamforbuild = ""; -my @copyrights = (); -my $needsrootforbuild = 0; -my $needsbinariesforbuild = 0; -my $nodebuginfo = 0; -my $vim_modeline; -my $nosrc_result = 0; -my $current_section = "header"; -my $had_debug_package = 0; -my %pkg_version = (); -my $main_license; -my %seen_licenses = (); -my $main_group; -my %seen_groups = (); -my $build_root = $ENV{'BUILD_ROOT'}; -my $disabled_packs; -my $ifhandler; -my $definelist; -my $debug = 0; - -my @global_tags_list = -( - 'Autoreq', - 'Autoreqprov', - 'BuildArch', - 'BuildArchitectures', - 'BuildRequires', - 'Conflicts', - 'DocDir', - 'Enhances', - 'Enhances', - 'EssentialFor', - 'ExcludeArch', - 'ExclusiveArch', - 'Freshens', - 'Group', - 'Name', - 'NoPatch', - 'NoSource', - 'Obsoletes', - 'Patch\d*', - 'Prefix', - 'PreReq', - 'Provides', - 'Recommends', - 'Requires', - 'Source\d*', - 'Suggests', - 'Summary', - 'Supplements', - 'Url', -); - -my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; - -my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . - 'description|files|triggerin|triggerun|triggerpostun)\b'; - -sub unify { - my %h = map {$_ => 1} @_; - return grep(delete($h{$_}), @_); -} - -sub capitalize_case($) -{ - my ($tag) = @_; - - $tag = lc($tag); - - $tag =~ s/docdir/DocDir/i; - $tag =~ s/arch/Arch/i; - $tag =~ s/patch/Patch/i; - $tag =~ s/source/Source/i; - $tag =~ s/req/Req/i; - $tag =~ s/prov/Prov/i; - $tag =~ s/^(\w)/uc($1)/e; - - return $tag; -} - -sub compare_arrays { - my ($first, $second) = @_; - return 0 unless @$first == @$second; - for (my $i = 0; $i < @$first; $i++) { - return 0 if $first->[$i] ne $second->[$i]; - } - return 1; -} - -sub maybe_add_empty_line() -{ - push @oldspec, "XXXBLANKLINE" - if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); -} - -sub change_section($) -{ - my ($new_section) = @_; - - maybe_add_empty_line(); - - $current_section = $new_section; - warn "section changed to $current_section\n" if $debug; -} - -my %license_replace = (); -use File::Basename; - -sub load_license_map() -{ - return if defined $license_replace{"GPL-2.0"}; - my $scriptdir = File::Basename::dirname($0); - open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; - # ignore header - readline(*MAP); - my %spdx; - while () { - chomp; - my ($license, $oldstring) = split(/\t/, $_, 2); - #$license =~ s,\s*$,,; - #$oldstring =~ s,\s*$,,; - next unless length($license); - #print STDERR "$license\t$oldstring\n"; - die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; - $license_replace{$oldstring} = $license; - $spdx{$license} = 1; - } - close(MAP); - for (keys %spdx) { - $license_replace{$_} = $_; - } -} - -sub replace_single_spdx($) -{ - my ($l) = @_; - - return '' if $l eq ''; - - load_license_map(); - $l =~ s,ORlater,or later,g; - $l =~ s,ORsim,or similar,g; - $l =~ s,^\s+,,; - $l =~ s,\s+$,,; - - if (defined $license_replace{$l}) { - $l = $license_replace{$l}; - } else { - print STDERR "Unknown license '$l'\n"; - exit(1); - } - return $l; -} - -sub replace_spdx_and($); -sub replace_spdx_and($) -{ - my ($license) = @_; - - # special case as or later is common in our spec files - $license =~ s,or later,ORlater,g; - $license =~ s,or similar,ORsim,g; - - #print STDERR "ORIG '$license'\n"; - my @licenses = (); - if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { - my ($head, $paren, $tail) = ($1, $2, $3); - if ($paren =~ /and|or/) { - $head = replace_spdx_and($head); - $tail = replace_spdx_and($tail); - $paren = replace_spdx_and($paren); - #print STDERR "AFTE '$head($paren)$tail'\n"; - return "$head($paren)$tail"; - } - } - - for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { - $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; - s/\s+/ /g; - push @licenses, $_; - } - #print STDERR "AFTE '" . join('', @licenses) . "'\n"; - return join('', @licenses); -} - -sub replace_spdx($) -{ - my ($license) = @_; - - my @licenses = (); - for (split(/\s*;\s*/, $license)) { - push @licenses, replace_spdx_and($_); - } - return join(' ; ', @licenses); -} - -sub set_current_pkg { - my ( $arg ) = @_; - print "DEBUG: set_current_pkg receiving $arg\n" if $debug; - my ( @argarray ) = split ( '\s+' , $arg ); - my $curpack = $base_package; - my $curlang = ""; - while (my $carg = shift @argarray) { - next if ($carg eq "%description" || $carg eq "%package" || $carg eq "%prep"); - if ($carg eq "-l") { - $curlang = shift @argarray; - } elsif ($carg eq "-n") { - $curpack = shift @argarray; - } else { - $curpack = "$base_package-" if $base_package; - $curpack .= $carg; - } - } - print "DEBUG: set_current_pkg returning $curpack, $curlang\n" if $debug; - return ($curpack, $curlang); -} - -sub read_and_parse_old_spec { - my ( $specfile, $base_package ) = @_; - my $current_package = $base_package; - my $current_lang = ""; - my $check_printed = "false"; - my $print_comments = "false"; - my %version; - my $ifhandler; - $ifhandler->{"disabled"} = 0; - - my @readspec; - open ( SPEC , "$specfile" ) || die "can't read specfile"; - @readspec = ; - close SPEC; - chomp @readspec; - - while (@readspec) { - $_ = shift @readspec; - - if ( /^\s*$/ && $current_section ne "description") { - # stop preamble parsing on two blank lines - if ($print_comments eq "false" && $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { - $print_comments = "true"; - push @oldspec, "XXXDOUBLELINE"; - next; - } - push @oldspec, "XXXBLANKLINE"; - next; - } - - if ( /^# vim:/ ) { - $vim_modeline = $_; - next; - } - - if ( /^#\s*needsrootforbuild\s*$/ ) { - $needsrootforbuild = 1; - next; - } - if ( /^#\s*needsbinariesforbuild\s*$/ ) { - $needsbinariesforbuild = 1; - next; - } - if ( /^#\s*norootforbuild/ ) { - next; - } - - if ( /^#\s*nodebuginfo\s*$/ ) { - $nodebuginfo = 1; - next; - } - if ( /^#\s*icecream/ ) { - $icecreamforbuild = $_; - $icecreamforbuild =~ s/^#\s*icecream\s*//; - next; - } - if ( /^#\s*Copyright\s*/ ) { - my $lastlineblank = 0; - for (;;) - { - # check if line is ONLY a standard copyright line, if so, ignore. - my $c = $_; - $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; - push(@copyrights, $_) if length $c > 5; - last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ - || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); - $_ = shift @readspec; - } - next; - } - # evil epoch removal - next if ( /^Epoch:/ ); - $_ =~ s/%{?epoch}?[:-]//g; - $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); - - if ( /^BuildRequires:/ ) { - my $cur_buildreq = $_; - $cur_buildreq =~ s/^BuildRequires:\s*//; - my %aa; - while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { - $aa{$1}=1; - } - # ignore line if it looks like a "usedforbuild" line, i.e. - # if it contains too many base packages - next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - for my $br (sort keys(%aa)) { - push @oldspec, "BuildRequires: $br"; - } - next; - } - next if ( /^#\s*usedforbuild/ ); - if ( /^%\?__\*BuildRequires:/ ) { - push @oldspec, $_; - next; - } - if ( /^#!__\*BuildRequires:/ ) { - push @oldspec, $_; - next; - } - if ( /^#!BuildIgnore:/ ) { - push @oldspec, $_; - next; - } - - if ( /^#/ && $current_section ne "description") { - warn "$_ $current_section\n" if $debug; - if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { - push @oldspec, $_; - } - next; - } - - if ( /^%debug_package/ ) { - # remove, we add this ourselves - next; - } - $print_comments = "true" unless /^#/; - - if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { - next; - } - - if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { - change_section("header") if ($current_section eq "description"); - push @oldspec, $_; - if ( /^\s*%if\s/ ) { - my @args = split (/\s+/,$_); - $_ =~ s/[\{\}\"]//g for (@args); - $ifhandler->{"last_if_disabled"} = 0; - $ifhandler->{"last_if_if"} = 1; - $ifhandler->{"depth"}++; - my $if_not = 0; - if ( $args[1] =~ /^\!/ ) { - $args[1] =~ s/^\!//; - $if_not = 1; - } - $args[2] = "" unless $args[2]; - if ( ($args[1] eq "0") - || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) - || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) - || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") - || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { - $ifhandler->{"disabled"} = $ifhandler->{"depth"}; - $ifhandler->{"last_if_disabled"} = 1; - } - } elsif ( /^\s*%if/ ) { - $ifhandler->{"last_if_disabled"} = 0; - $ifhandler->{"last_if_if"} = 0; - $ifhandler->{"depth"}++; - } elsif ( /^\s*%endif/ ) { - $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; - $ifhandler->{"depth"}--; - } elsif ( /^\s*%else/ ) { - if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { - $ifhandler->{"disabled"} = 0; - } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { - $ifhandler->{"disabled"} = 1; - } - } elsif ( /^\s*%define\s/ ) { - my @args = split (/\s+/,$_); - $_ =~ s/[\{\}\"]//g for (@args); - $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); - if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { - $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; - } - while ($_ =~ /\\$/) { - $_ = shift @readspec; - push @oldspec, $_; - } - } - next; - } - if ( /^%package\b/i or /^%prep\b/i ) { - if (/^%package\b/i) { - change_section("header"); - } else { - change_section("prep"); - } - $_ =~ s/^(%\w+)/lc($1)/e; - if ($debug) { - warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); - } - push @oldspec, $_; - for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { - $_ =~ s/\Q$xx\E/$definelist->{$xx}/; - } - $_ =~ s/%{\?[^\}]*}//; - if ($debug) { - warn "after: $_\n"; - } - ($current_package, $current_lang) = set_current_pkg ( $_ ); - if ($ifhandler->{"disabled"}) { - $disabled_packs->{$current_package} = 1; - warn "$current_package is disabled\n" if $debug; - } - next; - } - if ( /^%description\b/i ) { - change_section("description"); - push @oldspec, $_; - next; - } - if ( /^%install\b/i ) { - change_section("install"); - push @oldspec, $_; - next; - } - if ( /^%changelog\b/i ) { - change_section("changelog"); - # changelog comes always from *.changes. Skip what is in spec file - # at the moment. - next; - } - if (/^%files\b/i) { - change_section("files"); - $current_section = "files"; - } - if ( /^%/ ) { - if ( m/$section_tags_re/oi ) { - $_ =~ s/^(%\w+)/lc($1)/e; - change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); - change_section("build") if m/\s*%build/i; - warn "changed to $current_section for $_\n" if $debug; - } - - push @oldspec, "$_"; - next; - } - - if ($current_section eq "header") { - my $c_pack = $current_package; - $c_pack .= "_disabled" if $ifhandler->{"disabled"}; - - if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { - next; - } - # remove default value of Autoreqprov - if ( /^Autoreqprov\s*:\s*(.*)/i ) { - next if ( lc($1) eq "on" || lc($1) eq "yes"); - } - # reset Release - if ( /^Release\s*:\s*(.*)/i ) { - # will be after Version - next; - } - if ( /^Summary\s*:\s*(.*)\s*$/i ) { - push @oldspec, sprintf("%-16s%s", "Summary:", $1); - push @oldspec, "XXXPOSTSUMMARY $current_package"; - next; - } - - # remove license and print out after license later - if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { - my $license = replace_spdx($1); - $main_license = $license if (!$main_license); - $seen_licenses{$current_package} = $license; - next; - } - - # remove groups and print out after summary later - if ( /^Group\s*:\s*(.*)\s*$/i ) { - my $group = $1; - $main_group = $group if (!$main_group); - $seen_groups{$current_package} = $group; - next; - } - - if ( /^BuildArchitectures\s*:/i ) { - $_ =~ s/^[^:]+:/BuildArch:/; - } - - if ( /^BuildRoot\s*:/i ) { - push @oldspec, "BuildRoot: %{_tmppath}/%{name}-%{version}-build"; - next; - } - - if ( m/$global_tags_re\s*(.*)/oi ) { - my ($tag, $value) = ($1, $2); - $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); - push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); - next; - } - if ( /^Version:/ ) { - warn "found Version, section = $current_section\n" if $debug; - $version{$c_pack} = $_; - $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; - push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, sprintf("%-16s%s","Release:", "0"); - next; - } - } - if ( $current_section ne "changelog" ) { - push @oldspec, $_; - next; - } - } - -} - -my $specfile = shift ( @ARGV ); -if ( ! stat($specfile) ) { - die "$specfile is no file"; -} - - -my @specpath = split ('/' ,$specfile); -my $specbase = pop @specpath; -my $specdir = join ('/', @specpath); - -if ( $specdir eq "" ) { - $specdir = "."; -} -my $xdefinelist; -my $seen_name = 0; -open ( SPE , "$specfile" ); -while ( ) { - chomp; - - if ( m/^License\s*:\s*(.*)\s*$/ ) { - printf("%-16s%s\n","License:", replace_spdx($1)); - } else { - print "$_\n"; - } -} - diff --git a/prepare_spec b/prepare_spec deleted file mode 100644 index 3fcb997..0000000 --- a/prepare_spec +++ /dev/null @@ -1,729 +0,0 @@ -#! /usr/bin/perl -w -# -# vim:sw=2:et -# - -BEGIN { - unshift @INC, "."; - unshift @INC, "/usr/lib/build/"; -} - -use Time::localtime; -use Data::Dumper; -use strict; - -my @oldspec = (); -my @newspec = (); -my $base_package = ""; -my $icecreamforbuild = ""; -my @copyrights = (); -my $needsrootforbuild = 0; -my $needsbinariesforbuild = 0; -my $nodebuginfo = 0; -my $vim_modeline; -my $nosrc_result = 0; -my $current_section = "header"; -my $had_debug_package = 0; -my $main_license; -my %seen_licenses = (); -my $main_group; -my %seen_groups = (); -my $build_root = $ENV{'BUILD_ROOT'}; -my $disabled_packs; -my $ifhandler; -my $definelist; -my $debug = 0; - -my @global_tags_list = ( - 'Autoreq', - 'Autoreqprov', - 'BuildArch', - 'BuildArchitectures', - 'BuildRequires', - 'Conflicts', - 'DocDir', - 'Enhances', - 'Enhances', - 'EssentialFor', - 'ExcludeArch', - 'ExclusiveArch', - 'Freshens', - 'Group', - 'Name', - 'NoPatch', - 'NoSource', - 'Obsoletes', - 'Patch\d*', - 'Prefix', - 'PreReq', - 'Provides', - 'Recommends', - 'Requires', - 'Source\d*', - 'Suggests', - 'Summary', - 'Supplements', - 'Url', -); - -my $global_tags_re = '^\s*(' . join("|", @global_tags_list) . ')\s*:'; - -my $section_tags_re ='^\s*%(?:clean|check|prep|build|install|pre|post|preun|postun|posttrans|package|' . - 'description|files|triggerin|triggerun|triggerpostun)\b'; - -sub unify { - my %h = map {$_ => 1} @_; - return grep(delete($h{$_}), @_); -} - -sub capitalize_case($) { - my ($tag) = @_; - - $tag = lc($tag); - - $tag =~ s/docdir/DocDir/i; - $tag =~ s/arch/Arch/i; - $tag =~ s/patch/Patch/i; - $tag =~ s/source/Source/i; - $tag =~ s/req/Req/i; - $tag =~ s/prov/Prov/i; - $tag =~ s/^(\w)/uc($1)/e; - - return $tag; -} - -sub compare_arrays { - my ($first, $second) = @_; - return 0 unless @$first == @$second; - for (my $i = 0; $i < @$first; $i++) { - return 0 if $first->[$i] ne $second->[$i]; - } - return 1; -} - -sub maybe_add_empty_line() { - return if $current_section eq "description"; - - push @oldspec, "XXXBLANKLINE" - if ($oldspec[-1] !~ /^\s*$/ && $oldspec[-1] !~ /^[#%]/); -} - -sub change_section($) { - my ($new_section) = @_; - - maybe_add_empty_line(); - - $current_section = $new_section; - warn "section changed to $current_section\n" if $debug; -} - -my %license_replace = (); -use File::Basename; - -sub load_license_map() { - return if defined $license_replace{"GPL-2.0"}; - my $scriptdir = File::Basename::dirname($0); - open(MAP, "$scriptdir/licenses_changes.txt") || die "can't open licenses_changes.txt"; - # ignore header - readline(*MAP); - my %spdx; - while () { - chomp; - my ($license, $oldstring) = split(/\t/, $_, 2); - #$license =~ s,\s*$,,; - #$oldstring =~ s,\s*$,,; - next unless length($license); - #print STDERR "$license\t$oldstring\n"; - die "$oldstring is given twice in $_" if defined $license_replace{$oldstring}; - $license_replace{$oldstring} = $license; - $spdx{$license} = 1; - } - close(MAP); - for (keys %spdx) { - $license_replace{$_} = $_; - } -} - -sub replace_single_spdx($) { - my ($l) = @_; - - return '' if $l eq ''; - - load_license_map(); - $l =~ s,ORlater,or later,g; - $l =~ s,ORsim,or similar,g; - $l =~ s,^\s+,,; - $l =~ s,\s+$,,; - - if (defined $license_replace{$l}) { - $l = $license_replace{$l}; - } else { - print STDERR "Unknown license '$l'\n"; - } - return $l; -} - -sub replace_spdx_and($); -sub replace_spdx_and($) { - my ($license) = @_; - - # special case as or later is common in our spec files - $license =~ s,or later,ORlater,g; - $license =~ s,or similar,ORsim,g; - - #print STDERR "ORIG '$license'\n"; - my @licenses = (); - if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) { - my ($head, $paren, $tail) = ($1, $2, $3); - if ($paren =~ /and|or/) { - $head = replace_spdx_and($head); - $tail = replace_spdx_and($tail); - $paren = replace_spdx_and($paren); - #print STDERR "AFTE '$head($paren)$tail'\n"; - return "$head($paren)$tail"; - } - } - - for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { - $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; - s/\s+/ /g; - push @licenses, $_; - } - #print STDERR "AFTE '" . join('', @licenses) . "'\n"; - return join('', @licenses); -} - -sub replace_spdx($) { - my ($license) = @_; - - my @licenses = (); - for (split(/\s*;\s*/, $license)) { - push @licenses, replace_spdx_and($_); - } - return join(' and ', @licenses); -} - -sub set_current_pkg { - my ( $arg ) = @_; - print "DEBUG: set_current_pkg receiving $arg\n" if $debug; - my ( @argarray ) = split ( '\s+' , $arg ); - my $curpack = $base_package; - my $curlang = ""; - while (my $carg = shift @argarray) { - next if ($carg eq "%description" || $carg eq "%package" || $carg eq "%prep"); - if ($carg eq "-l") { - $curlang = shift @argarray; - } elsif ($carg eq "-n") { - $curpack = shift @argarray; - } else { - $curpack = "$base_package-" if $base_package; - $curpack .= $carg; - } - } - print "DEBUG: set_current_pkg returning $curpack, $curlang\n" if $debug; - return ($curpack, $curlang); -} - -sub sort_tags_helper { - if (($a =~ /^[^#]*\(/) != ($b =~ /^[^#]*\(/)) { - if ($a =~ /^[^#]*\(/) { - 1; - } else { - -1; - } - } else { - $a cmp $b; - } -} - -sub read_and_parse_old_spec { - my ( $specfile, $base_package ) = @_; - my $current_package = $base_package; - my $current_lang = ""; - my $check_printed = "false"; - my $print_comments = "false"; - my %version; - my $ifhandler; - $ifhandler->{"disabled"} = 0; - - my @readspec; - open ( SPEC , "$specfile" ) || die "can't read specfile"; - @readspec = ; - close SPEC; - chomp @readspec; - - while (@readspec) { - $_ = shift @readspec; - - if ( /^\s*$/ && $current_section ne "description") { - # stop preamble parsing on two blank lines - if ($print_comments eq "false" && - $oldspec[0] && $oldspec[-1] eq "XXXBLANKLINE") { - $print_comments = "true"; - push @oldspec, "XXXDOUBLELINE"; - next; - } - push @oldspec, "XXXBLANKLINE"; - next; - } - - if ( /^# vim:/ && $current_section eq "header" ) { - $vim_modeline = $_; - next; - } - - if ( /^#\s*needsrootforbuild\s*$/ ) { - $needsrootforbuild = 1; - next; - } - if ( /^#\s*needsbinariesforbuild\s*$/ ) { - $needsbinariesforbuild = 1; - next; - } - if ( /^#\s*norootforbuild/ ) { - next; - } - - if ( /^#\s*nodebuginfo\s*$/ ) { - $nodebuginfo = 1; - next; - } - if ( /^#\s*icecream/ ) { - $icecreamforbuild = $_; - $icecreamforbuild =~ s/^#\s*icecream\s*//; - next; - } - if ( /^#\s*Copyright\s*/ ) { - my $lastlineblank = 0; - for (;;) { - # check if line is ONLY a standard copyright line, if so, ignore. - my $c = $_; - $c =~ s{\s*(\d+|copyrights?|\(c\)|suse|linux|products|gmbh|nuremberg|n..?rnberg|germany|\W+)\s*}{}gi; - push(@copyrights, $_) if length $c > 5; - last if length $readspec[0] < 10 || $readspec[0] =~ m{modifications and additions}i || $readspec[0] !~ /^[\#\s]/ - || grep { $readspec[0] =~ /^#\s*$_/ } ("needsrootforbuild","needsbinariesforbuild","nodebuginfo","icecream","usedforbuild","Commandline","MD5SUM","!BuildIgnore"); - $_ = shift @readspec; - } - next; - } - # evil epoch removal - next if ( /^Epoch:/ ); - $_ =~ s/%{?epoch}?[:-]//g; - $_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i ); - - if ( /^BuildRequires:/i || /^Requires:/i || /^Provides:/i || /^Obsoletes:/i ) { - my $cur_tag = $_; - my $tag = ''; - if (m/^(\S+):\s*(.*)$/) { - $tag = $1; - $cur_tag = $2; - } - - my %aa; - if ($cur_tag =~ /%\(/ || $cur_tag =~ /%\{/) { - # do not touch lines with shell execution - $aa{$cur_tag}=1; - } else { - # seperate tags of all other lines - while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) { - $aa{$1}=1; - } - } - # ignore line if it looks like a "usedforbuild" line, i.e. - # if it contains too many base packages - next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2; - for my $value (sort keys(%aa)) { - push (@oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value)); - } - next; - } - next if ( /^#\s*usedforbuild/ ); - if ( /^%\?__\*BuildRequires:/ ) { - push @oldspec, $_; - next; - } - if ( /^#!__\*BuildRequires:/ ) { - push @oldspec, $_; - next; - } - if ( /^#!BuildIgnore:/ ) { - push @oldspec, $_; - next; - } - - if ( /^#/ && $current_section ne "description") { - warn "$_ $current_section\n" if $debug; - if ( $print_comments eq "true" || $readspec[0] =~ /^%define/ || $readspec[0] =~ /^%if/) { - push @oldspec, $_; - } - next; - } - - if ( /^%debug_package/ ) { - # remove, we add this ourselves - next; - } - $print_comments = "true" unless /^#/; - - if ( /^%define\s*vendor\s/ || /^%define\s*distribution\s/ ) { - next; - } - - if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { - change_section("header") if ($current_section eq "description"); - push @oldspec, $_; - if ( /^\s*%if\s/ ) { - my @args = split (/\s+/,$_); - $_ =~ s/[\{\}\"]//g for (@args); - $ifhandler->{"last_if_disabled"} = 0; - $ifhandler->{"last_if_if"} = 1; - $ifhandler->{"depth"}++; - my $if_not = 0; - if ( $args[1] =~ /^\!/ ) { - $args[1] =~ s/^\!//; - $if_not = 1; - } - $args[2] = "" unless $args[2]; - if ( ($args[1] eq "0") - || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) - || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) - || ($args[1] && !$args[3] && !$if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "==" && $args[3] ne "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[2] eq "!=" && $args[3] eq "0" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "0") - || ($args[1] && !$args[3] && $if_not && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") - || ($args[1] && $args[2] eq "!=" && $args[3] eq "1" && $definelist->{$args[1]} && $definelist->{$args[1]} eq "1") ) { - $ifhandler->{"disabled"} = $ifhandler->{"depth"}; - $ifhandler->{"last_if_disabled"} = 1; - } - } elsif ( /^\s*%if/ ) { - $ifhandler->{"last_if_disabled"} = 0; - $ifhandler->{"last_if_if"} = 0; - $ifhandler->{"depth"}++; - } elsif ( /^\s*%endif/ ) { - $ifhandler->{"disabled"} = 0 if $ifhandler->{"disabled"} == $ifhandler->{"depth"}; - $ifhandler->{"depth"}--; - } elsif ( /^\s*%else/ ) { - if ($ifhandler->{"disabled"} == $ifhandler->{"depth"} && $ifhandler->{"last_if_disabled"} == 1) { - $ifhandler->{"disabled"} = 0; - } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { - $ifhandler->{"disabled"} = 1; - } - } elsif ( /^\s*%define\s/ ) { - my @args = split (/\s+/,$_); - $_ =~ s/[\{\}\"]//g for (@args); - $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for sort { length($b) <=> length($a) } keys (%{$definelist}); - if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { - $definelist->{"%".$args[1]} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; - $definelist->{"%{?".$args[1]."}"} = $args[2] if $ifhandler->{"disabled"} == 0; - } - while ($_ =~ /\\$/) { - $_ = shift @readspec; - push @oldspec, $_; - } - } - next; - } - if ( /^%package\b/i or /^%prep\b/i ) { - if (/^%package\b/i) { - change_section("header"); - } else { - change_section("prep"); - } - $_ =~ s/^(%\w+)/lc($1)/e; - if ($debug) { - warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist})); - } - push @oldspec, $_; - for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) { - $_ =~ s/\Q$xx\E/$definelist->{$xx}/; - } - $_ =~ s/%{\?[^\}]*}//; - if ($debug) { - warn "after: $_\n"; - } - ($current_package, $current_lang) = set_current_pkg ( $_ ); - if ($ifhandler->{"disabled"}) { - $disabled_packs->{$current_package} = 1; - warn "$current_package is disabled\n" if $debug; - } - next; - } - if ( /^%description\b/i ) { - change_section("description"); - push @oldspec, $_; - next; - } - if ( /^%install\b/i ) { - change_section("install"); - push @oldspec, $_; - next; - } - if ( /^%changelog\b/i ) { - change_section("changelog"); - # changelog comes always from *.changes. Skip what is in spec file - # at the moment. - next; - } - if (/^%files\b/i) { - change_section("files"); - $current_section = "files"; - } - if ( /^%/ ) { - if ( m/$section_tags_re/oi ) { - $_ =~ s/^(%\w+)/lc($1)/e; - change_section("header") if (! m/\s*%files/i && !m/\s*%build/i); - change_section("build") if m/\s*%build/i; - warn "changed to $current_section for $_\n" if $debug; - } - - push @oldspec, "$_"; - next; - } - - if ($current_section eq "header") { - my $c_pack = $current_package; - $c_pack .= "_disabled" if $ifhandler->{"disabled"}; - - if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { - next; - } - # remove default value of Autoreqprov - if ( /^Autoreqprov\s*:\s*(.*)/i ) { - next if ( lc($1) eq "on" || lc($1) eq "yes"); - } - # reset Release - if ( /^Release\s*:\s*(.*)/i ) { - if ($1 !~ m/^[0-9]*$/ && $oldspec[-1] eq "XXXRELEASE") { - pop @oldspec; - push @oldspec, sprintf("%-16s%s","Release:", $1); - } - # will be after Version - next; - } - if ( /^Summary\s*:\s*(.*)\s*$/i ) { - push @oldspec, sprintf("%-16s%s", "Summary:", $1); - push @oldspec, "XXXPOSTSUMMARY $current_package"; - next; - } - - # remove license and print out after license later - if ( /^License\s*:\s*(.*)\s*$/i || /^Copyright\s*:\s*(.*)\s*$/i ) { - my $license = replace_spdx($1); - $main_license = $license if (!$main_license); - $seen_licenses{$current_package} = $license; - next; - } - - # remove groups and print out after summary later - if ( /^Group\s*:\s*(.*)\s*$/i ) { - my $group = $1; - $main_group = $group if (!$main_group); - $seen_groups{$current_package} = $group; - next; - } - - if ( /^BuildArchitectures\s*:/i ) { - $_ =~ s/^[^:]+:/BuildArch:/; - } - - if ( /^BuildRoot\s*:/i ) { - push @oldspec, sprintf("%-16s%s", "BuildRoot:", "%{_tmppath}/%{name}-%{version}-build"); - next; - } - - if ( m/$global_tags_re\s*(.*)/oi ) { - my ($tag, $value) = ($1, $2); - $nosrc_result = 1 if ($tag =~ /(?:nosource|nopatch)/i); - push @oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value); - next; - } - if ( /^Version:/ ) { - warn "found Version, section = $current_section\n" if $debug; - $version{$c_pack} = $_; - $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; - push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack}); - push @oldspec, "XXXRELEASE"; - next; - } - } - if ( $current_section ne "changelog" ) { - push @oldspec, $_; - next; - } - } - -} - -if ($ARGV[0] eq '--debug') { - $debug = 1; - shift @ARGV; -} - -my $specfile = shift ( @ARGV ); -if ( ! stat($specfile) ) { - die "$specfile is no file"; -} - - -my @specpath = split ('/' ,$specfile); -my $specbase = pop @specpath; -my $specdir = join ('/', @specpath); - -if ( $specdir eq "" ) { - $specdir = "."; -} - -my $xdefinelist; -my $seen_name = 0; -open ( SPE , "$specfile" ); -while ( ) { - chomp(); - if ( /^%define/ ) { - my @args = split (/\s+/,$_); - $_ =~ s/[\{\}\"]//g for (@args); - $args[2] =~ s/\Q$_\E/$xdefinelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$xdefinelist})); - if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) { - $xdefinelist->{"%".$args[1]} = $args[2]; - $xdefinelist->{"%{".$args[1]."}"} = $args[2]; - } - } - if ( /^\s*Name:/ ) { - next if $seen_name; - $seen_name = 1; - $base_package = $_; - $base_package =~ s/^\s*Name:\s*(\S*)\s*/$1/; - $base_package =~ s/\Q$_\E/$xdefinelist->{$_}/ for (sort { length($b) <=> length($a) } keys (%{$xdefinelist})); - if ($debug) { - warn "DEBUG: base_package = $base_package\n"; - warn Dumper($xdefinelist); - } - last; - } -} -close ( SPE ); - -warn ("base_package is $base_package\n") if $debug; - -if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { - $base_package =~ s/[0-9]$//; -} - -if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { - $base_package =~ s/\-[^\-]*$//; -} - -warn ("base_package is $base_package\n") if $debug; - -if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) { - $base_package = $specbase; - $base_package =~ s/\.spec$//; - $base_package =~ s/\-.*$//; -} - -read_and_parse_old_spec ( $specfile, $base_package ); - -for my $tag (qw(BuildRequires Requires Provides Obsoletes)) { - my $linesmoved = 1; - sortcycle: while ($linesmoved) { - $linesmoved = 0; - my @firstlines = (); - my @tags = (); - while (defined $oldspec[0]) { - my $l = shift @oldspec; - if ($l =~ m/^$tag:/i ) { - push(@tags, $l); - } else { - # if there are already tags, we need to sort and exit - if (@tags > 0) { - my @sortedtags = sort sort_tags_helper @tags; - $linesmoved = !compare_arrays(\@tags, \@sortedtags); - if ($linesmoved) { - @oldspec = (@firstlines, @sortedtags, $l, @oldspec); - @firstlines = (); - @tags = (); - next sortcycle; - } else { - @firstlines = (@firstlines, @tags, $l); - @tags = (); - next; - } - } else { - push(@firstlines, $l); - } - } - } - @oldspec = (@firstlines, @oldspec); - } -} - - -my $thisyear = localtime->year() + 1900; - -unshift @copyrights, "# Copyright (c) $thisyear SUSE LINUX Products GmbH, Nuernberg, Germany."; - -my $copy_list = join("\n", @copyrights); - -print $vim_modeline . "\n" if (defined $vim_modeline); -print < Date: Mon, 27 Oct 2014 13:44:42 +0000 Subject: [PATCH 105/151] Accepting request 258502 from home:roman-neuhauser:branches:openSUSE:Tools build for ArchLinux OBS-URL: https://build.opensuse.org/request/show/258502 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=148 --- PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..6711d75 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=obs-service-format_spec_file +pkgver=20140825 +pkgrel=1 +pkgdesc="An OBS source service: reformats a spec file to SUSE standard" +arch=(any) +license=(GPL-2.0) +url=https://github.com/openSUSE/$pkgname +source=($url/$pkgname-$pkgver.tar.bz2) +sha256sums=('53c6a961a2755fe89502328b30e26f623354ff43c163948d6b88df55351d3004') +depends=(obs-service-source_validator) + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p $pkgdir/usr/lib/obs/service/format_spec_file.files + install -m 0755 format_spec_file $pkgdir/usr/lib/obs/service + install -m 0644 format_spec_file.service $pkgdir/usr/lib/obs/service + install -m 0755 prepare_spec patch_license $pkgdir/usr/lib/obs/service/format_spec_file.files + install -m 0644 licenses_changes.txt $pkgdir/usr/lib/obs/service/format_spec_file.files +} -- 2.51.1 From df1c9f7295683047f73935dedc2a71f90caefb2bf8702f2fd72751f64a4b8da5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 30 Oct 2014 07:08:10 +0000 Subject: [PATCH 106/151] - one more license from ciaran OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=149 --- obs-service-format_spec_file-20140825.tar.bz2 | 3 --- obs-service-format_spec_file-20141029.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 obs-service-format_spec_file-20140825.tar.bz2 create mode 100644 obs-service-format_spec_file-20141029.tar.bz2 diff --git a/obs-service-format_spec_file-20140825.tar.bz2 b/obs-service-format_spec_file-20140825.tar.bz2 deleted file mode 100644 index 5f80bb7..0000000 --- a/obs-service-format_spec_file-20140825.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53c6a961a2755fe89502328b30e26f623354ff43c163948d6b88df55351d3004 -size 26673 diff --git a/obs-service-format_spec_file-20141029.tar.bz2 b/obs-service-format_spec_file-20141029.tar.bz2 new file mode 100644 index 0000000..c0e01a3 --- /dev/null +++ b/obs-service-format_spec_file-20141029.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:897ad03640aaf876494a421b0639c10031c4105b7df3ec5d62d077ee3ee1a816 +size 26392 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 88eb199..d36c7ca 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 30 07:07:40 UTC 2014 - coolo@suse.com + +- one more license from ciaran + ------------------------------------------------------------------- Mon Aug 25 05:13:17 UTC 2014 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index c44270f..42d78c5 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20140825 +Version: 20141029 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From c6501405888788b032f81a52f4da54d45498c53fb525a0d4cc149865f501fc6c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 3 Nov 2014 09:47:26 +0000 Subject: [PATCH 107/151] - remove PKGBUILD as it makes factory submissions impossible OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=150 --- PKGBUILD | 19 ------------------- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD deleted file mode 100644 index 6711d75..0000000 --- a/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=obs-service-format_spec_file -pkgver=20140825 -pkgrel=1 -pkgdesc="An OBS source service: reformats a spec file to SUSE standard" -arch=(any) -license=(GPL-2.0) -url=https://github.com/openSUSE/$pkgname -source=($url/$pkgname-$pkgver.tar.bz2) -sha256sums=('53c6a961a2755fe89502328b30e26f623354ff43c163948d6b88df55351d3004') -depends=(obs-service-source_validator) - -package() { - cd "$srcdir/$pkgname-$pkgver" - mkdir -p $pkgdir/usr/lib/obs/service/format_spec_file.files - install -m 0755 format_spec_file $pkgdir/usr/lib/obs/service - install -m 0644 format_spec_file.service $pkgdir/usr/lib/obs/service - install -m 0755 prepare_spec patch_license $pkgdir/usr/lib/obs/service/format_spec_file.files - install -m 0644 licenses_changes.txt $pkgdir/usr/lib/obs/service/format_spec_file.files -} diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index d36c7ca..c62cfbd 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 3 09:47:09 UTC 2014 - coolo@suse.com + +- remove PKGBUILD as it makes factory submissions impossible + ------------------------------------------------------------------- Thu Oct 30 07:07:40 UTC 2014 - coolo@suse.com -- 2.51.1 From 7a96dc47b89fbf87662d36948739e7dfb3ea9a9373f6e0b0c9a461b3d011294f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Jan 2015 10:24:57 +0000 Subject: [PATCH 108/151] - change company name OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=152 --- obs-service-format_spec_file-20141029.tar.bz2 | 3 --- obs-service-format_spec_file-20150121.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20141029.tar.bz2 create mode 100644 obs-service-format_spec_file-20150121.tar.bz2 diff --git a/obs-service-format_spec_file-20141029.tar.bz2 b/obs-service-format_spec_file-20141029.tar.bz2 deleted file mode 100644 index c0e01a3..0000000 --- a/obs-service-format_spec_file-20141029.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:897ad03640aaf876494a421b0639c10031c4105b7df3ec5d62d077ee3ee1a816 -size 26392 diff --git a/obs-service-format_spec_file-20150121.tar.bz2 b/obs-service-format_spec_file-20150121.tar.bz2 new file mode 100644 index 0000000..69f7582 --- /dev/null +++ b/obs-service-format_spec_file-20150121.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d70d9822aeb9db07e96895db3cadb7a44c073beacc1315fc8aa57b6a18acb2e +size 26377 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c62cfbd..2932362 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 21 10:19:17 UTC 2015 - coolo@suse.com + +- change company name + ------------------------------------------------------------------- Mon Nov 3 09:47:09 UTC 2014 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 42d78c5..58d184c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20141029 +Version: 20150121 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From 4f42001b20d33011fedad2ad55eb7fa9b18afea2747e9505f897990ea10fec10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 22 Jun 2015 11:14:02 +0000 Subject: [PATCH 109/151] debian fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=154 --- obs-service-format_spec_file-20150121.tar.bz2 | 3 --- obs-service-format_spec_file-20150622.tar.bz2 | 3 +++ obs-service-format_spec_file.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 obs-service-format_spec_file-20150121.tar.bz2 create mode 100644 obs-service-format_spec_file-20150622.tar.bz2 diff --git a/obs-service-format_spec_file-20150121.tar.bz2 b/obs-service-format_spec_file-20150121.tar.bz2 deleted file mode 100644 index 69f7582..0000000 --- a/obs-service-format_spec_file-20150121.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d70d9822aeb9db07e96895db3cadb7a44c073beacc1315fc8aa57b6a18acb2e -size 26377 diff --git a/obs-service-format_spec_file-20150622.tar.bz2 b/obs-service-format_spec_file-20150622.tar.bz2 new file mode 100644 index 0000000..14cba1e --- /dev/null +++ b/obs-service-format_spec_file-20150622.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1b323c5f2d5bfffe58a61ba10d2c64778fb0dc4aa5a8ee33f013438608ea3f +size 27367 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 58d184c..963f7b9 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150121 +Version: 20150622 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From cee7fe5eb07075d55d820b81f20fe902afeb40e3a44b688eaf774109262e5582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 22 Jun 2015 11:30:37 +0000 Subject: [PATCH 110/151] add debian dsc file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=155 --- debian.dsc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian.dsc diff --git a/debian.dsc b/debian.dsc new file mode 100644 index 0000000..17b9052 --- /dev/null +++ b/debian.dsc @@ -0,0 +1,8 @@ +Format: 1.0 +Source: obs-service-format_spec_file +Version: 20150622 +Binary: obs-service-format_spec_file +Maintainer: Adrian Schroeter +Architecture: all +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7) -- 2.51.1 From 73d447df9559f3efaec9ed8f08130b547ba04446c9ede79be3423ad01529cfef Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 23 Jun 2015 14:17:58 +0000 Subject: [PATCH 111/151] Accepting request 313290 from home:hiberis:branches:openSUSE:Tools OBS-URL: https://build.opensuse.org/request/show/313290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=156 --- debian.dsc | 6 +++--- obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 6 +----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian.dsc b/debian.dsc index 17b9052..fb973cb 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,8 +1,8 @@ Format: 1.0 -Source: obs-service-format_spec_file +Source: obs-service-format-spec-file Version: 20150622 -Binary: obs-service-format_spec_file +Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all -Standards-Version: 3.7.2 +Standards-Version: 3.9.6 Build-Depends: debhelper (>= 7) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2932362..522ff0d 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 23 14:09:06 UTC 2015 - hib@hiberis.nl + +- Fix build for Debian 7.0/8.0 +- Use install target from Makefile + ------------------------------------------------------------------- Wed Jan 21 10:19:17 UTC 2015 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 963f7b9..3bb4cac 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -45,11 +45,7 @@ spec file instead of creating a new one. %build %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0755 format_spec_file $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0644 format_spec_file.service $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 prepare_spec patch_license $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0644 licenses_changes.txt $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +%makeinstall %check perl prepare_spec %_topdir/SOURCES/%name.spec -- 2.51.1 From f8bb81e91d9010d41530043aaa8d17e963356ca93628c483daed399b5e5e87c6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Jul 2015 17:42:28 +0000 Subject: [PATCH 112/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=157 --- debian.dsc | 2 +- obs-service-format_spec_file-20150622.tar.bz2 | 3 --- obs-service-format_spec_file-20150716.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20150622.tar.bz2 create mode 100644 obs-service-format_spec_file-20150716.tar.bz2 diff --git a/debian.dsc b/debian.dsc index fb973cb..446375d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20150622 +Version: 20150716 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20150622.tar.bz2 b/obs-service-format_spec_file-20150622.tar.bz2 deleted file mode 100644 index 14cba1e..0000000 --- a/obs-service-format_spec_file-20150622.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1b323c5f2d5bfffe58a61ba10d2c64778fb0dc4aa5a8ee33f013438608ea3f -size 27367 diff --git a/obs-service-format_spec_file-20150716.tar.bz2 b/obs-service-format_spec_file-20150716.tar.bz2 new file mode 100644 index 0000000..9755100 --- /dev/null +++ b/obs-service-format_spec_file-20150716.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a28558fb55026de55a1e60d7f1a04e8f79aa60163f8bba002def0cb62c63da61 +size 27608 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 522ff0d..f509e1b 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 16 17:42:20 UTC 2015 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Tue Jun 23 14:09:06 UTC 2015 - hib@hiberis.nl diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 3bb4cac..f5a559c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150622 +Version: 20150716 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From bbb842f2967ce2903763566bcb0fddc27536ccb38ae0107594864e6100dd7a2a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Jul 2015 17:45:33 +0000 Subject: [PATCH 113/151] - add readd-exceptions.patch to readd licenses we use OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=158 --- obs-service-format_spec_file.changes | 1 + obs-service-format_spec_file.spec | 2 ++ readd-exceptions.patch | 34 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 readd-exceptions.patch diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index f509e1b..2656078 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -2,6 +2,7 @@ Thu Jul 16 17:42:20 UTC 2015 - coolo@suse.com - update licenses +- add readd-exceptions.patch to readd licenses we use ------------------------------------------------------------------- Tue Jun 23 14:09:06 UTC 2015 - hib@hiberis.nl diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index f5a559c..29ab6c4 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -25,6 +25,7 @@ Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr Source: %{name}-%{version}.tar.bz2 +Patch0: readd-exceptions.patch Requires: obs-service-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -41,6 +42,7 @@ spec file instead of creating a new one. %prep %setup +%patch0 -p1 %build diff --git a/readd-exceptions.patch b/readd-exceptions.patch new file mode 100644 index 0000000..08109d6 --- /dev/null +++ b/readd-exceptions.patch @@ -0,0 +1,34 @@ +diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-service-format_spec_file-20150716/licenses_changes.txt +--- obs-service-format_spec_file-20150716.orig/licenses_changes.txt 2015-07-16 19:41:55.000000000 +0200 ++++ obs-service-format_spec_file-20150716/licenses_changes.txt 2015-07-16 19:44:25.354282059 +0200 +@@ -370,6 +370,17 @@ + GPL-2.0+ GPLv2 or later + GPL-2.0+ GPLv2+ + GPL-2.0+ libGeoIPUpdate is GPLv2 or later ++GPL-2.0++ GPL-2.0++ ++GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception ++GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ ++GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception ++GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ ++GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception ++GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ ++GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception ++GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ ++GPL-2.0-with-font-exception GPL-2.0-with-font-exception ++GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ + GPL-3.0 GNU GPL version 3 + GPL-3.0 GNU General Public License version 3 (GPLv3) + GPL-3.0 GPL 3 +@@ -384,6 +395,11 @@ + GPL-3.0+ GPL-3+ + GPL-3.0+ GPL-3.0+ + GPL-3.0+ GPLv3+ ++GPL-3.0++ GPL-3.0++ ++GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception ++GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ ++GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception ++GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ + Giftware Giftware + Giftware+ Giftware+ + Glide Glide +Only in obs-service-format_spec_file-20150716: licenses_changes.txt.orig -- 2.51.1 From e111236205ea8fea8c27babe29160ffd8d293c30f37e059c9c98d3f1e6081c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jul 2015 05:37:38 +0000 Subject: [PATCH 114/151] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=160 --- debian.dsc | 2 +- obs-service-format_spec_file-20150716.tar.bz2 | 3 --- obs-service-format_spec_file-20150724.tar.bz2 | 3 +++ obs-service-format_spec_file.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20150716.tar.bz2 create mode 100644 obs-service-format_spec_file-20150724.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 446375d..740501c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20150716 +Version: 20150724 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20150716.tar.bz2 b/obs-service-format_spec_file-20150716.tar.bz2 deleted file mode 100644 index 9755100..0000000 --- a/obs-service-format_spec_file-20150716.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a28558fb55026de55a1e60d7f1a04e8f79aa60163f8bba002def0cb62c63da61 -size 27608 diff --git a/obs-service-format_spec_file-20150724.tar.bz2 b/obs-service-format_spec_file-20150724.tar.bz2 new file mode 100644 index 0000000..2c3b56b --- /dev/null +++ b/obs-service-format_spec_file-20150724.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a1084d11873842ad5c02eef33f54740c4ea9e1b1e260fb8959fcc9e48154d28 +size 27584 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 29ab6c4..9a24348 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150716 +Version: 20150724 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From 4218b33f029001e80d9461433c7305b4830e89bcbb741ec5421ac44bbd636971 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 4 Sep 2015 07:57:56 +0000 Subject: [PATCH 115/151] - update licenses - silence warnings in perl 5.22 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=161 --- debian.dsc | 2 +- obs-service-format_spec_file-20150724.tar.bz2 | 3 --- obs-service-format_spec_file-20150904.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20150724.tar.bz2 create mode 100644 obs-service-format_spec_file-20150904.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 740501c..9d76406 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20150724 +Version: 20150904 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20150724.tar.bz2 b/obs-service-format_spec_file-20150724.tar.bz2 deleted file mode 100644 index 2c3b56b..0000000 --- a/obs-service-format_spec_file-20150724.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a1084d11873842ad5c02eef33f54740c4ea9e1b1e260fb8959fcc9e48154d28 -size 27584 diff --git a/obs-service-format_spec_file-20150904.tar.bz2 b/obs-service-format_spec_file-20150904.tar.bz2 new file mode 100644 index 0000000..8e85223 --- /dev/null +++ b/obs-service-format_spec_file-20150904.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3999d116bab5d5f542b91b0ac827aae522f0be8e18fa334190cddda16f459739 +size 27633 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2656078..0dc2901 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 4 07:57:44 UTC 2015 - coolo@suse.com + +- update licenses +- silence warnings in perl 5.22 + ------------------------------------------------------------------- Thu Jul 16 17:42:20 UTC 2015 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 9a24348..fccf227 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150724 +Version: 20150904 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From b202ac8243a73b54c3eb6000e5815f253e05053cc1a6ab53deb7f8f5b058687d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 2 Feb 2016 10:27:40 +0000 Subject: [PATCH 116/151] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=163 --- debian.dsc | 2 +- obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian.dsc b/debian.dsc index 9d76406..06be391 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20150904 +Version: 20160202 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0dc2901..d5cbe17 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 2 10:22:02 UTC 2016 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- Fri Sep 4 07:57:44 UTC 2015 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index fccf227..d3dc04f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150904 +Version: 20160202 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From 2257dfa497163261440207594b553b71c6dca3984b5b906738110c91f9aedd77 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 2 Feb 2016 10:33:42 +0000 Subject: [PATCH 117/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=164 --- obs-service-format_spec_file-20150904.tar.bz2 | 3 --- obs-service-format_spec_file-20160202.tar.bz2 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-format_spec_file-20150904.tar.bz2 create mode 100644 obs-service-format_spec_file-20160202.tar.bz2 diff --git a/obs-service-format_spec_file-20150904.tar.bz2 b/obs-service-format_spec_file-20150904.tar.bz2 deleted file mode 100644 index 8e85223..0000000 --- a/obs-service-format_spec_file-20150904.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3999d116bab5d5f542b91b0ac827aae522f0be8e18fa334190cddda16f459739 -size 27633 diff --git a/obs-service-format_spec_file-20160202.tar.bz2 b/obs-service-format_spec_file-20160202.tar.bz2 new file mode 100644 index 0000000..9154e60 --- /dev/null +++ b/obs-service-format_spec_file-20160202.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbce4a3fea6b7fcaa91cf20dffce019fa5a3467e6443102f10461e165e553af2 +size 27865 -- 2.51.1 From 563f19b2d35691fe9c217eba2b9a432628f81cc79f9c4db63867502215912528 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 16 Mar 2016 09:42:57 +0000 Subject: [PATCH 118/151] merged update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=166 --- obs-service-format_spec_file-20160202.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/obs-service-format_spec_file-20160202.tar.bz2 b/obs-service-format_spec_file-20160202.tar.bz2 index 9154e60..f539835 100644 --- a/obs-service-format_spec_file-20160202.tar.bz2 +++ b/obs-service-format_spec_file-20160202.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbce4a3fea6b7fcaa91cf20dffce019fa5a3467e6443102f10461e165e553af2 -size 27865 +oid sha256:5b6c7f1e86e8e210fbfd9fd028ce7d75b7cae12efa404922942da833f9a94cf4 +size 27848 -- 2.51.1 From 689065633904347ea00bc8d50c5e82bc53cd6f58ab239c0ff795defcd9a3eb12 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 16 Mar 2016 09:50:27 +0000 Subject: [PATCH 119/151] filter for directories OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=167 --- debian.dsc | 2 +- obs-service-format_spec_file-20160202.tar.bz2 | 3 --- obs-service-format_spec_file-20160316.tar.bz2 | 3 +++ obs-service-format_spec_file.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20160202.tar.bz2 create mode 100644 obs-service-format_spec_file-20160316.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 06be391..c6f4762 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20160202 +Version: 20160316 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20160202.tar.bz2 b/obs-service-format_spec_file-20160202.tar.bz2 deleted file mode 100644 index f539835..0000000 --- a/obs-service-format_spec_file-20160202.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b6c7f1e86e8e210fbfd9fd028ce7d75b7cae12efa404922942da833f9a94cf4 -size 27848 diff --git a/obs-service-format_spec_file-20160316.tar.bz2 b/obs-service-format_spec_file-20160316.tar.bz2 new file mode 100644 index 0000000..8b94bec --- /dev/null +++ b/obs-service-format_spec_file-20160316.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c236700bb18ff0495a93acc6f008339e3a1b1e98362151b6327328accc776b39 +size 27906 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index d3dc04f..d75c8b6 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20160202 +Version: 20160316 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From 253659ed028b2056d5f09b2687fcd8de9744f19b6a18bde785a738b80e8e8ee2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 31 Aug 2016 09:14:56 +0000 Subject: [PATCH 120/151] Accepting request 421723 from home:susnux:branches:openSUSE:Tools Added missing licenses OBS-URL: https://build.opensuse.org/request/show/421723 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=168 --- debian.dsc | 2 +- obs-service-format_spec_file-20160316.tar.bz2 | 3 --- obs-service-format_spec_file-20160406.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 7 +++++++ obs-service-format_spec_file.spec | 10 +++++----- 5 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20160316.tar.bz2 create mode 100644 obs-service-format_spec_file-20160406.tar.bz2 diff --git a/debian.dsc b/debian.dsc index c6f4762..9bf59e9 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20160316 +Version: 20160406 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20160316.tar.bz2 b/obs-service-format_spec_file-20160316.tar.bz2 deleted file mode 100644 index 8b94bec..0000000 --- a/obs-service-format_spec_file-20160316.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c236700bb18ff0495a93acc6f008339e3a1b1e98362151b6327328accc776b39 -size 27906 diff --git a/obs-service-format_spec_file-20160406.tar.bz2 b/obs-service-format_spec_file-20160406.tar.bz2 new file mode 100644 index 0000000..58936a7 --- /dev/null +++ b/obs-service-format_spec_file-20160406.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89b7e812e3ae607137c9e38da660e12280aa310485ffc04f7c8fe5565a236386 +size 28505 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index d5cbe17..6ece9a8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 24 12:21:29 UTC 2016 - rpm@fthiessen.de + +- Update to 20160406 + * Update licenses + * Fetch SPDX license exceptions (bsc#973404) + ------------------------------------------------------------------- Tue Feb 2 10:22:02 UTC 2016 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index d75c8b6..a4dbd4e 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,11 +17,11 @@ Name: obs-service-format_spec_file +Version: 20160406 +Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20160316 -Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr Source: %{name}-%{version}.tar.bz2 @@ -41,7 +41,7 @@ spec file instead of creating a new one. %prep -%setup +%setup %patch0 -p1 %build @@ -55,7 +55,7 @@ perl prepare_spec %_topdir/SOURCES/%name.spec %files %defattr(-,root,root) %doc COPYING -%dir /usr/lib/obs -/usr/lib/obs/service +%dir %{_prefix}/lib/obs +%{_prefix}/lib/obs/service %changelog -- 2.51.1 From 9ffe0000dd46c83d59bea667f957d5d9098f9a4eedf735de7f411168b8cef6bb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 31 Aug 2016 09:18:01 +0000 Subject: [PATCH 121/151] fix URL OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=169 --- _service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_service b/_service index cfcb48e..60b125a 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - git@github.com:openSUSE/obs-service-format_spec_file.git + https://github.com/openSUSE/obs-service-format_spec_file.git git .git git-master -- 2.51.1 From 75e8f1e8cd9f1bbf9b8d2389785c50c8ae80b5efd32e876638de85e1f453a9ca Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 29 Sep 2016 09:37:42 +0000 Subject: [PATCH 122/151] - Handle needssslcertforbuild directive - Handle empty output directory - Improve the license and group comments handling OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=171 --- obs-service-format_spec_file-20160406.tar.bz2 | 3 --- obs-service-format_spec_file-20160929.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 7 +++++++ obs-service-format_spec_file.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 obs-service-format_spec_file-20160406.tar.bz2 create mode 100644 obs-service-format_spec_file-20160929.tar.bz2 diff --git a/obs-service-format_spec_file-20160406.tar.bz2 b/obs-service-format_spec_file-20160406.tar.bz2 deleted file mode 100644 index 58936a7..0000000 --- a/obs-service-format_spec_file-20160406.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89b7e812e3ae607137c9e38da660e12280aa310485ffc04f7c8fe5565a236386 -size 28505 diff --git a/obs-service-format_spec_file-20160929.tar.bz2 b/obs-service-format_spec_file-20160929.tar.bz2 new file mode 100644 index 0000000..99bd5cb --- /dev/null +++ b/obs-service-format_spec_file-20160929.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66a36e36c590cabdb2a6394d5f5820e9a74b957d4192f0a0e12d5fac547ff7bc +size 28607 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6ece9a8..0f193f8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 29 11:35:08 CEST 2016 - ro@suse.de + +- Handle needssslcertforbuild directive +- Handle empty output directory +- Improve the license and group comments handling + ------------------------------------------------------------------- Wed Aug 24 12:21:29 UTC 2016 - rpm@fthiessen.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index a4dbd4e..7330bf1 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20160406 +Version: 20160929 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 -- 2.51.1 From c7fa9ca60978040bec3e0a4e15267caff3364d6c5e9749cbb259eedcec95afb6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 4 Feb 2017 06:52:40 +0000 Subject: [PATCH 123/151] - update licenes (from git) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=173 --- debian.dsc | 2 +- obs-service-format_spec_file-20160929.tar.bz2 | 3 --- obs-service-format_spec_file-20170204.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 obs-service-format_spec_file-20160929.tar.bz2 create mode 100644 obs-service-format_spec_file-20170204.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 9bf59e9..636ea75 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20160406 +Version: 20170204 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20160929.tar.bz2 b/obs-service-format_spec_file-20160929.tar.bz2 deleted file mode 100644 index 99bd5cb..0000000 --- a/obs-service-format_spec_file-20160929.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66a36e36c590cabdb2a6394d5f5820e9a74b957d4192f0a0e12d5fac547ff7bc -size 28607 diff --git a/obs-service-format_spec_file-20170204.tar.bz2 b/obs-service-format_spec_file-20170204.tar.bz2 new file mode 100644 index 0000000..7faedb9 --- /dev/null +++ b/obs-service-format_spec_file-20170204.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8c3113b8938636d5eb977bf17f1488163f3ead47a2af1f34cad9ecfe52f0fff +size 28896 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0f193f8..77c81f0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 4 06:52:23 UTC 2017 - coolo@suse.com + +- update licenes (from git) + ------------------------------------------------------------------- Thu Sep 29 11:35:08 CEST 2016 - ro@suse.de diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 7330bf1..edd8102 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20160929 +Version: 20170204 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 -- 2.51.1 From 757c507a5921f2bf790767694d10d2cd9d8f9a49ae8b0f098e261b7f5b272c97 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Nov 2017 05:59:49 +0000 Subject: [PATCH 124/151] Accepting request 540225 from home:dimstar:branches:openSUSE:Tools - Update to version 20171107: + Update licenses. + SPDX conjunction / disjunction operators are capitalized. - Rebase readd-exceptions.patch. OBS-URL: https://build.opensuse.org/request/show/540225 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=175 --- debian.dsc | 2 +- obs-service-format_spec_file-20170204.tar.bz2 | 3 --- obs-service-format_spec_file-20171107.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.spec | 2 +- readd-exceptions.patch | 14 +++++++------- 6 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 obs-service-format_spec_file-20170204.tar.bz2 create mode 100644 obs-service-format_spec_file-20171107.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 636ea75..1d79529 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20170204 +Version: 20171107 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20170204.tar.bz2 b/obs-service-format_spec_file-20170204.tar.bz2 deleted file mode 100644 index 7faedb9..0000000 --- a/obs-service-format_spec_file-20170204.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8c3113b8938636d5eb977bf17f1488163f3ead47a2af1f34cad9ecfe52f0fff -size 28896 diff --git a/obs-service-format_spec_file-20171107.tar.bz2 b/obs-service-format_spec_file-20171107.tar.bz2 new file mode 100644 index 0000000..7501109 --- /dev/null +++ b/obs-service-format_spec_file-20171107.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f876f3928881a407878fa53a94dbb29b837b2d0347863bd49d2d3303e02490c +size 29015 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 77c81f0..1bc24a8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org + +- Update to version 20171107: + + Update licenses. + + SPDX conjunction / disjunction operators are capitalized. +- Rebase readd-exceptions.patch. + ------------------------------------------------------------------- Sat Feb 4 06:52:23 UTC 2017 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index edd8102..5fe418b 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20170204 +Version: 20171107 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 diff --git a/readd-exceptions.patch b/readd-exceptions.patch index 08109d6..17a00b0 100644 --- a/readd-exceptions.patch +++ b/readd-exceptions.patch @@ -1,7 +1,8 @@ -diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-service-format_spec_file-20150716/licenses_changes.txt ---- obs-service-format_spec_file-20150716.orig/licenses_changes.txt 2015-07-16 19:41:55.000000000 +0200 -+++ obs-service-format_spec_file-20150716/licenses_changes.txt 2015-07-16 19:44:25.354282059 +0200 -@@ -370,6 +370,17 @@ +Index: obs-service-format_spec_file-20171107/licenses_changes.txt +=================================================================== +--- obs-service-format_spec_file-20171107.orig/licenses_changes.txt ++++ obs-service-format_spec_file-20171107/licenses_changes.txt +@@ -387,6 +387,17 @@ GPL-2.0+ GPL2+ GPL-2.0+ GPLv2 or later GPL-2.0+ GPLv2+ GPL-2.0+ libGeoIPUpdate is GPLv2 or later @@ -19,7 +20,7 @@ diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-ser GPL-3.0 GNU GPL version 3 GPL-3.0 GNU General Public License version 3 (GPLv3) GPL-3.0 GPL 3 -@@ -384,6 +395,11 @@ +@@ -401,6 +412,11 @@ GPL-3.0+ GPL v3 or later GPL-3.0+ GPL-3+ GPL-3.0+ GPL-3.0+ GPL-3.0+ GPLv3+ @@ -28,7 +29,6 @@ diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-ser +GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ +GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception +GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ + GPL-3.0-with-Qt-Company-Qt-exception-1.1 GPL-3.0-with-Qt-Company-Qt-exception-1.1 Giftware Giftware Giftware+ Giftware+ - Glide Glide -Only in obs-service-format_spec_file-20150716: licenses_changes.txt.orig -- 2.51.1 From 93adf43eee1691d62bcd34cce070b29539480ef03f12e71969c961783cde59ac Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Feb 2018 17:32:09 +0000 Subject: [PATCH 125/151] - adapt package list for SPDX 3.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=177 --- debian.dsc | 2 +- obs-service-format_spec_file-20171107.tar.bz2 | 3 --- obs-service-format_spec_file-20180214.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 obs-service-format_spec_file-20171107.tar.bz2 create mode 100644 obs-service-format_spec_file-20180214.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 1d79529..384142a 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20171107 +Version: 20180214 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20171107.tar.bz2 b/obs-service-format_spec_file-20171107.tar.bz2 deleted file mode 100644 index 7501109..0000000 --- a/obs-service-format_spec_file-20171107.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f876f3928881a407878fa53a94dbb29b837b2d0347863bd49d2d3303e02490c -size 29015 diff --git a/obs-service-format_spec_file-20180214.tar.bz2 b/obs-service-format_spec_file-20180214.tar.bz2 new file mode 100644 index 0000000..9fdefb0 --- /dev/null +++ b/obs-service-format_spec_file-20180214.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c3d7630dc05271ae7bcdb6b179032b0d373eea931730e050d9a1b0101cf2c7f +size 29406 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 1bc24a8..dd52a2a 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com + +- Update to version 20180214: + + adapt license list for SPDX 3.0 + ------------------------------------------------------------------- Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5fe418b..e4c6bff 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,10 +17,10 @@ Name: obs-service-format_spec_file -Version: 20171107 +Version: 20180214 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr -- 2.51.1 From 459325924e70df3326e3de01f89f8555a32a5c1d67315770c958311b64995441 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Feb 2018 17:49:55 +0000 Subject: [PATCH 126/151] + remove readd-exceptions.patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=178 --- obs-service-format_spec_file.changes | 1 + obs-service-format_spec_file.spec | 3 --- readd-exceptions.patch | 34 ---------------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 readd-exceptions.patch diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index dd52a2a..6b913a3 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -3,6 +3,7 @@ Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com - Update to version 20180214: + adapt license list for SPDX 3.0 + + remove readd-exceptions.patch ------------------------------------------------------------------- Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e4c6bff..782511e 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -25,9 +25,7 @@ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr Source: %{name}-%{version}.tar.bz2 -Patch0: readd-exceptions.patch Requires: obs-service-source_validator -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -42,7 +40,6 @@ spec file instead of creating a new one. %prep %setup -%patch0 -p1 %build diff --git a/readd-exceptions.patch b/readd-exceptions.patch deleted file mode 100644 index 17a00b0..0000000 --- a/readd-exceptions.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: obs-service-format_spec_file-20171107/licenses_changes.txt -=================================================================== ---- obs-service-format_spec_file-20171107.orig/licenses_changes.txt -+++ obs-service-format_spec_file-20171107/licenses_changes.txt -@@ -387,6 +387,17 @@ GPL-2.0+ GPL2+ - GPL-2.0+ GPLv2 or later - GPL-2.0+ GPLv2+ - GPL-2.0+ libGeoIPUpdate is GPLv2 or later -+GPL-2.0++ GPL-2.0++ -+GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception -+GPL-2.0-with-GCC-exception+ GPL-2.0-with-GCC-exception+ -+GPL-2.0-with-autoconf-exception GPL-2.0-with-autoconf-exception -+GPL-2.0-with-autoconf-exception+ GPL-2.0-with-autoconf-exception+ -+GPL-2.0-with-bison-exception GPL-2.0-with-bison-exception -+GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ -+GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception -+GPL-2.0-with-classpath-exception+ GPL-2.0-with-classpath-exception+ -+GPL-2.0-with-font-exception GPL-2.0-with-font-exception -+GPL-2.0-with-font-exception+ GPL-2.0-with-font-exception+ - GPL-3.0 GNU GPL version 3 - GPL-3.0 GNU General Public License version 3 (GPLv3) - GPL-3.0 GPL 3 -@@ -401,6 +412,11 @@ GPL-3.0+ GPL v3 or later - GPL-3.0+ GPL-3+ - GPL-3.0+ GPL-3.0+ - GPL-3.0+ GPLv3+ -+GPL-3.0++ GPL-3.0++ -+GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -+GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ -+GPL-3.0-with-autoconf-exception GPL-3.0-with-autoconf-exception -+GPL-3.0-with-autoconf-exception+ GPL-3.0-with-autoconf-exception+ - GPL-3.0-with-Qt-Company-Qt-exception-1.1 GPL-3.0-with-Qt-Company-Qt-exception-1.1 - Giftware Giftware - Giftware+ Giftware+ -- 2.51.1 From 6f5bbeef7f50d0515d06d3c581e7c143bd7ce794790dea0723dfe9088cdc7fd7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Feb 2018 11:08:09 +0000 Subject: [PATCH 127/151] - Update to version 20180215: + map GPL-1.0 to GPL-1.0-only OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=179 --- debian.dsc | 2 +- obs-service-format_spec_file-20180214.tar.bz2 | 3 --- obs-service-format_spec_file-20180215.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20180214.tar.bz2 create mode 100644 obs-service-format_spec_file-20180215.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 384142a..76b735c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20180214 +Version: 20180215 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20180214.tar.bz2 b/obs-service-format_spec_file-20180214.tar.bz2 deleted file mode 100644 index 9fdefb0..0000000 --- a/obs-service-format_spec_file-20180214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c3d7630dc05271ae7bcdb6b179032b0d373eea931730e050d9a1b0101cf2c7f -size 29406 diff --git a/obs-service-format_spec_file-20180215.tar.bz2 b/obs-service-format_spec_file-20180215.tar.bz2 new file mode 100644 index 0000000..2dc8c0e --- /dev/null +++ b/obs-service-format_spec_file-20180215.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dbcddabdfc5b25946b851757ee2a716a33af1093efb2d52d825aca95766b902 +size 29430 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6b913a3..8f42c3c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 15 11:07:31 UTC 2018 - coolo@suse.com + +- Update to version 20180215: + + map GPL-1.0 to GPL-1.0-only + ------------------------------------------------------------------- Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 782511e..f4019c6 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20180214 +Version: 20180215 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 1f1f0bd9bc666394f04407ce34c097f7a48a8e0f31676e53bb2128dccae43219 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 6 Mar 2018 09:29:22 +0000 Subject: [PATCH 128/151] - Update to version 20180306: + do not patch URL nor Url OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=181 --- debian.dsc | 2 +- obs-service-format_spec_file-20180215.tar.bz2 | 3 --- obs-service-format_spec_file-20180306.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20180215.tar.bz2 create mode 100644 obs-service-format_spec_file-20180306.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 76b735c..4dd004f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20180215 +Version: 20180306 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20180215.tar.bz2 b/obs-service-format_spec_file-20180215.tar.bz2 deleted file mode 100644 index 2dc8c0e..0000000 --- a/obs-service-format_spec_file-20180215.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dbcddabdfc5b25946b851757ee2a716a33af1093efb2d52d825aca95766b902 -size 29430 diff --git a/obs-service-format_spec_file-20180306.tar.bz2 b/obs-service-format_spec_file-20180306.tar.bz2 new file mode 100644 index 0000000..7eb5978 --- /dev/null +++ b/obs-service-format_spec_file-20180306.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bde2fa3cdd28e6f5bd855c9af27cd11086518dcc6e813cce64fe35d5dd81567c +size 29458 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 8f42c3c..ec6df75 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 6 09:28:42 UTC 2018 - coolo@suse.com + +- Update to version 20180306: + + do not patch URL nor Url + ------------------------------------------------------------------- Thu Feb 15 11:07:31 UTC 2018 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index f4019c6..a043386 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20180215 +Version: 20180306 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 4e7b694042f2cf89a10df2c4ea507e8072ead30db1842afdf18ffff403db5d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Aug 2018 06:43:41 +0000 Subject: [PATCH 129/151] Accepting request 630466 from home:scarabeus_iv:branches:openSUSE:Tools - Version update to version 20180820: * In header use https not http when pointing to bugzilla OBS-URL: https://build.opensuse.org/request/show/630466 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=183 --- debian.dsc | 2 +- obs-service-format_spec_file-20180306.tar.bz2 | 3 --- obs-service-format_spec_file-20180820.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 13 ++++++------- 5 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 obs-service-format_spec_file-20180306.tar.bz2 create mode 100644 obs-service-format_spec_file-20180820.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 4dd004f..6c74185 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20180306 +Version: 20180820 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20180306.tar.bz2 b/obs-service-format_spec_file-20180306.tar.bz2 deleted file mode 100644 index 7eb5978..0000000 --- a/obs-service-format_spec_file-20180306.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bde2fa3cdd28e6f5bd855c9af27cd11086518dcc6e813cce64fe35d5dd81567c -size 29458 diff --git a/obs-service-format_spec_file-20180820.tar.bz2 b/obs-service-format_spec_file-20180820.tar.bz2 new file mode 100644 index 0000000..c3964cc --- /dev/null +++ b/obs-service-format_spec_file-20180820.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b07f343bbcf6a73771417e113085ffcd6d75044a8440170b62699e8455bfdfb2 +size 29432 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index ec6df75..61fbe10 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 20 07:22:07 UTC 2018 - tchvatal@suse.com + +- Version update to version 20180820: + * In header use https not http when pointing to bugzilla + ------------------------------------------------------------------- Tue Mar 6 09:28:42 UTC 2018 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index a043386..ce01243 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,12 +17,12 @@ Name: obs-service-format_spec_file -Version: 20180306 +Version: 20180820 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only Group: Development/Tools/Building -Url: https://github.com/openSUSE/obs-service-format_spec_file +URL: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr Source: %{name}-%{version}.tar.bz2 Requires: obs-service-source_validator @@ -39,19 +39,18 @@ spec file instead of creating a new one. %prep -%setup +%setup -q %build %install -%makeinstall +%make_install %check -perl prepare_spec %_topdir/SOURCES/%name.spec +perl prepare_spec %{_topdir}/SOURCES/%{name}.spec %files -%defattr(-,root,root) -%doc COPYING +%license COPYING %dir %{_prefix}/lib/obs %{_prefix}/lib/obs/service -- 2.51.1 From 9e05ef7fdd4689cc1a7b6a34c227b2f9e74d762bdedb6ea9c71808dac747074f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 13 Mar 2019 06:16:23 +0000 Subject: [PATCH 130/151] - Switch to obs_scm with buildtime compression - Update to version 20190312: * prepare_spec: try to keep rich deps unbroken (bsc#1125035) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=185 --- _service | 16 ++++++++++------ _servicedata | 4 ++++ debian.dsc | 2 +- obs-service-format_spec_file-20180820.tar.bz2 | 3 --- obs-service-format_spec_file-20190312.obscpio | 3 +++ obs-service-format_spec_file.changes | 11 +++++++++++ obs-service-format_spec_file.obsinfo | 5 +++++ obs-service-format_spec_file.spec | 6 +++--- 8 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 _servicedata delete mode 100644 obs-service-format_spec_file-20180820.tar.bz2 create mode 100644 obs-service-format_spec_file-20190312.obscpio create mode 100644 obs-service-format_spec_file.obsinfo diff --git a/_service b/_service index 60b125a..3c3eedd 100644 --- a/_service +++ b/_service @@ -1,17 +1,21 @@ - + https://github.com/openSUSE/obs-service-format_spec_file.git git .git git-master %ad master - - - - *.tar - bz2 + enable + coolo@suse.com + + + + bz2 + *.tar + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..3620add --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/obs-service-format_spec_file.git + edda1ae4db7e81096945fe4e4a4e57d9324262fa \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 6c74185..fff45d8 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20180820 +Version: 20190312 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20180820.tar.bz2 b/obs-service-format_spec_file-20180820.tar.bz2 deleted file mode 100644 index c3964cc..0000000 --- a/obs-service-format_spec_file-20180820.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b07f343bbcf6a73771417e113085ffcd6d75044a8440170b62699e8455bfdfb2 -size 29432 diff --git a/obs-service-format_spec_file-20190312.obscpio b/obs-service-format_spec_file-20190312.obscpio new file mode 100644 index 0000000..d787bd3 --- /dev/null +++ b/obs-service-format_spec_file-20190312.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d24d69c9acb13fc2825ceebb57993773bb713833a745b32baa6ed4fab474187 +size 114187 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 61fbe10..5f21a77 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 13 06:16:06 UTC 2019 - Stephan Kulow + +- Switch to obs_scm with buildtime compression + +------------------------------------------------------------------- +Wed Mar 13 06:07:40 UTC 2019 - coolo@suse.com + +- Update to version 20190312: + * prepare_spec: try to keep rich deps unbroken (bsc#1125035) + ------------------------------------------------------------------- Mon Aug 20 07:22:07 UTC 2018 - tchvatal@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo new file mode 100644 index 0000000..d4a184d --- /dev/null +++ b/obs-service-format_spec_file.obsinfo @@ -0,0 +1,5 @@ +name: obs-service-format_spec_file +version: 20190312 +mtime: 1552422217 +commit: 35587133015223bf9aee2af0f5b4446b6643a15b + diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index ce01243..b8dd0f9 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,12 +12,12 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: obs-service-format_spec_file -Version: 20180820 +Version: 20190312 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From ac82a85f54d65e7e66183948f36bdf6cbacd723dd7e410c88c3835541422ff5c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 11 Apr 2019 11:00:12 +0000 Subject: [PATCH 131/151] - Update to version 20190411: * Update SPDX license list OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=187 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20190312.obscpio | 3 --- obs-service-format_spec_file-20190411.obscpio | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20190312.obscpio create mode 100644 obs-service-format_spec_file-20190411.obscpio diff --git a/_servicedata b/_servicedata index 3620add..6edc39b 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - edda1ae4db7e81096945fe4e4a4e57d9324262fa \ No newline at end of file + 8648dfd49280772d1a9d041bdb94f389a0c0559a \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index fff45d8..f25f7e1 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20190312 +Version: 20190411 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20190312.obscpio b/obs-service-format_spec_file-20190312.obscpio deleted file mode 100644 index d787bd3..0000000 --- a/obs-service-format_spec_file-20190312.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d24d69c9acb13fc2825ceebb57993773bb713833a745b32baa6ed4fab474187 -size 114187 diff --git a/obs-service-format_spec_file-20190411.obscpio b/obs-service-format_spec_file-20190411.obscpio new file mode 100644 index 0000000..56311a4 --- /dev/null +++ b/obs-service-format_spec_file-20190411.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:479de0feac0b1ca810c60887b4c17de9f709ad6bcf45102b7e9b5dd1df808c7b +size 116235 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 5f21a77..2719927 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 11 10:59:47 UTC 2019 - coolo@suse.com + +- Update to version 20190411: + * Update SPDX license list + ------------------------------------------------------------------- Wed Mar 13 06:16:06 UTC 2019 - Stephan Kulow diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index d4a184d..b5688f7 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20190312 -mtime: 1552422217 -commit: 35587133015223bf9aee2af0f5b4446b6643a15b +version: 20190411 +mtime: 1554980357 +commit: 8648dfd49280772d1a9d041bdb94f389a0c0559a diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index b8dd0f9..d677833 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20190312 +Version: 20190411 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 4cfa52c37dde72834124a33249480a61cd57fe01a90c32540ff8add37a888355 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 6 Nov 2019 12:39:03 +0000 Subject: [PATCH 132/151] - Update to version 20191106: * treat %global like %define (handle issue#17) (#38) * change copyright entry to SUSE LLC (handle issue#35) (#36) * reformat url as uppercase URL (handle issue#24) (#37) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=189 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20190411.obscpio | 3 --- obs-service-format_spec_file-20191106.obscpio | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20190411.obscpio create mode 100644 obs-service-format_spec_file-20191106.obscpio diff --git a/_servicedata b/_servicedata index 6edc39b..dd67300 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 8648dfd49280772d1a9d041bdb94f389a0c0559a \ No newline at end of file + 690457063bcca65c25a9b39270cd03915659b85c \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index f25f7e1..8c9a317 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20190411 +Version: 20191106 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20190411.obscpio b/obs-service-format_spec_file-20190411.obscpio deleted file mode 100644 index 56311a4..0000000 --- a/obs-service-format_spec_file-20190411.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:479de0feac0b1ca810c60887b4c17de9f709ad6bcf45102b7e9b5dd1df808c7b -size 116235 diff --git a/obs-service-format_spec_file-20191106.obscpio b/obs-service-format_spec_file-20191106.obscpio new file mode 100644 index 0000000..89e2ce5 --- /dev/null +++ b/obs-service-format_spec_file-20191106.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c52075969763b92979c7be1821666b8f3046da3dbc386dd1f8c44c9d1b6e580 +size 116235 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2719927..4555bb4 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 06 12:38:13 UTC 2019 - coolo@suse.com + +- Update to version 20191106: + * treat %global like %define (handle issue#17) (#38) + * change copyright entry to SUSE LLC (handle issue#35) (#36) + * reformat url as uppercase URL (handle issue#24) (#37) + ------------------------------------------------------------------- Thu Apr 11 10:59:47 UTC 2019 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index b5688f7..bc4ae4f 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20190411 -mtime: 1554980357 -commit: 8648dfd49280772d1a9d041bdb94f389a0c0559a +version: 20191106 +mtime: 1573037350 +commit: 690457063bcca65c25a9b39270cd03915659b85c diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index d677833..1620cd8 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20190411 +Version: 20191106 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From ae558239e6100d7cb8e39a69f082d47bd8bbe22a7615470b95cb4577062cc178 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 14 Nov 2019 14:53:59 +0000 Subject: [PATCH 133/151] - Update to version 20191114: * Use copyright line without the . at the end OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=191 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20191106.obscpio | 3 --- obs-service-format_spec_file-20191114.obscpio | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 obs-service-format_spec_file-20191106.obscpio create mode 100644 obs-service-format_spec_file-20191114.obscpio diff --git a/_servicedata b/_servicedata index dd67300..305de2f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 690457063bcca65c25a9b39270cd03915659b85c \ No newline at end of file + 7eaf24ab80bb90ca8a57f86be09cb58e48d3f7d4 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 8c9a317..79a3b54 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20191106 +Version: 20191114 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20191106.obscpio b/obs-service-format_spec_file-20191106.obscpio deleted file mode 100644 index 89e2ce5..0000000 --- a/obs-service-format_spec_file-20191106.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c52075969763b92979c7be1821666b8f3046da3dbc386dd1f8c44c9d1b6e580 -size 116235 diff --git a/obs-service-format_spec_file-20191114.obscpio b/obs-service-format_spec_file-20191114.obscpio new file mode 100644 index 0000000..0de2134 --- /dev/null +++ b/obs-service-format_spec_file-20191114.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44dbb0d9761a6bdc3b60fc4ee34bb055f4caf962ae56ef311d78bc51ca348f0c +size 116235 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4555bb4..76299db 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 14 14:53:12 UTC 2019 - ro@suse.com + +- Update to version 20191114: + * Use copyright line without the . at the end + ------------------------------------------------------------------- Wed Nov 06 12:38:13 UTC 2019 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index bc4ae4f..e8aba29 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20191106 -mtime: 1573037350 -commit: 690457063bcca65c25a9b39270cd03915659b85c +version: 20191114 +mtime: 1573743088 +commit: 246de69f80129b4b20fa4e421d594f22ed2aa52a diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 1620cd8..73fb982 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20191106 +Version: 20191114 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From bfdc04553dc4dfe758b50670794dc8252dd60d91fa916c92df7d03c0eabb6cb6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 28 Jan 2021 10:09:19 +0000 Subject: [PATCH 134/151] - Update to version 20210128: * Split out final comments in description * Make a special exception for short %p* snippets * Also split Conflict headers * Keep the old require sorting * Improve the performance of reorder_tags * Fix merge_comments * Do not split %if and section start * Support multiline copyrights (for Firefox) * Simplify how to calculcate the base_package * Split tag values of certain tags * Be careful with macros that appear between tags * Replace SPDX mapper with an advanced version * Fix merging empty sections * Allow before lines to commented tags * Keep comments close to the original line * Review some deltas in the test suites that are acceptable for now * Parse more into the description - basically everything for now * Fix Release tag * Add an empty line before each section * Map SPDX licenses * Fix more test cases * Adopt some test cases and fix some others * Reorder tags that are below each other * Fix whitespace * Little progress * Add test cases for spec-file cleaner (with current output) * Use perltidy like Cavil * Remove patch_license - old helper script for mass migration * Test case for issue 19 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=193 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20191114.obscpio | 3 -- obs-service-format_spec_file-20210128.obscpio | 3 ++ obs-service-format_spec_file.changes | 42 +++++++++++++++++++ obs-service-format_spec_file.obsinfo | 6 +-- obs-service-format_spec_file.spec | 6 +-- 7 files changed, 53 insertions(+), 11 deletions(-) delete mode 100644 obs-service-format_spec_file-20191114.obscpio create mode 100644 obs-service-format_spec_file-20210128.obscpio diff --git a/_servicedata b/_servicedata index 305de2f..ec95b31 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 7eaf24ab80bb90ca8a57f86be09cb58e48d3f7d4 \ No newline at end of file + 5d082d1f5c2caa3991e732f7ddad300fc81278fa \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 79a3b54..eb53b91 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20191114 +Version: 20210128 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20191114.obscpio b/obs-service-format_spec_file-20191114.obscpio deleted file mode 100644 index 0de2134..0000000 --- a/obs-service-format_spec_file-20191114.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44dbb0d9761a6bdc3b60fc4ee34bb055f4caf962ae56ef311d78bc51ca348f0c -size 116235 diff --git a/obs-service-format_spec_file-20210128.obscpio b/obs-service-format_spec_file-20210128.obscpio new file mode 100644 index 0000000..6a42a84 --- /dev/null +++ b/obs-service-format_spec_file-20210128.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ee7562dc40c79f84dd99be2533c4412c81885727328ac786d27e51df924cf2d +size 1494540 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 76299db..6dc2714 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Jan 28 10:06:54 UTC 2021 - coolo@suse.com + +- Update to version 20210128: + * Split out final comments in description + * Make a special exception for short %p* snippets + * Also split Conflict headers + * Keep the old require sorting + * Improve the performance of reorder_tags + * Fix merge_comments + * Do not split %if and section start + * Support multiline copyrights (for Firefox) + * Simplify how to calculcate the base_package + * Split tag values of certain tags + * Be careful with macros that appear between tags + * Replace SPDX mapper with an advanced version + * Fix merging empty sections + * Allow before lines to commented tags + * Keep comments close to the original line + * Review some deltas in the test suites that are acceptable for now + * Parse more into the description - basically everything for now + * Fix Release tag + * Add an empty line before each section + * Map SPDX licenses + * Fix more test cases + * Adopt some test cases and fix some others + * Reorder tags that are below each other + * Fix whitespace + * Little progress + * Add test cases for spec-file cleaner (with current output) + * Use perltidy like Cavil + * Remove patch_license - old helper script for mass migration + * Test case for issue 19 + * Only parse Provides in Header section + * Test case for issue 41 + * Trim all trailing whitespace - including \r + * Fix copyright year to 2012 in the test cases + * Fetch licenses from JSON and remove + variants + * Fetch exceptions from JSON + * add some testcases + * prepare_spec handle the case where License/Group are in a if/else/endif + ------------------------------------------------------------------- Thu Nov 14 14:53:12 UTC 2019 - ro@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index e8aba29..7c077d6 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20191114 -mtime: 1573743088 -commit: 246de69f80129b4b20fa4e421d594f22ed2aa52a +version: 20210128 +mtime: 1611828367 +commit: 5d082d1f5c2caa3991e732f7ddad300fc81278fa diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 73fb982..54382d1 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20191114 +Version: 20210128 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only @@ -47,7 +47,7 @@ spec file instead of creating a new one. %make_install %check -perl prepare_spec %{_topdir}/SOURCES/%{name}.spec +make check %files %license COPYING -- 2.51.1 From edc0d490ddc264b1b9e1e145af3295d56776c3a968053af7690a77c7178ff6e9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 May 2021 17:01:00 +0000 Subject: [PATCH 135/151] - Update to version 20210511: * Refresh licenses from spdx.org * Be more wary on usage of macros in Tags * Do not Cache Source.* but only Source[0-9]* * Stop pretending we can guess what the spec file is for * Avoid deep recursion in merge_comments * Allow to override date (#45) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=195 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20210128.obscpio | 3 --- obs-service-format_spec_file-20210511.obscpio | 3 +++ obs-service-format_spec_file.changes | 11 +++++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20210128.obscpio create mode 100644 obs-service-format_spec_file-20210511.obscpio diff --git a/_servicedata b/_servicedata index ec95b31..01c35d1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 5d082d1f5c2caa3991e732f7ddad300fc81278fa \ No newline at end of file + 9f2fa98d6e4eb1bb6a211ee8556c65a8aa382e83 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index eb53b91..f0d9b64 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20210128 +Version: 20210511 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20210128.obscpio b/obs-service-format_spec_file-20210128.obscpio deleted file mode 100644 index 6a42a84..0000000 --- a/obs-service-format_spec_file-20210128.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ee7562dc40c79f84dd99be2533c4412c81885727328ac786d27e51df924cf2d -size 1494540 diff --git a/obs-service-format_spec_file-20210511.obscpio b/obs-service-format_spec_file-20210511.obscpio new file mode 100644 index 0000000..d6d8e3d --- /dev/null +++ b/obs-service-format_spec_file-20210511.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:077e52d596b66da6b744425e02c629473d6dfa62d6e77cfa996d9125889da394 +size 1761292 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6dc2714..22e68a7 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 11 17:00:33 UTC 2021 - coolo@suse.com + +- Update to version 20210511: + * Refresh licenses from spdx.org + * Be more wary on usage of macros in Tags + * Do not Cache Source.* but only Source[0-9]* + * Stop pretending we can guess what the spec file is for + * Avoid deep recursion in merge_comments + * Allow to override date (#45) + ------------------------------------------------------------------- Thu Jan 28 10:06:54 UTC 2021 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index 7c077d6..b661b65 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20210128 -mtime: 1611828367 -commit: 5d082d1f5c2caa3991e732f7ddad300fc81278fa +version: 20210511 +mtime: 1620752406 +commit: 9f2fa98d6e4eb1bb6a211ee8556c65a8aa382e83 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 54382d1..e51cc4a 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20210128 +Version: 20210511 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 2beb714f22aa1a9515bead593aaf08e473491bc80f1b60b0ec27be48765802d7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 15 Nov 2021 08:43:01 +0000 Subject: [PATCH 136/151] - Update to version 20211115: * Sync license identifiers from SPDX (#50) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=197 --- _service | 4 ++-- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20210511.obscpio | 3 --- obs-service-format_spec_file-20211115.obscpio | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 obs-service-format_spec_file-20210511.obscpio create mode 100644 obs-service-format_spec_file-20211115.obscpio diff --git a/_service b/_service index 3c3eedd..d2eda69 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://github.com/openSUSE/obs-service-format_spec_file.git git .git @@ -10,7 +10,7 @@ coolo@suse.com - + diff --git a/_servicedata b/_servicedata index 01c35d1..ecaa26a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 9f2fa98d6e4eb1bb6a211ee8556c65a8aa382e83 \ No newline at end of file + b6eaf6e04d4b6e518c7d59bf42db3a825a814dd3 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index f0d9b64..24c2b54 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20210511 +Version: 20211115 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20210511.obscpio b/obs-service-format_spec_file-20210511.obscpio deleted file mode 100644 index d6d8e3d..0000000 --- a/obs-service-format_spec_file-20210511.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:077e52d596b66da6b744425e02c629473d6dfa62d6e77cfa996d9125889da394 -size 1761292 diff --git a/obs-service-format_spec_file-20211115.obscpio b/obs-service-format_spec_file-20211115.obscpio new file mode 100644 index 0000000..2fab0aa --- /dev/null +++ b/obs-service-format_spec_file-20211115.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ef454ac5e93f64b4c183d30271b6b71f86e53800899866df55a45af5952e3bb +size 1763340 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 22e68a7..acd36c3 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 15 08:42:31 UTC 2021 - coolo@suse.com + +- Update to version 20211115: + * Sync license identifiers from SPDX (#50) + ------------------------------------------------------------------- Tue May 11 17:00:33 UTC 2021 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index b661b65..3f438bc 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,5 @@ name: obs-service-format_spec_file -version: 20210511 -mtime: 1620752406 -commit: 9f2fa98d6e4eb1bb6a211ee8556c65a8aa382e83 +version: 20211115 +mtime: 1636965645 +commit: b6eaf6e04d4b6e518c7d59bf42db3a825a814dd3 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e51cc4a..5eb3d99 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20210511 +Version: 20211115 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 809563cdd6e25df2cbed8b691b78b43ad47c59a70109bbafb0be8494bc42ecdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 15 Dec 2021 09:16:10 +0000 Subject: [PATCH 137/151] Accepting request 940673 from home:alarrosa:branches:openSUSE:Tools Add boo reference to sync with SLE's changelog (for boo#1160801 Update SUSE copyright string) OBS-URL: https://build.opensuse.org/request/show/940673 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=198 --- obs-service-format_spec_file.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index acd36c3..56b0d63 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -62,6 +62,7 @@ Thu Nov 14 14:53:12 UTC 2019 - ro@suse.com - Update to version 20191114: * Use copyright line without the . at the end + (for boo#1160801 Update SUSE copyright string) ------------------------------------------------------------------- Wed Nov 06 12:38:13 UTC 2019 - coolo@suse.com -- 2.51.1 From cd848ea686e52e9f220543f28ae39fd6394638ec2d948951e0a17313be7287db Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 13 Nov 2022 14:10:47 +0000 Subject: [PATCH 138/151] - Update to version 20220603: * licences_exceptions.txt: rename to licenses_exceptions.txt * Fetch updated licenses * Add test case for bsc#1194504 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=199 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20211115.obscpio | 3 --- obs-service-format_spec_file-20220603.obscpio | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.obsinfo | 7 +++---- obs-service-format_spec_file.spec | 4 ++-- 7 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 obs-service-format_spec_file-20211115.obscpio create mode 100644 obs-service-format_spec_file-20220603.obscpio diff --git a/_servicedata b/_servicedata index ecaa26a..0676ba8 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - b6eaf6e04d4b6e518c7d59bf42db3a825a814dd3 \ No newline at end of file + 862eb75add9a0f1d7a7425a29f2e7719c60d3bdc \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 24c2b54..2520cb6 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20211115 +Version: 20220603 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20211115.obscpio b/obs-service-format_spec_file-20211115.obscpio deleted file mode 100644 index 2fab0aa..0000000 --- a/obs-service-format_spec_file-20211115.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ef454ac5e93f64b4c183d30271b6b71f86e53800899866df55a45af5952e3bb -size 1763340 diff --git a/obs-service-format_spec_file-20220603.obscpio b/obs-service-format_spec_file-20220603.obscpio new file mode 100644 index 0000000..f9b7c15 --- /dev/null +++ b/obs-service-format_spec_file-20220603.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41816c56dd9b6fb8559b96fc6fd984018154b65f2eca85c6c246d26089558501 +size 1766412 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 56b0d63..4487be6 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 13 14:10:24 UTC 2022 - coolo@suse.com + +- Update to version 20220603: + * licences_exceptions.txt: rename to licenses_exceptions.txt + * Fetch updated licenses + * Add test case for bsc#1194504 + ------------------------------------------------------------------- Mon Nov 15 08:42:31 UTC 2021 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index 3f438bc..3236c22 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,5 +1,4 @@ name: obs-service-format_spec_file -version: 20211115 -mtime: 1636965645 -commit: b6eaf6e04d4b6e518c7d59bf42db3a825a814dd3 - +version: 20220603 +mtime: 1668348534 +commit: 862eb75add9a0f1d7a7425a29f2e7719c60d3bdc diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5eb3d99..5e52f64 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20211115 +Version: 20220603 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 8564b117a6cec87459c5b9105cdec3c4ad6f6121a27214b7ff26f0714f09906e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 13 Nov 2022 18:25:32 +0000 Subject: [PATCH 139/151] - Update to version 20221113: OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=200 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file.changes | 4 ++-- obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_servicedata b/_servicedata index 0676ba8..0581e63 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 862eb75add9a0f1d7a7425a29f2e7719c60d3bdc \ No newline at end of file + ae851ade79697bcb605304a467deb5c77f3d06f5 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 2520cb6..ce74667 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20220603 +Version: 20221113 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4487be6..ee6abf1 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Sun Nov 13 14:10:24 UTC 2022 - coolo@suse.com +Sun Nov 13 18:25:14 UTC 2022 - coolo@suse.com -- Update to version 20220603: +- Update to version 20221113: * licences_exceptions.txt: rename to licenses_exceptions.txt * Fetch updated licenses * Add test case for bsc#1194504 diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index 3236c22..b7ce9ce 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20220603 -mtime: 1668348534 -commit: 862eb75add9a0f1d7a7425a29f2e7719c60d3bdc +version: 20221113 +mtime: 1668363374 +commit: ae851ade79697bcb605304a467deb5c77f3d06f5 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5e52f64..b2a52fa 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20220603 +Version: 20221113 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 26bbb810ee8ba81def1892ad2eb35d4b6959ba7163d13bef1e92fc88657d9fbe Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 13 Nov 2022 18:25:49 +0000 Subject: [PATCH 140/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=201 --- obs-service-format_spec_file-20220603.obscpio | 3 --- obs-service-format_spec_file-20221113.obscpio | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-format_spec_file-20220603.obscpio create mode 100644 obs-service-format_spec_file-20221113.obscpio diff --git a/obs-service-format_spec_file-20220603.obscpio b/obs-service-format_spec_file-20220603.obscpio deleted file mode 100644 index f9b7c15..0000000 --- a/obs-service-format_spec_file-20220603.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41816c56dd9b6fb8559b96fc6fd984018154b65f2eca85c6c246d26089558501 -size 1766412 diff --git a/obs-service-format_spec_file-20221113.obscpio b/obs-service-format_spec_file-20221113.obscpio new file mode 100644 index 0000000..6048be5 --- /dev/null +++ b/obs-service-format_spec_file-20221113.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96f5c111d8fb61b11f44f72011cc17c1050a279b41d2a0dcf451423d6d36b086 +size 1766412 -- 2.51.1 From 57c80f3665dbbcb1b7ce5ae31e621cd23d334d339971faacb64208a6f7f96412 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 22 May 2023 16:10:32 +0000 Subject: [PATCH 141/151] - Update to version 20230522: * Sync SPDX licenses * Add needspubkeyforbuild OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=203 --- _service | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20221113.obscpio | 3 --- obs-service-format_spec_file-20230522.obscpio | 3 +++ obs-service-format_spec_file.changes | 7 +++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 4 ++-- 8 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 obs-service-format_spec_file-20221113.obscpio create mode 100644 obs-service-format_spec_file-20230522.obscpio diff --git a/_service b/_service index d2eda69..475606e 100644 --- a/_service +++ b/_service @@ -7,7 +7,7 @@ %ad master enable - coolo@suse.com + dmueller@suse.com diff --git a/_servicedata b/_servicedata index 0581e63..b9c1b57 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - ae851ade79697bcb605304a467deb5c77f3d06f5 \ No newline at end of file + c92d06327f3e1c4a3b5cb56d8ed494d9a8bd1486 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index ce74667..eb31c47 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20221113 +Version: 20230522 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20221113.obscpio b/obs-service-format_spec_file-20221113.obscpio deleted file mode 100644 index 6048be5..0000000 --- a/obs-service-format_spec_file-20221113.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96f5c111d8fb61b11f44f72011cc17c1050a279b41d2a0dcf451423d6d36b086 -size 1766412 diff --git a/obs-service-format_spec_file-20230522.obscpio b/obs-service-format_spec_file-20230522.obscpio new file mode 100644 index 0000000..e545757 --- /dev/null +++ b/obs-service-format_spec_file-20230522.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:133ce5d7fe10cc0e8fd4caaeb8efc674fb18d58cbf22a405a01ff645ed81ffd9 +size 1769996 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index ee6abf1..75a8dd2 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 22 16:07:40 UTC 2023 - dmueller@suse.com + +- Update to version 20230522: + * Sync SPDX licenses + * Add needspubkeyforbuild + ------------------------------------------------------------------- Sun Nov 13 18:25:14 UTC 2022 - coolo@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index b7ce9ce..52dc9ab 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20221113 -mtime: 1668363374 -commit: ae851ade79697bcb605304a467deb5c77f3d06f5 +version: 20230522 +mtime: 1684770546 +commit: c92d06327f3e1c4a3b5cb56d8ed494d9a8bd1486 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index b2a52fa..c036716 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20221113 +Version: 20230522 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 42a7bf9edb849b42c69f5fefea7b168801b9801e67c093c5e6a8d36e66ec5a0c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Jul 2023 11:17:34 +0000 Subject: [PATCH 142/151] - Update to version 20230712: * Sync SPDX licenses * Sync SPDX licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=205 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20230522.obscpio | 3 --- obs-service-format_spec_file-20230712.obscpio | 3 +++ obs-service-format_spec_file.changes | 7 +++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20230522.obscpio create mode 100644 obs-service-format_spec_file-20230712.obscpio diff --git a/_servicedata b/_servicedata index b9c1b57..4edd07e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - c92d06327f3e1c4a3b5cb56d8ed494d9a8bd1486 \ No newline at end of file + efca71ba4bea17efb09eb07f6154c1dc656bc208 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index eb31c47..dfc1f0b 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20230522 +Version: 20230712 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20230522.obscpio b/obs-service-format_spec_file-20230522.obscpio deleted file mode 100644 index e545757..0000000 --- a/obs-service-format_spec_file-20230522.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:133ce5d7fe10cc0e8fd4caaeb8efc674fb18d58cbf22a405a01ff645ed81ffd9 -size 1769996 diff --git a/obs-service-format_spec_file-20230712.obscpio b/obs-service-format_spec_file-20230712.obscpio new file mode 100644 index 0000000..128d3dc --- /dev/null +++ b/obs-service-format_spec_file-20230712.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30c1bd782f4b3efbe39a9e24c588192ccb0f08083d6f87d0a1ed0d2bdca3c98a +size 1771020 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 75a8dd2..6a25d4d 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 12 11:16:06 UTC 2023 - dmueller@suse.com + +- Update to version 20230712: + * Sync SPDX licenses + * Sync SPDX licenses + ------------------------------------------------------------------- Mon May 22 16:07:40 UTC 2023 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index 52dc9ab..eda39d7 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20230522 -mtime: 1684770546 -commit: c92d06327f3e1c4a3b5cb56d8ed494d9a8bd1486 +version: 20230712 +mtime: 1689160500 +commit: efca71ba4bea17efb09eb07f6154c1dc656bc208 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index c036716..caa9b2b 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20230522 +Version: 20230712 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From a20706fb52fbe0eb992f16ae3dbd92a37150bf4b61873abb07e29b6d31502881 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 21 Jan 2024 11:25:42 +0000 Subject: [PATCH 143/151] - Update to version 20240121: * Fix formatting of overlong tags * set header_name to the spec file name * Sync licenses with SPDX spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=207 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20230712.obscpio | 3 --- obs-service-format_spec_file-20240121.obscpio | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 4 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 obs-service-format_spec_file-20230712.obscpio create mode 100644 obs-service-format_spec_file-20240121.obscpio diff --git a/_servicedata b/_servicedata index 4edd07e..7d6deff 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - efca71ba4bea17efb09eb07f6154c1dc656bc208 \ No newline at end of file + 3011bbc97af4ff9ea4957ee98d8c5450155552ab \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index dfc1f0b..e6fb86d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20230712 +Version: 20240121 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20230712.obscpio b/obs-service-format_spec_file-20230712.obscpio deleted file mode 100644 index 128d3dc..0000000 --- a/obs-service-format_spec_file-20230712.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30c1bd782f4b3efbe39a9e24c588192ccb0f08083d6f87d0a1ed0d2bdca3c98a -size 1771020 diff --git a/obs-service-format_spec_file-20240121.obscpio b/obs-service-format_spec_file-20240121.obscpio new file mode 100644 index 0000000..56092ef --- /dev/null +++ b/obs-service-format_spec_file-20240121.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d298409aeb684aca4e073fd2581b3f397852cc590affa7ef772a2f4b78b1f4d +size 1780748 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6a25d4d..3ae8acc 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 21 11:25:24 UTC 2024 - dmueller@suse.com + +- Update to version 20240121: + * Fix formatting of overlong tags + * set header_name to the spec file name + * Sync licenses with SPDX spec + ------------------------------------------------------------------- Wed Jul 12 11:16:06 UTC 2023 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index eda39d7..d85a2aa 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20230712 -mtime: 1689160500 -commit: efca71ba4bea17efb09eb07f6154c1dc656bc208 +version: 20240121 +mtime: 1705836294 +commit: 3011bbc97af4ff9ea4957ee98d8c5450155552ab diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index caa9b2b..320eacf 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20230712 +Version: 20240121 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 670feaad5ce2f82337baa1c12361c41d916fa432199c877d1be6e2e1c60f9799 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 21 Jan 2024 11:35:49 +0000 Subject: [PATCH 144/151] * update licenses - do not enter empty license line if not found (eg in include file) (bnc#624980) - fix empty line handling (multiple subsequent empty lines) lines in a package, for example in if-constructs) - cleanup prepare_spec, drop Needed.pm OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=208 --- _servicedata | 2 +- obs-service-format_spec_file-20240121.obscpio | 4 ++-- obs-service-format_spec_file.changes | 11 ++++++----- obs-service-format_spec_file.obsinfo | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/_servicedata b/_servicedata index 7d6deff..c1a5a52 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 3011bbc97af4ff9ea4957ee98d8c5450155552ab \ No newline at end of file + f8724f13e9c826cda97145f20facec9dbdc17536 \ No newline at end of file diff --git a/obs-service-format_spec_file-20240121.obscpio b/obs-service-format_spec_file-20240121.obscpio index 56092ef..85ff309 100644 --- a/obs-service-format_spec_file-20240121.obscpio +++ b/obs-service-format_spec_file-20240121.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d298409aeb684aca4e073fd2581b3f397852cc590affa7ef772a2f4b78b1f4d -size 1780748 +oid sha256:736e44bc5a209fbe4b28e41461cd4c6d1807c457c36bd8c750ffb10a5945173d +size 1781772 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 3ae8acc..f7ab720 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -2,6 +2,7 @@ Sun Jan 21 11:25:24 UTC 2024 - dmueller@suse.com - Update to version 20240121: + * update licenses * Fix formatting of overlong tags * set header_name to the spec file name * Sync licenses with SPDX spec @@ -218,7 +219,7 @@ Mon Aug 25 05:13:17 UTC 2014 - coolo@suse.com ------------------------------------------------------------------- Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de -- do not enter empty license line if not found (eg in include file) +- do not enter empty license line if not found (eg in include file) ------------------------------------------------------------------- Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de @@ -519,18 +520,18 @@ Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de - try to keep summary and group for cases like openldap2 - (bnc#624980) + (bnc#624980) ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de -- fix empty line handling (multiple subsequent empty lines) +- fix empty line handling (multiple subsequent empty lines) ------------------------------------------------------------------- Mon Jul 4 00:16:05 CEST 2011 - ro@suse.de - leave Version lines intact (fix issue with multiple version - lines in a package, for example in if-constructs) + lines in a package, for example in if-constructs) ------------------------------------------------------------------- Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com @@ -556,7 +557,7 @@ Wed May 25 14:00:35 CEST 2011 - ro@suse.de ------------------------------------------------------------------- Wed May 4 01:55:04 CEST 2011 - ro@suse.de -- cleanup prepare_spec, drop Needed.pm +- cleanup prepare_spec, drop Needed.pm - make it ready for public usage ------------------------------------------------------------------- diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index d85a2aa..ba267d2 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file version: 20240121 -mtime: 1705836294 -commit: 3011bbc97af4ff9ea4957ee98d8c5450155552ab +mtime: 1705836660 +commit: f8724f13e9c826cda97145f20facec9dbdc17536 -- 2.51.1 From 9d9b9ac5a6e878f0301d838ad9d232663969b00cd5a6d5e370b7079b25a45adf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 31 Jul 2025 07:33:37 +0000 Subject: [PATCH 145/151] - Update to version 20250725: * Fix indentation to run checks on pull request * Change autoadded copyright header to include "and contributors" * Add 3 extra test-cases * Run tests in github actions * Preserve the order of multiple copyright lines. * Allow for truly empty lines in copyright sections * Accept empty lines in %changelog sections * Update licenses * Avoid using temporary files for tests OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=210 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20240121.obscpio | 3 --- obs-service-format_spec_file-20250725.obscpio | 3 +++ obs-service-format_spec_file.changes | 14 ++++++++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 4 ++-- 7 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 obs-service-format_spec_file-20240121.obscpio create mode 100644 obs-service-format_spec_file-20250725.obscpio diff --git a/_servicedata b/_servicedata index c1a5a52..ec09793 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - f8724f13e9c826cda97145f20facec9dbdc17536 \ No newline at end of file + cc09266da5b242866ffeb75f763891c96f211bdf \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index e6fb86d..f760679 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20240121 +Version: 20250725 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20240121.obscpio b/obs-service-format_spec_file-20240121.obscpio deleted file mode 100644 index 85ff309..0000000 --- a/obs-service-format_spec_file-20240121.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:736e44bc5a209fbe4b28e41461cd4c6d1807c457c36bd8c750ffb10a5945173d -size 1781772 diff --git a/obs-service-format_spec_file-20250725.obscpio b/obs-service-format_spec_file-20250725.obscpio new file mode 100644 index 0000000..54cb9a9 --- /dev/null +++ b/obs-service-format_spec_file-20250725.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5197e5ff6ae6d35d1210366f4d89109f744782097e17c713c5f3e28f3aaf212f +size 1860620 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index f7ab720..9fb7f87 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jul 31 06:50:53 UTC 2025 - dmueller@suse.com + +- Update to version 20250725: + * Fix indentation to run checks on pull request + * Change autoadded copyright header to include "and contributors" + * Add 3 extra test-cases + * Run tests in github actions + * Preserve the order of multiple copyright lines. + * Allow for truly empty lines in copyright sections + * Accept empty lines in %changelog sections + * Update licenses + * Avoid using temporary files for tests + ------------------------------------------------------------------- Sun Jan 21 11:25:24 UTC 2024 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index ba267d2..c07e814 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20240121 -mtime: 1705836660 -commit: f8724f13e9c826cda97145f20facec9dbdc17536 +version: 20250725 +mtime: 1753458227 +commit: cc09266da5b242866ffeb75f763891c96f211bdf diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 320eacf..5779a6c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20240121 +Version: 20250725 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 5fe25d0f42fe8817832a46b762318e6db86b169faaf94e91c82e4c7e7c480a90 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 4 Aug 2025 07:29:44 +0000 Subject: [PATCH 146/151] - Update to version 20250804: * Remove more LLC and contributors also from the copyright strings OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=212 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20250725.obscpio | 3 --- obs-service-format_spec_file-20250804.obscpio | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 5 +++-- 7 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 obs-service-format_spec_file-20250725.obscpio create mode 100644 obs-service-format_spec_file-20250804.obscpio diff --git a/_servicedata b/_servicedata index ec09793..07423b7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - cc09266da5b242866ffeb75f763891c96f211bdf \ No newline at end of file + 6ccc35b3e2f3601c3261c51e63d596c740f80e28 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index f760679..e6e3c4a 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20250725 +Version: 20250804 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20250725.obscpio b/obs-service-format_spec_file-20250725.obscpio deleted file mode 100644 index 54cb9a9..0000000 --- a/obs-service-format_spec_file-20250725.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5197e5ff6ae6d35d1210366f4d89109f744782097e17c713c5f3e28f3aaf212f -size 1860620 diff --git a/obs-service-format_spec_file-20250804.obscpio b/obs-service-format_spec_file-20250804.obscpio new file mode 100644 index 0000000..9fce20d --- /dev/null +++ b/obs-service-format_spec_file-20250804.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee1369d3be589769238e71783796e97e42b6403398204085321d12345b7ec0e6 +size 1860620 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 9fb7f87..08b97e7 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 04 07:26:51 UTC 2025 - dmueller@suse.com + +- Update to version 20250804: + * Remove more LLC and contributors also from the copyright strings + ------------------------------------------------------------------- Thu Jul 31 06:50:53 UTC 2025 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index c07e814..e87a2f3 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20250725 -mtime: 1753458227 -commit: cc09266da5b242866ffeb75f763891c96f211bdf +version: 20250804 +mtime: 1754292401 +commit: 6ccc35b3e2f3601c3261c51e63d596c740f80e28 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5779a6c..09b1f42 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,8 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +18,7 @@ Name: obs-service-format_spec_file -Version: 20250725 +Version: 20250804 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From e8f943c28305c71f157ef354fbaa6a2448720cec2a25d652d33f59bf40ca8551 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 4 Aug 2025 11:48:57 +0000 Subject: [PATCH 147/151] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=213 --- obs-service-format_spec_file.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 09b1f42..2ac8506 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -2,7 +2,6 @@ # spec file for package obs-service-format_spec_file # # Copyright (c) 2025 SUSE LLC and contributors -# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -- 2.51.1 From 8b737f1ea8028c881e9a2fad7f55b7b19793fc47ecf997b6d4fcee69edaf8448 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 7 Sep 2025 19:56:45 +0000 Subject: [PATCH 148/151] - Update to version 20250907: * Update test cases * Special handling for 'SUSE Software Solutions Germany' license * Keep 3rd party licenses intact * Keep SUSE T&Cs close to SUSE Copyright * Make create_copyright_section() return true when SUSE Copyright processed OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=215 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20250804.obscpio | 3 --- obs-service-format_spec_file-20250907.obscpio | 3 +++ obs-service-format_spec_file.changes | 10 ++++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20250804.obscpio create mode 100644 obs-service-format_spec_file-20250907.obscpio diff --git a/_servicedata b/_servicedata index 07423b7..53733d4 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 6ccc35b3e2f3601c3261c51e63d596c740f80e28 \ No newline at end of file + 3567c055567ed4e95d09dddf40a16aa2e7933f97 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index e6e3c4a..ea3f364 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20250804 +Version: 20250907 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20250804.obscpio b/obs-service-format_spec_file-20250804.obscpio deleted file mode 100644 index 9fce20d..0000000 --- a/obs-service-format_spec_file-20250804.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee1369d3be589769238e71783796e97e42b6403398204085321d12345b7ec0e6 -size 1860620 diff --git a/obs-service-format_spec_file-20250907.obscpio b/obs-service-format_spec_file-20250907.obscpio new file mode 100644 index 0000000..ea917eb --- /dev/null +++ b/obs-service-format_spec_file-20250907.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ac91c48315a20da2b367bb79455916f28a9ea60daf4c0ca9cc5df3f01af26ef +size 1878540 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 08b97e7..27666bd 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Sep 07 19:53:46 UTC 2025 - dmueller@suse.com + +- Update to version 20250907: + * Update test cases + * Special handling for 'SUSE Software Solutions Germany' license + * Keep 3rd party licenses intact + * Keep SUSE T&Cs close to SUSE Copyright + * Make create_copyright_section() return true when SUSE Copyright processed + ------------------------------------------------------------------- Mon Aug 04 07:26:51 UTC 2025 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index e87a2f3..3976fb9 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20250804 -mtime: 1754292401 -commit: 6ccc35b3e2f3601c3261c51e63d596c740f80e28 +version: 20250907 +mtime: 1757274834 +commit: 3567c055567ed4e95d09dddf40a16aa2e7933f97 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 2ac8506..c902264 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20250804 +Version: 20250907 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 3fb3d72473f900bb87ffc4d83de50e02b1fcf423b4bc048a66d9a2bd51cb5e52 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 18 Sep 2025 06:51:08 +0000 Subject: [PATCH 149/151] - Update to version 20250918: * Don't add unneeded empty lines after Copyrights OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=217 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20250907.obscpio | 3 --- obs-service-format_spec_file-20250918.obscpio | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20250907.obscpio create mode 100644 obs-service-format_spec_file-20250918.obscpio diff --git a/_servicedata b/_servicedata index 53733d4..90a924c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 3567c055567ed4e95d09dddf40a16aa2e7933f97 \ No newline at end of file + b4258383c51b88c51b1162dfaac7d1fddb231cfa \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index ea3f364..619aa73 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20250907 +Version: 20250918 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20250907.obscpio b/obs-service-format_spec_file-20250907.obscpio deleted file mode 100644 index ea917eb..0000000 --- a/obs-service-format_spec_file-20250907.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ac91c48315a20da2b367bb79455916f28a9ea60daf4c0ca9cc5df3f01af26ef -size 1878540 diff --git a/obs-service-format_spec_file-20250918.obscpio b/obs-service-format_spec_file-20250918.obscpio new file mode 100644 index 0000000..f5d3db3 --- /dev/null +++ b/obs-service-format_spec_file-20250918.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cda3779fe9bab19351f246e093eec2959b9703d3124864997d63aced85d74aeb +size 1878540 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 27666bd..c398635 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 18 06:49:39 UTC 2025 - dmueller@suse.com + +- Update to version 20250918: + * Don't add unneeded empty lines after Copyrights + ------------------------------------------------------------------- Sun Sep 07 19:53:46 UTC 2025 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index 3976fb9..d558b65 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20250907 -mtime: 1757274834 -commit: 3567c055567ed4e95d09dddf40a16aa2e7933f97 +version: 20250918 +mtime: 1758178142 +commit: b4258383c51b88c51b1162dfaac7d1fddb231cfa diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index c902264..5edd55a 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20250907 +Version: 20250918 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From f66c53bd929c7438841908f24212fe87f7615ab02fc11dcc63df024813099b71 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 29 Sep 2025 07:38:50 +0000 Subject: [PATCH 150/151] - Update to version 20250923: * Update test case for changes in 1ccd56d0 * Empty section may contain empty lines instead of setting 'after_lines' * Update test case for changes in 51da0388 * Fix _split_final_comments hack OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=219 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20250918.obscpio | 3 --- obs-service-format_spec_file-20250923.obscpio | 3 +++ obs-service-format_spec_file.changes | 9 +++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 obs-service-format_spec_file-20250918.obscpio create mode 100644 obs-service-format_spec_file-20250923.obscpio diff --git a/_servicedata b/_servicedata index 90a924c..033bccd 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - b4258383c51b88c51b1162dfaac7d1fddb231cfa \ No newline at end of file + 80f69b6cdb83190259c3c1e2ede5b10e8e4e2613 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 619aa73..73e1414 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20250918 +Version: 20250923 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20250918.obscpio b/obs-service-format_spec_file-20250918.obscpio deleted file mode 100644 index f5d3db3..0000000 --- a/obs-service-format_spec_file-20250918.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cda3779fe9bab19351f246e093eec2959b9703d3124864997d63aced85d74aeb -size 1878540 diff --git a/obs-service-format_spec_file-20250923.obscpio b/obs-service-format_spec_file-20250923.obscpio new file mode 100644 index 0000000..cf904a3 --- /dev/null +++ b/obs-service-format_spec_file-20250923.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcda04a33cf8768fbd5eaab97fba7233deca76bec8345d76161aa740329cda2d +size 1878540 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index c398635..12b3639 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 29 07:37:56 UTC 2025 - dmueller@suse.com + +- Update to version 20250923: + * Update test case for changes in 1ccd56d0 + * Empty section may contain empty lines instead of setting 'after_lines' + * Update test case for changes in 51da0388 + * Fix _split_final_comments hack + ------------------------------------------------------------------- Thu Sep 18 06:49:39 UTC 2025 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index d558b65..3357adb 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20250918 -mtime: 1758178142 -commit: b4258383c51b88c51b1162dfaac7d1fddb231cfa +version: 20250923 +mtime: 1758647193 +commit: 80f69b6cdb83190259c3c1e2ede5b10e8e4e2613 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5edd55a..5065d17 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20250918 +Version: 20250923 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only -- 2.51.1 From 356872e7bd28fb445153c3d5c1f655c95b9ebc8a8ba5649ef358d8da5dc8d27e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 Dec 2025 11:43:26 +0000 Subject: [PATCH 151/151] Accepting request 1320779 from home:ateixeira:branches:openSUSE:Tools Depends on https://build.opensuse.org/requests/1320778 - Add PKGBUILD to enable builds for Arch Linux OBS-URL: https://build.opensuse.org/request/show/1320779 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=221 --- PKGBUILD | 15 +++++++++++++++ obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..42be101 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,15 @@ +pkgname=obs-service-format_spec_file +pkgver=20250923 +pkgrel=0 +pkgdesc='An OBS source service: reformats a spec file to SUSE standard' +arch=('any') +url='https://github.com/openSUSE/obs-service-format_spec_file' +license=('GPL-2.0-only') +depends=('obs-service-source_validator') +source=($pkgname-$pkgver.tar.bz2) +sha256sums=('SKIP') + +package() { + cd "$pkgname-$pkgver" + make DESTDIR=$pkgdir install +} diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 12b3639..8057677 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 1 20:05:51 UTC 2025 - Antonio Teixeira + +- Add PKGBUILD to enable builds for Arch Linux + ------------------------------------------------------------------- Mon Sep 29 07:37:56 UTC 2025 - dmueller@suse.com -- 2.51.1