PR#7: Own zsh and fish completions directories - rpms/filesystem

rpms / filesystem

#7 Own zsh and fish completions directories

Closed 2 years ago by gotmax23. Opened 2 years ago by gotmax23.

rpms/ gotmax23/filesystem rawhide into rawhide

Remove obsolete and forbidden Group tag

Maxwell G • 2 years ago

3340af0

Own zsh and fish completions directories

Maxwell G • 2 years ago

128afa9

filesystem.spec

file modified

+10 -3

		`@@ -1,10 +1,9 @@`
		`Summary: The basic directory layout for a Linux system`
		`Name: filesystem`
		`- Version: 3.16`
		`- Release: 3%{?dist}`
		`+ Version: 3.17`
		`+ Release: 1%{?dist}`
		`License: Public Domain`
		`URL: https://pagure.io/filesystem`
		`- Group: System Environment/Base`
		`Source1: https://pagure.io/filesystem/raw/master/f/lang-exceptions`
		`Source2: iso_639.sed`
		`Source3: iso_3166.sed`
		`@@ -48,6 +47,9 @@`
		usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,systemd/{system,user},sysusers.d,tmpfiles.d},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \
		`var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp}`

		`+ # The arguments are split up to avoid "/usr/bin/mkdir: Argument list too long"`
		`+ mkdir -p usr/share/{fish/vendor_completions.d,zsh/site-functions}`
		`+`
		`#do not create the symlink atm.`
		`#ln -snf etc/sysconfig etc/default`
		`ln -snf ../var/tmp usr/tmp`
		`@@ -263,6 +265,7 @@`
		`/usr/share/dict`
		`/usr/share/doc`
		`%attr(555,root,root) %dir /usr/share/empty`
		`+ /usr/share/fish`
		`/usr/share/games`
		`/usr/share/gnome`
		`/usr/share/help`
		`@@ -282,6 +285,7 @@`
		`/usr/share/xsessions`
		`/usr/share/X11`
		`/usr/share/wayland-sessions`
		`+ /usr/share/zsh`
		`/usr/src`
		`/usr/tmp`
		`%dir /var`
		`@@ -308,6 +312,9 @@`
		`/var/yp`

		`%changelog`
		`+ * Sat Jul 16 2022 Maxwell G <gotmax@e.email> - 3.17-1`
		`+ - Own zsh and fish completions directories`
		`+`
		`* Thu Jan 20 2022 Petr Menšík <pemensik@redhat.com> - 3.16-3`
		`- Include systemd directories for %unitdir and similar`

no initial comment

gotmax23 commented 2 years ago

cc @churchyard

churchyard commented on line 24 of filesystem.spec 2 years ago

mkdir -p

gotmax23 commented 2 years ago

mkdir -p

You're right. I fixed that locally but then forgot to push it :(.

rebased onto 3b41f79

2 years ago

rebased onto c135528

2 years ago

gotmax23 commented 2 years ago

Maintainers, can you please take a look at this? Let me know if you would prefer that these were owned by a different package.

gotmax23 commented 2 years ago

Rebased.

rebased onto 128afa9

2 years ago

carlwgeorge commented 2 years ago

LGTM.

carlwgeorge commented 2 years ago

You might consider adding resolves rhbz#1312594 to the changelog entry.

mosvald commented 2 years ago

Thank you for the patch!

Incorporated the Group removal into the upstream:

https://pagure.io/filesystem/c/d70f1b32082a95551a81e5f08cdcb056599f85a1?branch=master

Also thank you for pointing out the issue with "/usr/bin/mkdir: Argument list too long"!

Otherwise, I won't be merging the changes into Rawhide but into the upstream instead (please, make a pull request there the next time instead of here) because currently working on the next filesystem release with several changes there and don't want to double the effort.

gotmax23 commented 2 years ago

Okay, I will submit the other change there later, as I'd like to get this in. However, I'd like to point you to this section of the Packaging Guidelines. While I guess it's fine to keep a copy of the specfile in another repo and accept patches there, provided that you don't override changes made in distgit, you should treat distgit as the canonical source and also accept patches here.

mosvald commented 2 years ago

Okay, I will submit the other change there later, as I'd like to get this in. However, I'd like to point you to this section of the Packaging Guidelines. While I guess it's fine to keep a copy of the specfile in another repo and accept patches there, provided that you don't override changes made in distgit, you should treat distgit as the canonical source and also accept patches here.

Yes, of course, feel free to make/keep the changes here for this pull request and any future ones. I keep/sync the changes made to spec.file verbatim in the upstream (mainly %changelog), other parts of it can change. Note this is not upstream for filesystem package. Filesystem package is kind of different from others because its "source code" is directly in the spec file and the main development happens in https://pagure.io/filesystem. I mention this only because I am working on several backlog issues right now and the changes in upstream could clash with what can happen here, because I haven't updated the rawhide with upstream yet, which will happen soon. Anyway, thank you for sharing the link.

gotmax23 commented 2 years ago

I'm closing this in favor of https://pagure.io/filesystem/pull-request/7.

I've never used packit myself, but I believe it has the ability to sync changes back and forth between a source repository and distgit. That might be something to consider.

Pull-Request has been closed by gotmax23

2 years ago