Dr. Werner Fink 2012-06-28 09:44:50 +00:00 committed by Git OBS Bridge
parent 95d0dbb2d2
commit 53ce9d091b
2 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 28 09:42:17 UTC 2012 - werner@suse.de
- Avoid conflict with gnuctags
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 28 09:07:51 UTC 2012 - werner@suse.de Thu Jun 28 09:07:51 UTC 2012 - werner@suse.de

View File

@ -29,10 +29,16 @@ BuildRequires: fonts-config
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
BuildRequires: giflib-devel BuildRequires: giflib-devel
%if 0%{?suse_version} > 1130
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
%else
BuildRequires: gtk2-devel
%endif
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libgnutls-devel BuildRequires: libgnutls-devel
%if 0%{?suse_version} > 1140
BuildRequires: libgnutls-openssl-devel BuildRequires: libgnutls-openssl-devel
%endif
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libotf-devel BuildRequires: libotf-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -179,7 +185,9 @@ modes.
%patch11 -p0 -b .xim %patch11 -p0 -b .xim
%patch12 -p0 -b .x11r7 %patch12 -p0 -b .x11r7
%patch13 -p0 -b .s390x %patch13 -p0 -b .s390x
%if 0%{?suse_version} > 1210
%patch14 -p0 -b .tinfo %patch14 -p0 -b .tinfo
%endif
%patch15 -p0 -b .iconic %patch15 -p0 -b .iconic
%patch16 -p0 -b .flyspell %patch16 -p0 -b .flyspell
%patch -p0 %patch -p0
@ -515,6 +523,8 @@ cp etc/images/icons/hicolor/32x32/apps/emacs.png $RPM_SOURCE_DIR/emacs.png
for bin in emacs-x11 emacs-gtk emacs-nox; do for bin in emacs-x11 emacs-gtk emacs-nox; do
eu-strip --remove-comment %{buildroot}/usr/bin/$bin -o $bin.new && mv $bin.new %{buildroot}/usr/bin/$bin eu-strip --remove-comment %{buildroot}/usr/bin/$bin -o $bin.new && mv $bin.new %{buildroot}/usr/bin/$bin
done done
rm -vf %{buildroot}%{_bindir}/gnuctags
rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1*
%post -n emacs-nox %post -n emacs-nox
test -e usr/bin/emacs || ln -sf emacs-nox usr/bin/emacs test -e usr/bin/emacs || ln -sf emacs-nox usr/bin/emacs
@ -541,7 +551,6 @@ done
%{_bindir}/ebrowse %{_bindir}/ebrowse
%{_bindir}/emacs %{_bindir}/emacs
%{_bindir}/emacsclient %{_bindir}/emacsclient
%{_bindir}/gnuctags
%{_bindir}/grep-changelog %{_bindir}/grep-changelog
%{_bindir}/rcs-checkin %{_bindir}/rcs-checkin
%dir %{_prefix}/lib/emacs/ %dir %{_prefix}/lib/emacs/