From 31548fb92bae45202f8be58f809a65f03ab311fb443a4b191a58317fc8983345 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 30 May 2012 10:59:46 +0000 Subject: [PATCH 1/4] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=47 --- xemacs.changes | 5 +++++ xemacs.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xemacs.changes b/xemacs.changes index 511b447..6a49fdc 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 30 10:58:22 UTC 2012 - werner@suse.de + +- Hard coded attributes for /var/lib/xemacs/lock/ + ------------------------------------------------------------------- Fri May 25 15:00:21 UTC 2012 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index aef9b9f..5082a2a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -606,7 +606,7 @@ rm -rf %{buildroot} %dir /usr/share/xemacs/site-lisp/ %dir /usr/share/xemacs/site-lisp/lisp/ %dir /var/lib/xemacs/ -%dir %verify(not mode group) %attr(-,root,trusted) /var/lib/xemacs/lock/ +%dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/ %files -n xemacs-info %defattr(-,root,root) From 91f1d337d589fa441d1865c25abf2fe35d01e77bcfdf9b1bbb5e1ae6b326f235 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 31 May 2012 14:51:33 +0000 Subject: [PATCH 2/4] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=48 --- xemacs.changes | 5 +++++ xemacs.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xemacs.changes b/xemacs.changes index 6a49fdc..d0a04f2 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 14:51:02 UTC 2012 - werner@suse.de + +- Make /var/lib/xemacs/lock/ optional (bnc#764887) + ------------------------------------------------------------------- Wed May 30 10:58:22 UTC 2012 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 5082a2a..779e784 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -41,7 +41,6 @@ BuildRequires: gpm-devel %else BuildRequires: gpm %endif - %define appdefdir /usr/share/X11 %define xbindir /usr/bin %define xincludes /usr/include @@ -96,6 +95,8 @@ Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch %define _default_patch_fuzz 2 +%bcond_with lock + %description This is the current version of XEmacs, formerly known as Lucid-Emacs. It is related to other versions of Emacs, in particular GNU Emacs. Its @@ -379,8 +380,10 @@ set +o posix # mkdir -p %{buildroot}/usr/share/xemacs/site-lisp/lisp mkdir -p %{buildroot}/usr/share/xemacs/site-packages/lisp/term +%if %{with lock} mkdir -p %{buildroot}/var/lib/xemacs/lock chmod 1777 %{buildroot}/var/lib/xemacs/lock +%endif make DESTDIR=%{buildroot} install mv %{buildroot}%{xbindir}/xemacs-21.?-??? %{buildroot}%{xbindir}/xemacs # fix up the load-history to make it possible to use find-function @@ -528,6 +531,7 @@ cat xe-list-el-without-elc xe-list-elc-without-el xe-list-elc-with-el \ # packages: rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/ +%if %{with lock} %if %{defined verify_permissions} %verifyscript %verify_permissions -e /var/lib/xemacs/lock @@ -537,6 +541,7 @@ rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/ %post %set_permissions /var/lib/xemacs/lock %endif +%endif %clean rm -rf %{buildroot} @@ -606,7 +611,9 @@ rm -rf %{buildroot} %dir /usr/share/xemacs/site-lisp/ %dir /usr/share/xemacs/site-lisp/lisp/ %dir /var/lib/xemacs/ +%if %{with lock} %dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/ +%endif %files -n xemacs-info %defattr(-,root,root) From 333292d18edbf9e9208470e4720b0eebbbab5a9a451cd11c6cac187eeb7178d1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 31 May 2012 15:04:15 +0000 Subject: [PATCH 3/4] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=49 --- xemacs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 779e784..4a346cf 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -538,6 +538,7 @@ rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/ %endif %if %{defined set_permissions} + %post %set_permissions /var/lib/xemacs/lock %endif @@ -610,8 +611,8 @@ rm -rf %{buildroot} %dir /usr/share/xemacs/site-packages/lisp/term/ %dir /usr/share/xemacs/site-lisp/ %dir /usr/share/xemacs/site-lisp/lisp/ -%dir /var/lib/xemacs/ %if %{with lock} +%dir /var/lib/xemacs/ %dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/ %endif From da5b2e6c70a25bc8e6559241313535a04baa5a027da6f98084516a64c106d87a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 31 May 2012 15:31:11 +0000 Subject: [PATCH 4/4] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=50 --- xemacs-21.5.31-array.patch | 27 +++++++++++++++++++++++++++ xemacs.changes | 5 +++++ xemacs.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 xemacs-21.5.31-array.patch diff --git a/xemacs-21.5.31-array.patch b/xemacs-21.5.31-array.patch new file mode 100644 index 0000000..1d4769d --- /dev/null +++ b/xemacs-21.5.31-array.patch @@ -0,0 +1,27 @@ +--- src/events.c ++++ src/events.c 2012-05-31 15:13:06.832009873 +0000 +@@ -1611,8 +1611,11 @@ upshift_event (Lisp_Object event) + XSET_EVENT_KEY_KEYSYM (event, make_char (c + 'A' - 'a')); + else + if (!(XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_SHIFT)) +- XSET_EVENT_KEY_MODIFIERS +- (event, XEVENT_KEY_MODIFIERS (event) |= XEMACS_MOD_SHIFT); ++ { ++ Lisp_Object tmp = XEVENT_KEY_MODIFIERS (event); ++ tmp |= XEMACS_MOD_SHIFT; ++ XSET_EVENT_KEY_MODIFIERS (event, tmp); ++ } + } + + void +--- src/mule-wnnfns.c ++++ src/mule-wnnfns.c 2012-05-31 15:27:10.952509987 +0000 +@@ -2117,7 +2117,7 @@ yes_or_no (UExtbyte *s) + c2m (s, mbuf, charset); + /* truncate "(Y/N)" */ + for (len = 0; (mbuf[len]) && (len < 512); len++); +- for (; (mbuf[len] != '(') && (len > 0); len--); ++ for (len--; (mbuf[len] != '(') && (len >= 0); len--); + { + Lisp_Object yes, str; + struct gcpro gcpro1; diff --git a/xemacs.changes b/xemacs.changes index d0a04f2..0975723 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 15:30:38 UTC 2012 - werner@suse.de + +- Fix compiler warnings + ------------------------------------------------------------------- Thu May 31 14:51:02 UTC 2012 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 4a346cf..1312cbb 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -90,6 +90,7 @@ Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch +Patch53: xemacs-21.5.31-array.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -168,6 +169,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar. %patch51 -p0 %patch52 -p0 %endif +%patch53 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1