From b005befaeb74753f1ff3fcfb3b40960e3db47be572f955e618db2aec512f43a9 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sun, 28 Aug 2016 11:00:11 +0000 Subject: [PATCH] Accepting request 423514 from filesystems:ceph:kraken - pre_checkin.sh: forward-port insert_line_before() function from filesystems:ceph:jewel/ceph version - README-ceph-test.txt: new file - ceph-test.spec: add ceph_ver_hack.sh as a source file OBS-URL: https://build.opensuse.org/request/show/423514 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=62 --- ceph-test.changes | 8 ++++++++ ceph-test.spec | 2 ++ ceph.changes | 8 ++++++++ pre_checkin.sh | 9 +++++++++ 4 files changed, 27 insertions(+) diff --git a/ceph-test.changes b/ceph-test.changes index ee85ba9..bbdea6b 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Aug 28 10:55:04 UTC 2016 - ncutler@suse.com + +- pre_checkin.sh: forward-port insert_line_before() function from + filesystems:ceph:jewel/ceph version +- README-ceph-test.txt: new file +- ceph-test.spec: add ceph_ver_hack.sh as a source file + ------------------------------------------------------------------- Fri Aug 26 09:06:41 UTC 2016 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 1ecbd89..dea8178 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -75,6 +75,8 @@ Group: System/Filesystems %endif URL: http://ceph.com/ Source0: ceph-%{version}.tar.bz2 +Source97: ceph_ver_hack.sh +Source98: README-ceph-test.txt Source99: ceph-rpmlintrc %if 0%{?suse_version} %if 0%{?is_opensuse} diff --git a/ceph.changes b/ceph.changes index ee85ba9..bbdea6b 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Aug 28 10:55:04 UTC 2016 - ncutler@suse.com + +- pre_checkin.sh: forward-port insert_line_before() function from + filesystems:ceph:jewel/ceph version +- README-ceph-test.txt: new file +- ceph-test.spec: add ceph_ver_hack.sh as a source file + ------------------------------------------------------------------- Fri Aug 26 09:06:41 UTC 2016 - ncutler@suse.com diff --git a/pre_checkin.sh b/pre_checkin.sh index e0d7f7a..f91ab7f 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -255,6 +255,13 @@ function generate_rm_exclude_files { done } +function insert_line_before { + local FILE=$1 + local line_to_insert=$2 + local match_regex=$3 + sed -i "/${match_regex}/i $line_to_insert" $FILE +} + function copy_changes_file { local dest_pkg=$1 @@ -275,4 +282,6 @@ summ=`get_package_summary $SPEC_FILE $PACKAGE` desc=`get_package_description $SPEC_FILE $PACKAGE` reqs=`get_package_requires $SPEC_FILE $PACKAGE` transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec +insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:" +insert_line_before "${PACKAGE}.spec" "Source97: ceph_ver_hack.sh" "^Source98:" copy_changes_file $PACKAGE