From 70dfe6b7cc0aefc72aae9a5961b7a4330fa20acedcb51f6dc692aaf9ee3828b3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jul 2011 07:49:02 +0000 Subject: [PATCH 1/4] 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 From 4afcf72f3dfea70a24aab1fa1b14f896e8892f9a3d97b4740cfc706c77bd377a Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 4 Jul 2011 09:43:18 +0000 Subject: [PATCH 2/4] - 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})); From 408e210c01c7e88c32613b7d177f939aff3db22b3c5c381f95c80f9bb0c1a65b 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 3/4] 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) ------------------------------------------------------------------- From a3b42bca7003cf22b3020cd1b859034e48b94dd23ae398c5542f078cbcd41fd8 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 4/4] 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) -------------------------------------------------------------------