From 8981df60227df107e0755abccbb01c6a1e2450f4a5a16ce8f330c41041481585 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 9 May 2021 14:27:00 +0000 Subject: [PATCH] Accepting request 890336 from home:StefanBruens:branches:openSUSE:Factory - Revert ghosting changes, fix real cause for build failure instead (symlinks pointing to itself). - Clean spec file: remove historic cruft, use %license for COPYING, use %make_build/%make_install macros OBS-URL: https://build.opensuse.org/request/show/890336 OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=34 --- ctags.changes | 8 ++++++++ ctags.spec | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ctags.changes b/ctags.changes index 2a5a8ae..19fcc0b 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 4 11:15:01 UTC 2021 - Stefan BrĂ¼ns + +- Revert ghosting changes, fix real cause for build failure + instead (symlinks pointing to itself). +- Clean spec file: remove historic cruft, use %license for COPYING, + use %make_build/%make_install macros + ------------------------------------------------------------------- Thu Jan 28 09:54:49 UTC 2021 - Adam Majer diff --git a/ctags.spec b/ctags.spec index c021fcb..9bea532 100644 --- a/ctags.spec +++ b/ctags.spec @@ -51,7 +51,6 @@ Requires(pre): update-alternatives Requires(post): update-alternatives Requires(post): coreutils Provides: arduino-ctags -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description CTags (from Darren Hiebert) generates tag files from source code in C, @@ -82,19 +81,23 @@ Emacs, and several other editors. %build %configure -make %{?_smp_mflags} +%make_build %install -make \ - install \ +# Makefile ignores DESTDIR ... +%make_install \ prefix=%{buildroot}%{_prefix} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} + mv %{buildroot}%{_bindir}/ctags{,-exuberant} mv %{buildroot}%{_mandir}/man1/ctags{,-exuberant}.1 +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ ln -s %{_sysconfdir}/alternatives/ctags %{buildroot}%{_bindir}/ctags ln -s %{_sysconfdir}/alternatives/ctags.1%{ext_man} %{buildroot}%{_mandir}/man1/ctags.1%{ext_man} +ln -s %{_bindir}/ctags-exuberant %{buildroot}%{_sysconfdir}/alternatives/ctags +ln -s %{_mandir}/man1/ctags.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/ctags.1%{ext_man} %post test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags @@ -108,12 +111,12 @@ if [ $1 -eq 0 ]; then fi %files -%defattr(-,root,root) -%doc COPYING EXTENDING.html FAQ README +%doc EXTENDING.html FAQ README +%license COPYING %{_bindir}/ctags-exuberant %{_mandir}/man1/ctags-exuberant.1%{ext_man} -%{_bindir}/ctags -%{_mandir}/man1/ctags.1%{ext_man} +%ghost %{_bindir}/ctags +%ghost %{_mandir}/man1/ctags.1%{ext_man} %ghost %{_sysconfdir}/alternatives/ctags %ghost %{_sysconfdir}/alternatives/ctags.1%{ext_man}