From c894c3e72c15b5992ba6e520d9f0c888babcf8dbe6ce724721434553eb19a649 Mon Sep 17 00:00:00 2001 From: Mingxi Wu Date: Wed, 10 Feb 2010 11:29:37 +0000 Subject: [PATCH 1/7] Accepting request 31937 from home:prusnak:branches:M17N Copy from home:prusnak:branches:M17N/xemacs via accept of submit request 31937 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/31937 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=18 --- xemacs.changes | 5 +++++ xemacs.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/xemacs.changes b/xemacs.changes index 5f0099a..3e06708 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 9 17:12:35 CET 2010 - prusnak@suse.cz + +- build -el and -info as noarch subpackages + ------------------------------------------------------------------- Fri Dec 4 18:41:30 CET 2009 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index d654135..138e3a9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -117,6 +117,9 @@ Requires: xemacs xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n xemacs-el Most Emacs-Lisp source files are not needed for running XEmacs. Most of @@ -139,6 +142,9 @@ Requires: xemacs-packages-info Summary: Info Files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n xemacs-info This package contains all info files for XEmacs. All these files can be From ee79dc7148a998cbfa6de5f3dba57faf2667bae304579882b792cabb81bb690a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 24 Feb 2010 01:32:49 +0000 Subject: [PATCH 2/7] Accepting request 33080 from M17N checked in (request 33080) OBS-URL: https://build.opensuse.org/request/show/33080 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=20 --- xemacs.changes | 5 ----- xemacs.spec | 6 ------ 2 files changed, 11 deletions(-) diff --git a/xemacs.changes b/xemacs.changes index 3e06708..5f0099a 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Feb 9 17:12:35 CET 2010 - prusnak@suse.cz - -- build -el and -info as noarch subpackages - ------------------------------------------------------------------- Fri Dec 4 18:41:30 CET 2009 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 138e3a9..d654135 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -117,9 +117,6 @@ Requires: xemacs xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description -n xemacs-el Most Emacs-Lisp source files are not needed for running XEmacs. Most of @@ -142,9 +139,6 @@ Requires: xemacs-packages-info Summary: Info Files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description -n xemacs-info This package contains all info files for XEmacs. All these files can be From c3dff21d8de5da16625162fa55dffb4d66689ed94b590082c792669ced20d926 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 31 Mar 2010 13:15:04 +0000 Subject: [PATCH 3/7] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=21 --- ready | 0 xemacs.changes | 11 +++++++++++ xemacs.spec | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/xemacs.changes b/xemacs.changes index 5f0099a..d44f358 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 31 14:56:07 CEST 2010 - werner@suse.de + +- Change version scheme to allow zypper to install newer test + version (bnc#590429) + +------------------------------------------------------------------- +Tue Feb 9 17:12:35 CET 2010 - prusnak@suse.cz + +- build -el and -info as noarch subpackages + ------------------------------------------------------------------- Fri Dec 4 18:41:30 CET 2009 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index d654135..8c04d76 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,7 +1,7 @@ # # spec file for package xemacs (Version 21.5.b604d235f028) # -# 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 @@ -42,8 +42,8 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on -Version: 21.5.b604d235f028 -Release: 1 +Version: 21.5.29.b604d235f028 +Release: 2 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the Mercurial tree of XEmacs: @@ -113,10 +113,14 @@ Authors: %package -n xemacs-el License: GPLv2+ -Requires: xemacs xemacs-packages-el +Requires: xemacs == %{version}-%{release} +Requires: xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n xemacs-el Most Emacs-Lisp source files are not needed for running XEmacs. Most of @@ -139,6 +143,9 @@ Requires: xemacs-packages-info Summary: Info Files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n xemacs-info This package contains all info files for XEmacs. All these files can be From eb03910e1c0a639962f1dc83ea6e2524d47aa67183de2f0d360e2a3e63801cfa Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 1 Apr 2010 01:26:32 +0000 Subject: [PATCH 4/7] Accepting request 36263 from M17N checked in (request 36263) OBS-URL: https://build.opensuse.org/request/show/36263 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=22 --- xemacs.changes | 6 ------ xemacs.spec | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/xemacs.changes b/xemacs.changes index d44f358..3e06708 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 31 14:56:07 CEST 2010 - werner@suse.de - -- Change version scheme to allow zypper to install newer test - version (bnc#590429) - ------------------------------------------------------------------- Tue Feb 9 17:12:35 CET 2010 - prusnak@suse.cz diff --git a/xemacs.spec b/xemacs.spec index 8c04d76..bc99631 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -42,7 +42,7 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on -Version: 21.5.29.b604d235f028 +Version: 21.5.b604d235f028 Release: 2 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -113,8 +113,7 @@ Authors: %package -n xemacs-el License: GPLv2+ -Requires: xemacs == %{version}-%{release} -Requires: xemacs-packages-el +Requires: xemacs xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on From 0c02d7642ce5a28c1360106dcc1fe7588048872b322aa57bcc0e456cd4e936af Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 9 Sep 2010 11:41:57 +0000 Subject: [PATCH 5/7] Accepting request 47567 from home:a_jaeger:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/47567 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=23 --- xemacs.changes | 11 +++++++++++ xemacs.spec | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/xemacs.changes b/xemacs.changes index 3e06708..2d45eb1 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Sep 7 12:47:07 UTC 2010 - aj@suse.de + +- BuildRequire gpm-devel + +------------------------------------------------------------------- +Wed Mar 31 14:56:07 CEST 2010 - werner@suse.de + +- Change version scheme to allow zypper to install newer test + version (bnc#590429) + ------------------------------------------------------------------- Tue Feb 9 17:12:35 CET 2010 - prusnak@suse.cz diff --git a/xemacs.spec b/xemacs.spec index bc99631..3ce1ba4 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.b604d235f028) +# spec file for package xemacs (Version 21.5.29.b604d235f028) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,10 +18,16 @@ Name: xemacs -BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel %if %suse_version > 1020 BuildRequires: fdupes %endif +%if 0%{?suse_version} > 1130 +BuildRequires: gpm-devel +%else +BuildRequires: gpm +%endif + %if "%(xft-config --prefix)" == "/usr" %define appdefdir /usr/share/X11 %define xbindir /usr/bin @@ -42,8 +48,8 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on -Version: 21.5.b604d235f028 -Release: 2 +Version: 21.5.29.b604d235f028 +Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the Mercurial tree of XEmacs: @@ -113,7 +119,8 @@ Authors: %package -n xemacs-el License: GPLv2+ -Requires: xemacs xemacs-packages-el +Requires: xemacs == %{version}-%{release} +Requires: xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs AutoReqProv: on From a6380d0ec4f4ecb4841a34272f02b01a66ebeaf64c5ffa4fe4ca8906b0edba39 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 10 Sep 2010 13:11:14 +0000 Subject: [PATCH 6/7] Accepting request 47593 from M17N checked in (request 47593) OBS-URL: https://build.opensuse.org/request/show/47593 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=24 --- xemacs.changes | 5 ----- xemacs.spec | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xemacs.changes b/xemacs.changes index 2d45eb1..d44f358 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 7 12:47:07 UTC 2010 - aj@suse.de - -- BuildRequire gpm-devel - ------------------------------------------------------------------- Wed Mar 31 14:56:07 CEST 2010 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 3ce1ba4..a714d72 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -18,16 +18,10 @@ Name: xemacs -BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel %if %suse_version > 1020 BuildRequires: fdupes %endif -%if 0%{?suse_version} > 1130 -BuildRequires: gpm-devel -%else -BuildRequires: gpm -%endif - %if "%(xft-config --prefix)" == "/usr" %define appdefdir /usr/share/X11 %define xbindir /usr/bin From 976c9578c2ba2a1167553cd53b030e2d4de48d4ee0a1f172dd485c5b8c28153b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 10 Sep 2010 13:11:15 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/xemacs revision 52.0 OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=347861d2c633565283226a43ba5330db --- xemacs.changes | 5 +++++ xemacs.spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xemacs.changes b/xemacs.changes index d44f358..2d45eb1 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 7 12:47:07 UTC 2010 - aj@suse.de + +- BuildRequire gpm-devel + ------------------------------------------------------------------- Wed Mar 31 14:56:07 CEST 2010 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index a714d72..00518d9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -18,10 +18,16 @@ Name: xemacs -BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel gpm krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel %if %suse_version > 1020 BuildRequires: fdupes %endif +%if 0%{?suse_version} > 1130 +BuildRequires: gpm-devel +%else +BuildRequires: gpm +%endif + %if "%(xft-config --prefix)" == "/usr" %define appdefdir /usr/share/X11 %define xbindir /usr/bin @@ -43,7 +49,7 @@ Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on Version: 21.5.29.b604d235f028 -Release: 1 +Release: 4 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the Mercurial tree of XEmacs: