From 1d2d6dfb532b302fedbbd362a402ea7e31eb13de Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 29 Mar 2011 15:32:18 +0000 Subject: [PATCH] - make sure default.conf is no stale symlink OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=117 --- _service | 2 +- build-2011.01.20.tar.gz | 3 --- build-2011.03.29.tar.gz | 3 +++ build.changes | 5 +++++ build.spec | 5 +++-- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 build-2011.01.20.tar.gz create mode 100644 build-2011.03.29.tar.gz diff --git a/_service b/_service index 6ab4512..451c79e 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.01.20 + 2011.03.29 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz deleted file mode 100644 index e296a61..0000000 --- a/build-2011.01.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b528153350081d4c9f7733417b4ae9f328aeeaef79d7cc733ff4174032005e91 -size 254241 diff --git a/build-2011.03.29.tar.gz b/build-2011.03.29.tar.gz new file mode 100644 index 0000000..7f20583 --- /dev/null +++ b/build-2011.03.29.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9436cb4fe24a52e9fbe648daf1ff56b10da149f408d8c6ac66d8f692a85ea244 +size 264052 diff --git a/build.changes b/build.changes index f325397..cc2ec9a 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de + +- make sure default.conf is no stale symlink + ------------------------------------------------------------------- Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de diff --git a/build.spec b/build.spec index b4d8b83..c999226 100644 --- a/build.spec +++ b/build.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.01.20 +Version: 2011.03.29 Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz @@ -90,13 +90,14 @@ for generating delta rpm packages. %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +%if 0%{?suse_version} %if 0%{?sles_version} ln -s sles%{sles_version}.conf default.conf %else -%if 0%{?suse_version} V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf %endif +test -e default.conf %endif %files