automatic import of emacs

1 files changed, 48 insertions, 28 deletions

diff --git a/emacs.spec b/emacs.spec
index 9762deb..e4fbf2e 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -29,16 +29,46 @@ Patch1002:        emacs-system-crypto-policies.patch
 
 Patch9000:        emacs-deal-taboo-words.patch
 
-BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel
-BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel
-BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-devel libtiff-devel
-BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm-devel libX11-devel
-BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel
-BuildRequires: xorg-x11-proto-devel pkgconfig(webkit2gtk-4.1) librsvg2-devel
-BuildRequires: autoconf harfbuzz-devel jansson-devel systemd-devel gnupg2
-BuildRequires: libotf-devel m17n-lib-devel liblockfile-devel
-
-# For lucid
+BuildRequires: make gcc
+BuildRequires: autoconf automake libtool
+BuildRequires: pkgconfig(MagickWand) >= 7
+BuildRequires: pkgconfig(alsa) >= 1.0.0
+BuildRequires: pkgconfig(cairo) >= 1.8.0
+BuildRequires: pkgconfig(cairo-xcb) >= 1.8.0
+BuildRequires: pkgconfig(dbus-1) >= 1.0
+BuildRequires: pkgconfig(fontconfig) >= 2.2.0
+BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(freetype2) >= 2.5.0
+BuildRequires: pkgconfig(gio-2.0) >= 2.24
+BuildRequires: pkgconfig(gio-2.0) >= 2.26
+BuildRequires: pkgconfig(glib-2.0) >= 2.37.5
+BuildRequires: pkgconfig(gnutls) >= 2.12.2
+BuildRequires: pkgconfig(gobject-2.0) >= 2.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
+BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
+BuildRequires: pkgconfig(jansson) >= 2.7
+BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libotf])
+BuildRequires: pkgconfig(libpng) >= 1.0.0
+BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0
+BuildRequires: pkgconfig(libseccomp) >= 2.5.2
+BuildRequires: pkgconfig(libsystemd) >= 222
+BuildRequires: pkgconfig(libwebpdemux) >= 0.6.0
+BuildRequires: pkgconfig(libxml-2.0) > 2.6.17
+BuildRequires: pkgconfig(m17n-flt)
+BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.12
+BuildRequires: pkgconfig(xfixes) >= 4.0.0
+BuildRequires: pkgconfig(xft) >= 0.13.0
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama) >= 1.0.2
+BuildRequires: pkgconfig(xrandr) >= 1.2.2
+BuildRequires: giflib-devel
+BuildRequires: gpm-devel
+BuildRequires: libacl-devel
+BuildRequires: libjpeg-devel
+BuildRequires: liblockfile-devel
+BuildRequires: libtiff-devel
+BuildRequires: ncurses-devel
 BuildRequires: Xaw3d-devel
 
 %ifarch %{ix86}
@@ -169,10 +199,10 @@ export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fPIE"
 mkdir build-gtk && cd build-gtk
 ln -s ../configure .
 
-%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
            --with-harfbuzz --with-cairo --with-json \
-           --with-xwidgets --with-modules   --without-libotf --without-m17n-flt --without-imagemagick
+           --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick
 %make_build bootstrap
 %{setarch} %make_build
 cd ..
@@ -182,7 +212,7 @@ cd ..
 mkdir build-lucid && cd build-lucid
 ln -s ../configure .
 
-%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
            --with-harfbuzz --with-cairo --with-json \
            --with-modules --without-libotf --without-m17n-flt --without-imagemagick
@@ -197,7 +227,7 @@ ln -s ../configure .
 
 LDFLAGS="-Wl,-z,relro,-z,now -pie";  export LDFLAGS;
 
-%configure --with-x=no --with-modules --with-json
+%configure --with-x=no --with-modules --with-json --without-gconf
 %{setarch} %make_build
 cd ../
 
@@ -255,11 +285,11 @@ mv ctags gctags
 popd
 
 pushd %{buildroot}%{_mandir}/man1
-mv ctags.1 gctags.1
-mv etags.1 etags.emacs.1
+mv ctags.1.gz gctags.1.gz
+mv etags.1.gz etags.emacs.1.gz
 popd
 
-mv %{buildroot}%{_infodir}/info.info %{buildroot}%{_infodir}/info
+mv %{buildroot}%{_infodir}/info.info.gz %{buildroot}%{_infodir}/info.gz
 
 install -d %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d
 
@@ -325,18 +355,8 @@ cat el-*-files common-lisp-dir-files > el-filelist
 %{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
 %{_sbindir}/alternatives --install %{_bindir}/emacs-nox emacs-nox %{_bindir}/emacs-%{version}-nox 60
 
-%post common
-for f in %{info_files}; do
-  /sbin/install-info %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || :
-done
-
 %preun common
 %{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs
-if [ "$1" = 0 ]; then
-  for f in %{info_files}; do
-    /sbin/install-info --delete %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || :
-  done
-fi
 
 %posttrans common
 %{_sbindir}/alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
@@ -395,7 +415,7 @@ fi
 %dir %{_datadir}/emacs/site-lisp
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
-#%files help
+%files help
 %doc doc/NEWS BUGS README
 %{_mandir}/*/*