diff --git a/emacs.changes b/emacs.changes index 2faf5fe..515f9d8 100644 --- a/emacs.changes +++ b/emacs.changes @@ -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 diff --git a/emacs.spec b/emacs.spec index 84b3ebb..38da531 100644 --- a/emacs.spec +++ b/emacs.spec @@ -29,10 +29,16 @@ BuildRequires: fonts-config BuildRequires: freetype2-devel BuildRequires: gconf2-devel BuildRequires: giflib-devel +%if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel +%else +BuildRequires: gtk2-devel +%endif BuildRequires: krb5-devel BuildRequires: libgnutls-devel +%if 0%{?suse_version} > 1140 BuildRequires: libgnutls-openssl-devel +%endif BuildRequires: libjpeg-devel BuildRequires: libotf-devel BuildRequires: libpng-devel @@ -179,7 +185,9 @@ modes. %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch13 -p0 -b .s390x +%if 0%{?suse_version} > 1210 %patch14 -p0 -b .tinfo +%endif %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %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 eu-strip --remove-comment %{buildroot}/usr/bin/$bin -o $bin.new && mv $bin.new %{buildroot}/usr/bin/$bin done +rm -vf %{buildroot}%{_bindir}/gnuctags +rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1* %post -n emacs-nox test -e usr/bin/emacs || ln -sf emacs-nox usr/bin/emacs @@ -541,7 +551,6 @@ done %{_bindir}/ebrowse %{_bindir}/emacs %{_bindir}/emacsclient -%{_bindir}/gnuctags %{_bindir}/grep-changelog %{_bindir}/rcs-checkin %dir %{_prefix}/lib/emacs/