]> git.pld-linux.org Git - packages/emacs.git/blobdiff - emacs.spec
projects / packages / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- rebuild with ImageMagick 7.0.9.23
[packages/emacs.git] / emacs.spec
diff --git a/emacs.spec b/emacs.spec
index 024355b8c7f5fe5c6ce25cd2e08634404e59ed68..513a9642710936b7ab9e9733e550269fcb741b54 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -18,13 +18,13 @@ Summary(pl.UTF-8):  GNU Emacs - edytor tekstu dla systemu X Window
 Summary(pt_BR.UTF-8):  GNU Emacs
 Summary(tr.UTF-8):     GNU Emacs
 Name:          emacs
-%define        ver     24.1
+%define        ver     26.3
 Version:       %{ver}
-Release:       3
+Release:       2
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
-Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.bz2
-# Source0-md5: 8ba0932c498bc8fb10d7ddba52227e5b
+Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.xz
+# Source0-md5: 0a2e4b965d31a7cb1930eae3b79df793
 Source1:       %{name}-dot%{name}
 Source2:       %{name}-site-start.el
 Source3:       %{name}.png
@@ -34,7 +34,8 @@ Source6:      %{name}-athena.desktop
 Source7:       %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
-Patch0:                %{name}-fontconfig.patch
+Patch0:                imagemagick7.patch
+Patch1:                bashizm.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -48,7 +49,7 @@ BuildRequires:        libtiff-devel
 BuildRequires: libtool
 BuildRequires: giflib-devel
 BuildRequires: ncurses-devel
-%{?with_motif:BuildRequires:   openmotif-devel}
+%{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
@@ -370,6 +371,7 @@ exit 1
 
 %setup -q -n %{name}-%{ver}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -384,7 +386,6 @@ echo "Building emacs athena binary ..."
 rm -rf build-athena
 mkdir build-athena && cd build-athena
 ../%configure \
-       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -394,7 +395,7 @@ mkdir build-athena && cd build-athena
        --with-x-toolkit=athena \
        %{?with_bootstrap:--without-gpm}
 
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap athena
 cd ..
 %endif
@@ -404,7 +405,6 @@ echo "Building emacs GTK+2 binary ..."
 rm -rf build-gtk
 mkdir build-gtk && cd build-gtk
 ../%configure \
-       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -415,9 +415,9 @@ mkdir build-gtk && cd build-gtk
        %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap gtk
 %endif
 cd ..
@@ -428,7 +428,6 @@ echo "Building emacs motif binary ..."
 rm -rf build-motif
 mkdir build-motif && cd build-motif
 ../%configure \
-       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -439,9 +438,9 @@ mkdir build-motif && cd build-motif
        %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap motif
 %endif
 cd ..
@@ -452,7 +451,6 @@ echo "Building emacs binary without X support ..."
 [ -d build-nox ] && rm -rf build-nox
 mkdir build-nox && cd build-nox
 ../%configure \
-       --with-crt-dir=%{_libdir} \
        --with-pop \
        --without-xpm \
        --without-jpeg \
@@ -463,9 +461,9 @@ mkdir build-nox && cd build-nox
        %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap nox
 %endif
 cd ..
@@ -514,9 +512,10 @@ install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE9} $RPM_BUILD_ROOT%{_desktopdir}
 
-[ -d build-nox ] && install build-nox/etc/DOC-* $RPM_BUILD_ROOT%{_datadir}/emacs/%{ver}/etc
+[ -d build-nox ] && install build-nox/etc/DOC* $RPM_BUILD_ROOT%{_datadir}/emacs/%{ver}/etc
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm $RPM_BUILD_ROOT%{_infodir}/info.info*
 # ERC is in separate spec
 rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs/%{ver}/lisp/erc
 
@@ -570,30 +569,23 @@ fi
 %config(noreplace) /etc/skel/.emacs
 %attr(755,root,root) %{_bindir}/ebrowse
 %attr(755,root,root) %{_bindir}/emacsclient
-%attr(755,root,root) %{_bindir}/grep-changelog
-%attr(755,root,root) %{_bindir}/rcs-checkin
 %{_mandir}/man1/ebrowse*
 %{_mandir}/man1/emacs*
