From 5936ba03ea436cb805ef46dd1befbc72fe0c2f6603f41e9d0da6cefbe251ec87 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 1 Feb 2012 09:00:53 +0000 Subject: [PATCH] Accepting request 102159 from Java:packages - remove file conflict between xpp2 and xpp2-manual OBS-URL: https://build.opensuse.org/request/show/102159 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xpp2?expand=0&rev=10 --- xpp2.changes | 5 +++++ xpp2.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xpp2.changes b/xpp2.changes index 186cdfc..36c5d6f 100644 --- a/xpp2.changes +++ b/xpp2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 31 10:17:26 UTC 2012 - mvyskocil@suse.cz + +- remove file conflict between xpp2 and xpp2-manual + ------------------------------------------------------------------- Tue May 12 15:28:12 CEST 2009 - mvyskocil@suse.cz diff --git a/xpp2.spec b/xpp2.spec index 2c37b64..affee81 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -1,7 +1,7 @@ # -# spec file for package xpp2 (Version 2.1.10) +# spec file for package xpp2 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -178,6 +178,8 @@ fi %defattr(0644,root,root,0755) %{_datadir}/doc/%{name}-%{version} %{_datadir}/doc/%{name} +%exclude %{_datadir}/doc/%{name}-%{version}/README.html +%exclude %{_datadir}/doc/%{name}-%{version}/LICENSE.txt %files demo %defattr(0644,root,root,0755) @@ -185,5 +187,3 @@ fi %{_datadir}/%{name} %changelog -* Tue May 12 2009 mvyskocil@suse.cz -- Initial packaging of xpp2 2.1.10 (from jpackage.org)