Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory checked in at 2012-02-22 15:54:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc-source_validator (Old)
and /work/SRC/openSUSE:Factory/.osc-source_validator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc-source_validator", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/osc-source_validator/osc-source_validator.changes
2012-02-21 12:22:29.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.osc-source_validator.new/osc-source_validator.changes
2012-02-22 15:54:06.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 22 10:50:13 CET 2012 - [email protected]
+
+- use old pathes again in osc-source-validator,
+ not the service ones
+
+-------------------------------------------------------------------
New:
----
revert-old.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.epGCjB/_old 2012-02-22 15:54:07.000000000 +0100
+++ /var/tmp/diff_new_pack.epGCjB/_new 2012-02-22 15:54:07.000000000 +0100
@@ -23,6 +23,7 @@
Group: Development/Tools/Building
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
Source: %{name}-%{version}.tar.bz2
+Patch: revert-old.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: perl-TimeDate
@@ -32,6 +33,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch -p1 -R
%build
++++++ revert-old.diff ++++++
commit 8a76e71cf7bd2cfe8ab7592adf9d02ce3ddcbe4b
Author: Adrian Schröter <[email protected]>
Date: Fri Sep 23 10:27:23 2011 +0200
- change pathes to use obs-service path instead of osc one
diff --git a/30-patches-applied b/30-patches-applied
index 058b169..e3546f4 100755
--- a/30-patches-applied
+++ b/30-patches-applied
@@ -15,7 +15,7 @@ for i in $DIR_TO_CHECK/*.spec ; do
test "$VERBOSE" = true && echo -n "."
RETURN=0
# WARNING only at the moment, just complain loudly ...
- /usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i
|| RETURN=1
+ /usr/lib/obs/service/source_validators/helpers/check_patches_applied
$BATCHMODE $i || RETURN=1
done
test "$VERBOSE" = true && echo "done"
diff --git a/40-sequence-changes b/40-sequence-changes
index e065b72..4b46071 100755
--- a/40-sequence-changes
+++ b/40-sequence-changes
@@ -19,12 +19,12 @@ for i in $DIR_TO_CHECK/*.changes ; do
continue
fi
fi
- /usr/lib/osc/source_validators/helpers/check_dates_in_changes $i || {
- echo "Please fix with your own tools or try
/usr/lib/osc/source_validators/helpers/fix_changelog" >&2;
+ /usr/lib/obs/service/source_validators/helpers/check_dates_in_changes $i
|| {
+ echo "Please fix with your own tools or try
/usr/lib/obs/service/source_validators/helpers/fix_changelog" >&2;
RETURN=1
}
- /usr/lib/osc/source_validators/helpers/convert_changes_to_rpm_changelog
--check < $i > /dev/null || {
- echo "Please fix with your own tools or try
/usr/lib/osc/source_validators/helpers/fix_changelog" >&2;
+
/usr/lib/obs/service/source_validators/helpers/convert_changes_to_rpm_changelog
--check < $i > /dev/null || {
+ echo "Please fix with your own tools or try
/usr/lib/obs/service/source_validators/helpers/fix_changelog" >&2;
RETURN=1
}
diff --git a/45-stale-changes b/45-stale-changes
index 12c2c40..2664b26 100755
--- a/45-stale-changes
+++ b/45-stale-changes
@@ -9,7 +9,7 @@ test -z "$DESTINATIONDIR" -a -d "$DIR_TO_CHECK/.osc" &&
DESTINATIONDIR="$DIR_TO_
RETURN=0
test "$VERBOSE" = true && echo -n "- checking for stale or missing changes "
-SPECLIST=`/usr/lib/osc/source_validators/helpers/output_versions -q -m
$DIR_TO_CHECK | sed -e "s@ .*@@" | sort -u`
+SPECLIST=`/usr/lib/obs/service/source_validators/helpers/output_versions -q -m
$DIR_TO_CHECK | sed -e "s@ .*@@" | sort -u`
test -n "$SPECLIST" && {
for i in $SPECLIST ; do
diff --git a/get_source.sh b/get_source.sh
index d8e75a4..6f17163 100644
--- a/get_source.sh
+++ b/get_source.sh
@@ -1,25 +1,25 @@
#!/bin/bash
-rm -rf osc-source_validator
-mkdir osc-source_validator
+rm -rf obs-service-source_validator
+mkdir obs-service-source_validator
for i in /work/cd/lib/source_validators/* ; do
test -f $i || continue
case $i in *abuild*) continue ;; esac
- sed -e "s@/work/cd/lib@/usr/lib/osc@" $i > osc-source_validator/`basename
$i`
- chmod 755 osc-source_validator/`basename $i`
+ sed -e "s@/work/cd/lib@/usr/lib/obs/service" $i >
obs-service-source_validator/`basename $i`
+ chmod 755 obs-service-source_validator/`basename $i`
done
-mkdir osc-source_validator/helpers
+mkdir obs-service-source_validator/helpers
for i in /work/cd/lib/source_validators/helpers/* ; do
test -f $i || continue
- sed -e "s@/work/cd/lib@/usr/lib/osc@" -e
"s@/work/src/bin/tools/release_2_pdb_release@echo@" -e
"s@/work/abuild/lib/abuild/modules@/usr/lib/build@" -e "s@use dateparse@use
Date::Parse@" -e "s@use timezone@use Time::Zone@" $i >
osc-source_validator/helpers/`basename $i`
- chmod 755 osc-source_validator/helpers/`basename $i`
+ sed -e "s@/work/cd/lib@/usr/lib/obs/service" -e
"s@/work/src/bin/tools/release_2_pdb_release@echo@" -e
"s@/work/abuild/lib/abuild/modules@/usr/lib/build@" -e "s@use dateparse@use
Date::Parse@" -e "s@use timezone@use Time::Zone@" $i >
obs-service-source_validator/helpers/`basename $i`
+ chmod 755 obs-service-source_validator/helpers/`basename $i`
done
rm -rf t
mkdir t
cd t
-tar xjfp ../osc-source_validator.tar.bz2
+tar xjfp ../obs-service-source_validator.tar.bz2
cd ..
-diff -urN t/osc-source_validator osc-source_validator
+diff -urN t/obs-service-source_validator obs-service-source_validator
rm -rf t
-tar cjfp osc-source_validator.tar.bz2 osc-source_validator
+tar cjfp obs-service-source_validator.tar.bz2 obs-service-source_validator
diff --git a/helpers/fix_changelog b/helpers/fix_changelog
index aef4db1..d61a584 100755
--- a/helpers/fix_changelog
+++ b/helpers/fix_changelog
@@ -23,7 +23,7 @@ if [ -n "$CHANGES_EXIST" ]; then
for i in $DIR/*.changes ; do
test -f $i || continue
echo "processing $i:"
- /usr/lib/osc/source_validators/helpers/changelogfilter $i > $i.tmp
+ /usr/lib/obs/service/source_validators/helpers/changelogfilter $i > $i.tmp
if test -s $i.tmp ; then
mv $i.tmp $i
else
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
