From 7f93ff9ddc2aca1289bf1f1bb4f8529f603701d81904902ffd2cecfd64268486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 19 Mar 2012 15:00:14 +0000 Subject: [PATCH] Accepting request 109961 from openSUSE:Tools:Unstable new osc, use the new source validator OBS-URL: https://build.opensuse.org/request/show/109961 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-source_validator?expand=0&rev=14 --- obs-service-source_validator-0.2.tar.bz2 | 3 + obs-service-source_validator.changes | 137 ++++++++++++++++++++++- obs-service-source_validator.spec | 26 +++-- source_validator | 36 ------ source_validator.service | 5 - 5 files changed, 152 insertions(+), 55 deletions(-) create mode 100644 obs-service-source_validator-0.2.tar.bz2 delete mode 100644 source_validator delete mode 100644 source_validator.service diff --git a/obs-service-source_validator-0.2.tar.bz2 b/obs-service-source_validator-0.2.tar.bz2 new file mode 100644 index 0000000..d29de6f --- /dev/null +++ b/obs-service-source_validator-0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c13200dc7bbc5b8a272f3f39dc587d4a71feaa1addf1d0086a59d9ee78820a65 +size 17901 diff --git a/obs-service-source_validator.changes b/obs-service-source_validator.changes index a15f547..1fb8f2b 100644 --- a/obs-service-source_validator.changes +++ b/obs-service-source_validator.changes @@ -3,18 +3,147 @@ Mon Feb 27 10:54:20 CET 2012 - dmueller@suse.de - fix requires for factory +------------------------------------------------------------------- +Tue Feb 14 10:14:25 UTC 2012 - adrian@suse.de + +- add requires to perl-TimeDate + ------------------------------------------------------------------- Mon Feb 13 10:51:16 UTC 2012 - coolo@suse.com - patch license to follow spdx.org standard ------------------------------------------------------------------- -Wed May 25 15:47:48 UTC 2011 - adrian@suse.de +Mon Feb 13 10:51:16 UTC 2012 - ro@suse.com -- make service runable on server side as well +- do not complain for commented out rpmlintrc lines +- Update 20-files-present-and-referenced to ignore .git and + .emacs.backup +- Change bright yellow into good old brown ------------------------------------------------------------------- -Wed May 25 13:07:45 UTC 2011 - adrian@suse.de +Fri Sep 23 08:30:45 UTC 2011 - adrian@suse.de -- initial package of our new source validator (created by Rudi) +- rename osc-source_validator package into osc-service-source_validator +- obsolete osc-source_validator +- roll tar ball from new git at github.com + +------------------------------------------------------------------- +Fri Jul 1 17:12:32 CEST 2011 - ro@suse.de + +- prevent dupes for Release and Version along with Name + +------------------------------------------------------------------- +Mon May 30 11:53:53 CEST 2011 - ro@suse.de + +- fix bug with "Patch" in comments + +------------------------------------------------------------------- +Mon May 9 13:47:29 UTC 2011 - ro@novell.com + +- try to fix bnc#679980 + +------------------------------------------------------------------- +Wed Apr 20 17:30:19 CEST 2011 - ro@suse.de + +- find another form of commenting out patches + in check_patches_applied + +------------------------------------------------------------------- +Mon Apr 18 01:06:59 CEST 2011 - ro@suse.de + +- Also check if files are tracked by osc +- catch some more syntax variants in check_patches_applied +- do tracked-check only in osc mode + +------------------------------------------------------------------- +Tue Apr 12 16:40:58 CEST 2011 - ro@suse.de + +- activate the patches_applied check for real, + errors out if errors found + +------------------------------------------------------------------- +Mon Apr 4 13:15:11 CEST 2011 - ro@suse.de + +- add debian special files + +------------------------------------------------------------------- +Wed Mar 30 12:38:16 CEST 2011 - ro@suse.de + +- add colors to output of check_patches_applied + but no colors for batchmode + +------------------------------------------------------------------- +Fri Feb 18 11:39:29 UTC 2011 - jw@novell.com + +- retry broken sr#59008 +- added another set of runtime-fixes.diff + * accept .orig and ~ files in working directories. + * UI consistency improved. + +------------------------------------------------------------------- +Sat Feb 12 11:10:42 UTC 2011 - ro@novell.com + +- 50-spec-version: show warning only once per specfile + +------------------------------------------------------------------- +Thu Jan 13 14:29:54 CET 2011 - ro@suse.de + +- move COPYING file to docdir (prevent permission denied trying + to execute it as a checkscript) + +------------------------------------------------------------------- +Thu Jan 13 12:52:36 CET 2011 - ro@suse.de + +- switch source to git (gitorious/opensuse) +- convert_changes_to_rpm_changelog make regex a little stricter + looking for date line +- 20-files-present-and-referenced add %rubygems_requires to + prunelist +- add some helper files to create tar and changes +- stale-changes: do not fail if there is no specfile present at all +- stale-changes: allow extra changes files if listed as source in a + spec + +------------------------------------------------------------------- +Tue Jan 4 16:09:56 CET 2011 - mcihar@suse.cz + +- add Url pointing to wiki to spec file + +------------------------------------------------------------------- +Tue Jan 4 16:07:42 CET 2011 - mcihar@suse.cz + +- cleanup spec file using spec-cleaner + +------------------------------------------------------------------- +Tue Jan 4 16:05:39 CET 2011 - mcihar@suse.cz + +- create 0.1 tarball with incorporated patch and added license file +- adjust spec file for above changes + +------------------------------------------------------------------- +Mon Oct 4 07:32:21 UTC 2010 - adrian@suse.de + +- do not complain about files starting with underscore, they are + OBS special files in any case + +------------------------------------------------------------------- +Sat May 22 06:38:35 UTC 2010 - adrian@suse.de + +- add some modification to survive some more examples + +------------------------------------------------------------------- +Thu May 20 18:11:38 CEST 2010 - ro@suse.de + +- make the files executable + +------------------------------------------------------------------- +Thu May 20 17:40:29 CEST 2010 - ro@suse.de + +- fill with some content + +------------------------------------------------------------------- +Thu May 20 05:56:47 UTC 2010 - adrian@suse.de + +- initial package, no code yet, always succeeding diff --git a/obs-service-source_validator.spec b/obs-service-source_validator.spec index ab98705..12f4b90 100644 --- a/obs-service-source_validator.spec +++ b/obs-service-source_validator.spec @@ -20,13 +20,18 @@ Name: obs-service-source_validator Summary: An OBS source service: running all the osc source-validator checks License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.1 +Summary: An OBS source service: defines all source-validator checks used by Factory +Group: Development/Tools/Building +Version: 0.2 Release: 0 -Source: source_validator -Source1: source_validator.service -Requires: osc-source_validator +# From git@github.com:openSUSE/obs-service-source_validator.git +Source: %{name}-%{version}.tar.bz2 +Requires: perl-TimeDate BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Requires: perl-TimeDate +Provides: osc-source_validator = %version +Obsoletes: osc-source_validator <= 0.1 %if %suse_version > 1210 Requires: rpm-build %endif @@ -34,23 +39,24 @@ Requires: rpm-build %description This is a source service for openSUSE Build Service. -This service runs all checks from osc-source_validator. This can be used +This service runs all checks as required by openSUSE:Factory project. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services. %prep - -%setup -q -D -T 0 -n . +%setup -q %build %install -mkdir -p $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 +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/obs/service/source_validators/ +install -m 0755 source_validator $RPM_BUILD_ROOT%{_prefix}/lib/obs/service +install -m 0644 source_validator.service $RPM_BUILD_ROOT%{_prefix}/lib/obs/service +cp -a [0-9]* helpers %{buildroot}%{_prefix}/lib/obs/service/source_validators %files %defattr(-,root,root) +%doc COPYING %dir /usr/lib/obs /usr/lib/obs/service diff --git a/source_validator b/source_validator deleted file mode 100644 index 5f8b6b4..0000000 --- a/source_validator +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Verify local source via osc-source_validator - - -while test $# -gt 0; do - case $1 in - *-outdir) - # just dummy ... - MYOUTDIR="$2" - shift - ;; - *) - echo Unknown parameter $1. - echo 'Usage: this service is not excepting parameters' - exit 1 - ;; - esac - shift -done - -FILE="${PATH##*/}" - -RETURN=0 -for i in /usr/lib/osc/source_validators/*; do - if [ -f "$i" ]; then - if [ -z "$PS1" ]; then - "$i" --batchmode || RETURN=1 - else - "$i" || RETURN=1 - fi - fi -done - -exit $RETURN - diff --git a/source_validator.service b/source_validator.service deleted file mode 100644 index 8b502ac..0000000 --- a/source_validator.service +++ /dev/null @@ -1,5 +0,0 @@ - - Validate sources - The default SUSE source validator which catches common pitfalls before build. - -