-%{_mandir}/man1/grep-changelog*
-%{_mandir}/man1/rcs-checkin*
 %{_infodir}/*
 
-%dir %{_libdir}/emacs
-%dir %{_libdir}/emacs/%{ver}
-%dir %{_libdir}/emacs/%{ver}/*
+%dir %{_libexecdir}/emacs
+%dir %{_libexecdir}/emacs/%{ver}
+%dir %{_libexecdir}/emacs/%{ver}/*
 
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/hexl
-%attr(2755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/movemail
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/profile
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/rcs2log
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/update-game-score
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/vcdiff
+%attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/hexl
+%attr(2755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/movemail
+%attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/profile
+%attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/rcs2log
 
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{ver}
 %dir %{_datadir}/emacs/%{ver}/site-lisp
 %dir %{_datadir}/emacs/%{ver}/lisp
-%dir %{_datadir}/emacs/%{ver}/leim
 %dir %{_datadir}/emacs/%{ver}/lisp/calc
 %dir %{_datadir}/emacs/%{ver}/lisp/calendar
 %dir %{_datadir}/emacs/%{ver}/lisp/cedet
@@ -608,6 +600,7 @@ fi
 %dir %{_datadir}/emacs/%{ver}/lisp/emacs-lisp
 %dir %{_datadir}/emacs/%{ver}/lisp/emulation
 %dir %{_datadir}/emacs/%{ver}/lisp/eshell
+%dir %{_datadir}/emacs/%{ver}/lisp/image
 %dir %{_datadir}/emacs/%{ver}/lisp/international
 %dir %{_datadir}/emacs/%{ver}/lisp/language
 %dir %{_datadir}/emacs/%{ver}/lisp/mail
@@ -630,7 +623,6 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/README
 %{_datadir}/emacs/%{ver}/lisp/calc/*.el
 %{_datadir}/emacs/%{ver}/lisp/calc/*.elc
-%{_datadir}/emacs/%{ver}/lisp/calc/README*
 %{_datadir}/emacs/%{ver}/lisp/calendar/*.el
 %{_datadir}/emacs/%{ver}/lisp/calendar/*.elc
 %{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.el
@@ -640,10 +632,7 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/eshell/esh-groups.el
 %{_datadir}/emacs/%{ver}/lisp/international/*.el
 %{_datadir}/emacs/%{ver}/lisp/international/*.elc
-%{_datadir}/emacs/%{ver}/lisp/international/README
-%{_datadir}/emacs/%{ver}/lisp/language/*.el
 %{_datadir}/emacs/%{ver}/lisp/language/*.elc
-#%{_datadir}/emacs/%{ver}/lisp/cedet/*.el
 %{_datadir}/emacs/%{ver}/lisp/cedet/*.elc
 %{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.el
 %{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.elc
@@ -656,28 +645,27 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/wisent/*.elc
 %{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.el
 %{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.elc
+%{_datadir}/emacs/%{ver}/lisp/image/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mail/blessmail.el
+%{_datadir}/emacs/%{ver}/lisp/mail/rmail-loaddefs.el
 %{_datadir}/emacs/%{ver}/lisp/mail/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.el
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.elc
 %{_datadir}/emacs/%{ver}/lisp/net/*.el
 %{_datadir}/emacs/%{ver}/lisp/net/*.elc
 %{_datadir}/emacs/%{ver}/lisp/nxml/*.elc
+%{_datadir}/emacs/%{ver}/lisp/obsolete/messcompat.el
 %{_datadir}/emacs/%{ver}/lisp/obsolete/*.elc
+%{_datadir}/emacs/%{ver}/lisp/org/*.el
 %{_datadir}/emacs/%{ver}/lisp/org/*.elc
-%{_datadir}/emacs/%{ver}/lisp/play/bruce.el
 %{_datadir}/emacs/%{ver}/lisp/play/*.elc
 %{_datadir}/emacs/%{ver}/lisp/progmodes/*.elc
-%{_datadir}/emacs/%{ver}/lisp/term/*.el
 %{_datadir}/emacs/%{ver}/lisp/term/*.elc
+%{_datadir}/emacs/%{ver}/lisp/textmodes/reftex-loaddefs.el
 %{_datadir}/emacs/%{ver}/lisp/textmodes/*.elc
 %{_datadir}/emacs/%{ver}/lisp/url/*.elc
 %{_datadir}/emacs/%{ver}/lisp/vc/*.elc
 
-%dir /var/games/emacs
-/var/games/emacs/tetris-scores
-/var/games/emacs/snake-scores
-
 %{_datadir}/emacs/%{ver}/site-lisp/subdirs.el
 %{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
 %{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
@@ -699,13 +687,13 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/emulation/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/eshell/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/image/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/international/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/language/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/mail/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/net/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/nxml/*.el.gz
-%{_datadir}/emacs/%{ver}/lisp/obsolete/*.el
 %{_datadir}/emacs/%{ver}/lisp/obsolete/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/org/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/play/*.el.gz
@@ -717,16 +705,17 @@ fi
 
 %files leim
 %defattr(644,root,root,755)
-%dir %{_datadir}/emacs/%{ver}/leim/ja-dic
-%dir %{_datadir}/emacs/%{ver}/leim/quail
-%{_datadir}/emacs/%{ver}/leim/leim-list.el
-%{_datadir}/emacs/%{ver}/leim/quail/*.elc
-%{_datadir}/emacs/%{ver}/leim/ja-dic/*.elc
+%dir %{_datadir}/emacs/%{ver}/lisp/leim
+%dir %{_datadir}/emacs/%{ver}/lisp/leim/ja-dic
+%dir %{_datadir}/emacs/%{ver}/lisp/leim/quail
+%{_datadir}/emacs/%{ver}/lisp/leim/leim-list.el
+%{_datadir}/emacs/%{ver}/lisp/leim/quail/*.elc
+%{_datadir}/emacs/%{ver}/lisp/leim/ja-dic/*.elc
 
 %files leim-el
 %defattr(644,root,root,755)
-%{_datadir}/emacs/%{ver}/leim/quail/*.el.gz
-%{_datadir}/emacs/%{ver}/leim/ja-dic/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/leim/quail/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/leim/ja-dic/*.el.gz
 
 %if %{with nox} && %{?default_emacs} != "nox"
 %files nox
The Emacs text editor for the X Window System
This page took 0.087861 seconds and 4 git commands to generate.