From 33baa631f99cc98a16ff1617e22b7ad3e3cba00685cb029ba950ac7ac888a7d7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 13 Jul 2007 17:26:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=11 --- xemacs.changes | 6 ++++++ xemacs.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xemacs.changes b/xemacs.changes index 036083a..f29c649 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 12 12:46:38 CEST 2007 - mfabian@suse.de + +- add "Conflicts: gnuserv" (XEmacs already has it's own version + of gnuserv). + ------------------------------------------------------------------- Fri Jul 6 08:38:11 CEST 2007 - coolo@suse.de diff --git a/xemacs.spec b/xemacs.spec index 230a5b7..3d5327f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -34,9 +34,10 @@ Group: Productivity/Editors/Emacs Obsoletes: xe_exec Prereq: permissions Requires: xemacs-info xemacs-packages ctags +Conflicts: gnuserv Autoreqprov: on Version: 21.5.28 -Release: 11 +Release: 13 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -547,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Thu Jul 12 2007 - mfabian@suse.de +- add "Conflicts: gnuserv" (XEmacs already has it's own version + of gnuserv). * Fri Jul 06 2007 - coolo@suse.de - fixing the file list * Thu Jul 05 2007 - coolo@suse.de