Accepting request 75216 from openSUSE:Tools
- leave Version lines intact (fix issue with multiple version lines in a package, for example in if-constructs) OBS-URL: https://build.opensuse.org/request/show/75216 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=5
This commit is contained in:
commit
7e2a314a15
@ -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
|
Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ Requires: osc-source_validator
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is a source service for openSUSE Build Service.
|
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 .
|
%setup -q -D -T 0 -n .
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
|
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 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service
|
||||||
install -m 0644 %{SOURCE1} $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} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir /usr/lib/obs
|
%dir /usr/lib/obs
|
||||||
/usr/lib/obs/service
|
/usr/lib/obs/service
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -450,7 +450,7 @@ sub read_and_parse_old_spec {
|
|||||||
$version{$current_package} = $_;
|
$version{$current_package} = $_;
|
||||||
$version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/;
|
$version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/;
|
||||||
$replace_hash{"XXXVERSION $current_package"} = sprintf("%-16s%s","Version:",$version{$current_package});
|
$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";
|
push @oldspec, "XXXRELEASE $current_package";
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user