From 5c8bdbb0dde09b2b7e3a1c32cd571529614ea7784c6f1d39fd03a18ae176df59 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 23 Feb 2010 13:36:10 +0000 Subject: [PATCH 1/2] - add conflicts for testing OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=19 --- filesystem.changes | 5 +++++ filesystem.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/filesystem.changes b/filesystem.changes index ef373ae..ac80038 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 23 14:35:40 CET 2010 - ro@suse.de + +- add conflicts for testing + ------------------------------------------------------------------- Wed Dec 9 18:46:00 CET 2009 - ro@suse.de diff --git a/filesystem.spec b/filesystem.spec index 52c9fa0..8e18839 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -28,6 +28,7 @@ Release: 15 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: aaa_dir Provides: aaa_dir +Conflicts: aaa_base < 11.2 Source: directory.list Source1: filesystem.links Source2: languages From a2e9e7e1a9589c533bcac496a4370b1abd29940043e0dbb04189702c1d79a788 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 23 Feb 2010 13:37:08 +0000 Subject: [PATCH 2/2] Accepting request 33241 from Base:System checked in (request 33241) OBS-URL: https://build.opensuse.org/request/show/33241 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=20 --- filesystem.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 8e18839..9d9f25e 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,7 +1,7 @@ # # spec file for package filesystem (Version 11.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ Group: System/Fhs AutoReqProv: on Summary: Basic Directory Layout Version: 11.2 -Release: 15 +Release: 16 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: aaa_dir Provides: aaa_dir -Conflicts: aaa_base < 11.2 +Conflicts: aaa_base < 11.2 Source: directory.list Source1: filesystem.links Source2: languages