From 6aa937bd5a965ddad314b346c70c88c0900b0696f19d75417a4f2f501954f3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Dec 2009 07:11:43 +0000 Subject: [PATCH] temp hotfix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inst-source-utils?expand=0&rev=21 --- fixit.diff | 15 +++++++++++++++ inst-source-utils.changes | 6 ++++++ inst-source-utils.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 fixit.diff diff --git a/fixit.diff b/fixit.diff new file mode 100644 index 0000000..e7404b9 --- /dev/null +++ b/fixit.diff @@ -0,0 +1,15 @@ +--- usr/bin/create_sha1sums 2009-11-02 16:06:59.000000000 +0100 ++++ usr/bin/create_sha1sums 2009-12-01 08:01:55.810423807 +0100 +@@ -87,9 +87,9 @@ + DESCRDIR="suse/setup/descr" + fi + if test -d $CDS_PRIM/$DESCRDIR ; then +- pushd $CDS_PRIM/$DESCRDIR >/dev/null +- rm -f *.asc +- sha1sum * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META SHA1 @" >> $CDS_PRIM/content ++ pushd $CDS_PRIM >/dev/null ++ rm -f $DESCRDIR/*.asc ++ sha1sum $DESCRDIR/* 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META SHA1 @" >> $CDS_PRIM/content + popd >/dev/null + fi + pushd $CDS_PRIM >/dev/null diff --git a/inst-source-utils.changes b/inst-source-utils.changes index 8a5e386..3f92373 100644 --- a/inst-source-utils.changes +++ b/inst-source-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 1 07:03:23 UTC 2009 - adrian@suse.de + +- apply patch to fix content file generation + (pattern files have no path prefix) + ------------------------------------------------------------------- Mon Nov 2 13:41:07 CET 2009 - ro@suse.de diff --git a/inst-source-utils.spec b/inst-source-utils.spec index d391a9c..438fdcc 100644 --- a/inst-source-utils.spec +++ b/inst-source-utils.spec @@ -31,6 +31,7 @@ Provides: autoyast2-utils = 2.14.10 Recommends: create-repo-utils Source: inst-source-utils.tar.bz2 Source1: split.pl +Patch1: fixit.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,6 +45,7 @@ description of each script. %prep %setup -n %{name} -q +%patch1 %build