From 290b8b3368ea058484f4629cd3d4894bd796bbbca258784d9ca9f0aadab78858 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 5 Nov 2020 10:06:05 +0000 Subject: [PATCH 1/2] - Update to release 2020.11.04 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=118 --- schily-2020-10-09.tar.bz2 | 3 --- schily-2020-11-04.tar.bz2 | 3 +++ schily.changes | 10 ++++++++++ schily.spec | 29 ++++++++++++++++++++++++++--- 4 files changed, 39 insertions(+), 6 deletions(-) delete mode 100644 schily-2020-10-09.tar.bz2 create mode 100644 schily-2020-11-04.tar.bz2 diff --git a/schily-2020-10-09.tar.bz2 b/schily-2020-10-09.tar.bz2 deleted file mode 100644 index 959c5e6..0000000 --- a/schily-2020-10-09.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94f4634226bbc9c4184d962f97253db494919480884e07087d56eea4a3a22561 -size 4818571 diff --git a/schily-2020-11-04.tar.bz2 b/schily-2020-11-04.tar.bz2 new file mode 100644 index 0000000..716a388 --- /dev/null +++ b/schily-2020-11-04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3ebf65554d9356a33a6641a1796971aabf4915262f92b71f923bf5fc98356e +size 4842782 diff --git a/schily.changes b/schily.changes index 5d86f9b..21ccc70 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Nov 5 00:13:45 UTC 2020 - Jan Engelhardt + +- Update to release 2020.11.04 + * Bourne Shell: If a background job did finish during an + implicit wait for a foreground job, the exit code for the + background job was lost, which was fixed. + * star: ACLs and Linux xattrs did not work if the path name to a + file was longer than PATH_MAX, which was fixed. + ------------------------------------------------------------------- Fri Oct 9 22:54:57 UTC 2020 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index 23bb3c5..651fedb 100644 --- a/schily.spec +++ b/schily.spec @@ -17,14 +17,14 @@ # grep -Pir 'define\s+VERSION|strvers' -%global box_version 2020.10.09 +%global box_version 2020.11.04 %global cdr_version 3.02~a10 %global sccs_version 5.09 %global smake_version 1.3 %global star_version 1.6.1 %global libfind_version 1.8 -%global ved_version 1.7 -%define rver 2020-10-09 +%global ved_version 1.8 +%define rver 2020-11-04 Name: schily Version: %box_version @@ -100,6 +100,21 @@ cdrecord is a program to record (slang: "burn") data or audio Compact Discs on an Orange Book CD recorder, to write DVD media on a DVD recorder or to write BluRay media on a BluRay recorder. +%package ctags +Summary: A program to generate tag files for ex/vi +License: CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND HPND AND ISC +Group: Development/Tools/Building +Conflicts: ctags + +%description ctags +Ctags makes a tags file for ex(1) from the specified C, Pascal, +Fortran, YACC, lex, and lisp sources. A tags file gives the locations +of specified objects in a group of files. Each line of the tags file +contains the object name, the file in which it is defined, and a +search pattern for the object definition, separated by whitespace. +Using the tags file, ex(1) can quickly locate these object +definitions. + %package -n libcdrdeflt1_0 Summary: Library to parse the cdrecord config file License: CDDL-1.0 @@ -531,6 +546,8 @@ ls -l "$b/%_mandir"/man*/*mt* # get rid of things that upset rpmlint find "$b/usr/share/doc" -type f -name "*big*" -print -delete +cp ctags/vctags.1 "$b/%_mandir/man1/" + # deal with this another time find "$b" rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs" @@ -760,6 +777,12 @@ fi %verify(not mode caps) %attr(0755,root,root) %_bindir/cdrecord %_mandir/man1/cdrecord.1* +%files ctags +%license CDDL.Schily.txt +%_bindir/ctags +%_bindir/vctags +%_mandir/man1/vctags.1* + %files -n libcdrdeflt1_0 %license CDDL.Schily.txt %_libdir/libcdrdeflt.so.1.0 From 096c1a2ec7d1193528cc3c13f87833b0f3de0ce58fc80be425f173f61f9104ab Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 7 Nov 2020 10:50:25 +0000 Subject: [PATCH 2/2] - Move ctags to update-alternatives scheme. OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=119 --- schily.changes | 5 +++++ schily.spec | 24 +++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/schily.changes b/schily.changes index 21ccc70..9393f04 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 7 10:50:14 UTC 2020 - Jan Engelhardt + +- Move ctags to update-alternatives scheme. + ------------------------------------------------------------------- Thu Nov 5 00:13:45 UTC 2020 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index 651fedb..38f861d 100644 --- a/schily.spec +++ b/schily.spec @@ -104,7 +104,8 @@ write BluRay media on a BluRay recorder. Summary: A program to generate tag files for ex/vi License: CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND HPND AND ISC Group: Development/Tools/Building -Conflicts: ctags +Requires(post): update-alternatives +Requires(postun): update-alternatives %description ctags Ctags makes a tags file for ex(1) from the specified C, Pascal, @@ -537,17 +538,18 @@ rm -fv "$b/%_bindir/suntar" rm -fv "$b/%_mandir/man1/star_sym.1" rm -fv "$b/%_mandir/man1/suntar.1" +# ctags +mv -v "$b/%_bindir/ctags" "$b/%_bindir/ctags-schily" +cp -v ctags/vctags.1 "$b/%_mandir/man1/" + # mt/rmt rm -fv "$b/%_bindir/mt" # handled up u-a ln -sv smt.1 "$b/%_mandir/man1/mt.1" ln -sv srmt.1 "$b/%_mandir/man1/rmt.1" -ls -l "$b/%_mandir"/man*/*mt* # get rid of things that upset rpmlint find "$b/usr/share/doc" -type f -name "*big*" -print -delete -cp ctags/vctags.1 "$b/%_mandir/man1/" - # deal with this another time find "$b" rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs" @@ -670,6 +672,16 @@ true %set_permissions %_bindir/cdda2wav true +%post ctags +"%_sbindir/update-alternatives" \ + --install "%_bindir/ctags" ctags "%_bindir/ctags-schily" 20 +"%_sbindir/update-alternatives" --auto ctags + +%postun ctags +if test "$1" = 0; then + "%_sbindir/update-alternatives" --remove ctags "%_bindir/ctags-schily" +fi + %post -n readcd %set_permissions %_bindir/readcd true @@ -678,6 +690,7 @@ true "%_sbindir/update-alternatives" \ --install "%_bindir/mt" mt "%_bindir/smt" 10 \ --slave "%_mandir/man1/mt.1%ext_man" "mt.1%ext_man" "%_mandir/man1/smt.1%ext_man" +"%_sbindir/update-alternatives" --auto mt %postun mt if test "$1" = 0; then @@ -688,6 +701,7 @@ fi "%_sbindir/update-alternatives" \ --install "%_bindir/rmt" rmt "%_bindir/srmt" 10 \ --slave "%_mandir/man8/rmt.1%ext_man" "rmt.1%ext_man" "%_mandir/man8/srmt.1%ext_man" +"%_sbindir/update-alternatives" --auto rmt %postun rmt if test "$1" = 0; then @@ -779,7 +793,7 @@ fi %files ctags %license CDDL.Schily.txt -%_bindir/ctags +%_bindir/ctags-schily %_bindir/vctags %_mandir/man1/vctags.1*