From cfee708bb0df2e5bb094359dd958f96dfb19a6804d691766d4540ff6636d7f0c Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 11 Jan 2021 12:17:51 +0000 Subject: [PATCH 1/3] Accepting request 862274 from home:michals - Fix build on Tumbleweed - do not ship ghost symlinks. OBS-URL: https://build.opensuse.org/request/show/862274 OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=32 --- ctags.changes | 5 +++++ ctags.spec | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ctags.changes b/ctags.changes index 329d878..5d30fa5 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 11 12:09:50 UTC 2021 - Michal Suchanek + +- Fix build on Tumbleweed - do not ship ghost symlinks. + ------------------------------------------------------------------- Sun Feb 26 04:37:26 UTC 2017 - msuchanek@suse.com diff --git a/ctags.spec b/ctags.spec index 2598fc7..d5c049b 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,7 +1,7 @@ # # spec file for package ctags # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Name: ctags Version: 5.8 Release: 0 Summary: A Program to Generate Tag Files for Use with vi and Other Editors -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Navigators -Url: http://ctags.sourceforge.net/ +URL: http://ctags.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz # No resources to make this patch work with ctags-5.8 (applied to ctags-5.7) # Anyone is welcome to make it work again. @@ -92,11 +92,6 @@ make \ mandir=%{buildroot}%{_mandir} mv %{buildroot}%{_bindir}/ctags{,-exuberant} mv %{buildroot}%{_mandir}/man1/ctags{,-exuberant}.1 -mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ -ln -s ctags %{buildroot}%{_bindir}/ctags -ln -s ctags.1%{ext_man} %{buildroot}%{_mandir}/man1/ctags.1%{ext_man} -ln -s ctags %{buildroot}%{_sysconfdir}/alternatives/ctags -ln -s ctags.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/ctags.1%{ext_man} %post test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags From e1879f6eb2390de3abc1f0aee2c0ff9b5965e605ef66b78f6a406016da03f123 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 28 Jan 2021 10:02:32 +0000 Subject: [PATCH 2/3] - Ship symlinks that are not to be ghosted in the first place OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=33 --- ctags.changes | 5 +++++ ctags.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ctags.changes b/ctags.changes index 5d30fa5..2a5a8ae 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 28 09:54:49 UTC 2021 - Adam Majer + +- Ship symlinks that are not to be ghosted in the first place + ------------------------------------------------------------------- Mon Jan 11 12:09:50 UTC 2021 - Michal Suchanek diff --git a/ctags.spec b/ctags.spec index d5c049b..c021fcb 100644 --- a/ctags.spec +++ b/ctags.spec @@ -93,6 +93,9 @@ make \ mv %{buildroot}%{_bindir}/ctags{,-exuberant} mv %{buildroot}%{_mandir}/man1/ctags{,-exuberant}.1 +ln -s %{_sysconfdir}/alternatives/ctags %{buildroot}%{_bindir}/ctags +ln -s %{_sysconfdir}/alternatives/ctags.1%{ext_man} %{buildroot}%{_mandir}/man1/ctags.1%{ext_man} + %post test -L %{_bindir}/ctags || rm -f %{_bindir}/ctags update-alternatives --install %{_bindir}/ctags ctags %{_bindir}/ctags-exuberant 20 \ @@ -109,8 +112,8 @@ fi %doc COPYING EXTENDING.html FAQ README %{_bindir}/ctags-exuberant %{_mandir}/man1/ctags-exuberant.1%{ext_man} -%ghost %{_bindir}/ctags -%ghost %{_mandir}/man1/ctags.1%{ext_man} +%{_bindir}/ctags +%{_mandir}/man1/ctags.1%{ext_man} %ghost %{_sysconfdir}/alternatives/ctags %ghost %{_sysconfdir}/alternatives/ctags.1%{ext_man} From 8981df60227df107e0755abccbb01c6a1e2450f4a5a16ce8f330c41041481585 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 9 May 2021 14:27:00 +0000 Subject: [PATCH 3/3] 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}