pool/emacs
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

cleanups

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=248
This commit is contained in:
Dr. Werner Fink
2018-06-07 08:16:01 +00:00
committed by Git OBS Bridge
parent 83fec1e77d
commit 64ddcdf217
2 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
emacs.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 7 08:14:04 UTC 2018 - werner@suse.de
- Cleanup the spec file by removing old suse_versions
and reordering configure options
- Add some missed packages for configure
- Avoid Xwidgets on 32bit architectures as this does not build
-------------------------------------------------------------------
Tue May 29 13:09:38 UTC 2018 - werner@suse.de

89
emacs.spec
View File

@@ -17,9 +17,7 @@
%bcond_with autoconf
%if %{suse_version} >= 1330
%bcond_without autoconf
%endif
# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
%bcond_with cairo
@@ -31,26 +29,16 @@ BuildRequires: autoconf
BuildRequires: automake
%endif
BuildRequires: alsa-devel
%if %{with cairo} && 0%{?suse_version} > 1130
%if %{with cairo}
BuildRequires: cairo-devel
%endif
BuildRequires: dbus-1-devel
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: fonts-config
BuildRequires: freetype2-devel
BuildRequires: gconf2-devel
BuildRequires: giflib-devel
%if 0%{?suse_version} > 1130
BuildRequires: gpm-devel
%else
BuildRequires: gpm
%endif
%if 0%{?suse_version} > 1130
BuildRequires: gtk3-devel
%else
BuildRequires: gtk2-devel
%endif
# Used for installtion of info pages as well as to
# detect if the page info.info is part of that package
BuildRequires: info
@@ -63,32 +51,26 @@ BuildRequires: libpng-devel
BuildRequires: librsvg-devel
BuildRequires: libselinux-devel
BuildRequires: libtiff-devel
%if 0%{?suse_version} > 1140
BuildRequires: libudev-devel
%endif
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.12
%else
BuildRequires: libwebkitgtk3-devel
%endif
BuildRequires: libxml2-devel
BuildRequires: m17n-lib-devel
BuildRequires: ncurses-devel
%if 0%{?suse_version} > 1220
BuildRequires: makeinfo
%else
BuildRequires: texinfo
%endif
BuildRequires: ncurses-devel
BuildRequires: update-alternatives
BuildRequires: update-desktop-files
BuildRequires: xz
BuildRequires: zlib-devel
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.12
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xaw3d)
@@ -104,13 +86,9 @@ BuildRequires: pkgconfig(xt)
Url: http://www.gnu.org/software/emacs/
Version: 26.1
Release: 0
%if 0%{suse_version} >= 1300
Requires: etags
%else
Requires: ctags
%endif
Requires: emacs-info = %{version}
Requires: emacs_program = %{version}-%{release}
Requires: etags
Summary: GNU Emacs Base Package
License: GPL-3.0-or-later
Group: Productivity/Editors/Emacs
@@ -204,9 +182,7 @@ Support.
Requires: emacs = %{version}-%{release}
Summary: Several Lisp Files for GNU Emacs
Group: Productivity/Editors/Emacs
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description -n emacs-el
Several Lisp files not needed for running GNU Emacs. Most of these
@@ -217,16 +193,13 @@ Summary: Info files for GNU Emacs
Group: Productivity/Editors/Emacs
Requires(post): %install_info_prereq
Requires(preun): %install_info_prereq
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description -n emacs-info
This package contains all the Info files for GNU Emacs. These files can
be read online with GNU Emacs. They describe Emacs and some of its
modes.
%if 0%{suse_version} >= 1300
%package -n etags
Summary: Generate Tag Files for Use with Emacs
Group: Development/Tools/Navigators
@@ -238,7 +211,6 @@ Provides: ctags:/usr/bin/etags
ETags generates tag files from source code in Pascal, Cobol, Ada, Perl,
LaTeX, Scheme, Emacs Lisp/Common Lisp, Postscript, Erlang, Python, Prolog,
and most assembler-like syntaxes.
%endif
%prep
%setup -q -b 2
@@ -283,13 +255,11 @@ autoreconf -fiv
%endif
# make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
%if %suse_version >= 1110
%ifarch ppc ppc64 ia64
%if %(getconf PAGESIZE) != 65536
%error "Error: wrong build host, PAGESIZE must be 65536"
exit 1
%endif
%endif
%endif
exec_shield=0
if test -e /proc/sys/kernel/exec-shield; then
@@ -374,6 +344,7 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS
--enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp
"
DESKTOP="--with-x \
--with-xim \
--with-sound \
--with-xpm \
--with-jpeg \
@@ -386,21 +357,22 @@ DESKTOP="--with-x \
--without-gpm \
"
GTK="${DESKTOP} \
%if 0%{?suse_version} > 1130
--with-x-toolkit=gtk3 \
--with-xwidgets \
%else
--with-x-toolkit=gtk2 \
%endif
--with-toolkit-scroll-bars \
--x-includes=%{_x11inc} \
--x-libraries=%{_x11lib} \
--with-libotf \
--with-m17n-flt \
%if %{with cairo} && 0%{?suse_version} > 1130
%if %{with cairo}
--with-cairo \
%endif
"
if (($(getconf LONG_BIT) >= 62))
then
# Does not compile on 32bit architecture due failing
# `verify (USE_LSB_TAG)' in src/xwidget.c
GTK="${GTK} --with-xwidgets"
fi
X11="${DESKTOP} \
--with-x-toolkit=lucid \
--with-toolkit-scroll-bars \
@@ -411,6 +383,7 @@ DESKTOP="--with-x \
"
NOX11="--with-gpm \
--without-x \
--without-xim \
--without-sound \
--without-xpm \
--without-jpeg \
@@ -427,12 +400,14 @@ DESKTOP="--with-x \
--without-hesiod \
--with-kerberos \
--with-kerberos5 \
--with-xim \
--with-wide-int \
--with-file-notification=inotify \
--with-modules \
--enable-autodepend \
"
if (($(getconf LONG_BIT) < 62))
then
COMP="${COMP} --with-wide-int"
fi
##OIFS="$IFS"; IFS=.
##set -- $(gcc -dumpversion 2>/dev/null)
@@ -546,13 +521,8 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ps-mule.el.mule
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/startup.el.iconic
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.mule
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/term.el.term
%if 0%{suse_version} < 1300
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ctags.1
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/etags.1
%else
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/ETAGS.README
%endif
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/elc.tar.gz
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.snd
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el.psbdf
@@ -612,17 +582,11 @@ echo 'X-KDE-StartupNotify=false' >> etc/emacs.desktop
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacs.desktop
cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png
%suse_update_desktop_file -r -i emacs TextEditor Utility
%if 0%{suse_version} >= 1300
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -sf %{_sysconfdir}/alternatives/ctags %{buildroot}%{_bindir}/ctags
ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man} %{buildroot}%{_mandir}/man1/ctags.1%{ext_man}
ln -sf %{_bindir}/gnuctags %{buildroot}%{_sysconfdir}/alternatives/ctags
ln -sf %{_mandir}/man1/gnuctags.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/ctags.1%{ext_man}
%else
rm -vf %{buildroot}%{_bindir}/etags
rm -vf %{buildroot}%{_bindir}/gnuctags
rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1*
%endif
%pre
test -L usr/bin/emacs && rm -f usr/bin/emacs || true
@@ -661,7 +625,6 @@ for f in %info_files; do
%install_info_delete --info-dir=%{_infodir} "%{_infodir}/$f.gz"
done
%if 0%{suse_version} >= 1300
%post -n etags
test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags
%{_sbindir}/update-alternatives --quiet --force --install \
@@ -673,7 +636,6 @@ test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags
if test $1 -eq 0 ; then
%{_sbindir}/update-alternatives --quiet --remove ctags %{_bindir}/gnuctags
fi
%endif
%files -f site-lisp.lst -n emacs
%defattr(-, root, root)
@@ -703,10 +665,6 @@ fi
%doc %{_datadir}/emacs/%{version}/etc/DISTRIB
%{_datadir}/emacs/%{version}/etc/DOC
%doc %{_datadir}/emacs/%{version}/etc/ERC-NEWS
%if 0%{suse_version} < 1300
%doc %{_datadir}/emacs/%{version}/etc/ETAGS.EBNF
%doc %{_datadir}/emacs/%{version}/etc/ETAGS.README
%endif
%doc %{_datadir}/emacs/%{version}/etc/FTP
%doc %{_datadir}/emacs/%{version}/etc/GNU
%doc %{_datadir}/emacs/%{version}/etc/GNUS-NEWS
@@ -3223,9 +3181,6 @@ fi
%{_bindir}/emacs-gtk
%dir %{appDefaultsDir}
%{appDefaultsFile}
%if 0%{suse_version} < 1320
%dir %{_datadir}/appdata/
%endif
%{_datadir}/appdata/emacs.appdata.xml
%{_datadir}/applications/emacs.desktop
%{_datadir}/icons/hicolor/128x128/apps/emacs.png
@@ -4708,7 +4663,6 @@ fi
%{_datadir}/emacs/%{version}/lisp/xt-mouse.el.gz
%{_datadir}/emacs/%{version}/lisp/xwidget.el.gz
%if 0%{suse_version} >= 1300
%files -n etags
%defattr(-,root,root)
%doc etc/ETAGS.EBNF
@@ -4721,6 +4675,5 @@ fi
%ghost %{_sysconfdir}/alternatives/ctags
%ghost %{_mandir}/man1/ctags.1%{ext_man}
%ghost %{_sysconfdir}/alternatives/ctags.1%{ext_man}
%endif
%changelog