On 10/19/20 7:18 AM, qboosh wrote:
commit d18d7763aef2b08dc8474c8894b2f2923e8723ea
Author: Jakub Bogusz <[email protected]>
Date: Mon Oct 19 06:18:22 2020 +0200
- added hye to the list of wanted locales
glibc.spec | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index a0e49d1..a8f860c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -114,7 +114,7 @@ BuildRequires: perl-base
BuildRequires: python3 >= 1:3.4
BuildRequires: python3-modules >= 1:3.4
BuildRequires: rpm-build >= 4.3-0.20030610.28
-BuildRequires: rpmbuild(macros) >= 1.567
+BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo >= 4.7
Requires: %{name}-ld = %{epoch}:%{version}-%{release}
@@ -648,9 +648,7 @@ Summary: Documentation needed for development using
standard C libraries
Summary(pl.UTF-8): Dokumentacja do tworzenia programów przy użyciu
standardowych bibliotek C
Group: Documentation
Conflicts: man-pages < 4.09
-%if "%{_rpmversion}" >= "4.6"
-BuildArch: noarch
-%endif
+%{?noarchpackage}
%description devel-doc
The glibc-devel-doc package contains info and manual pages necessary
@@ -1144,6 +1142,7 @@ done
# guc (gtk-vnc)
# haw (iso-codes, stellarium)
# hrx (stellarium)
+# hye (tumbler)
# ie (xfce, cinnamon)
# ilo (kudzu, libosinfo, libreport)
# io (alacarte, gtk+2, gnome, iso-codes)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/d18d7763aef2b08dc8474c8894b2f2923e8723ea
this has bothered me for a long time already, so I'm saying it out:
could we please get commits to our repos atomic?
- https://www.freshconsulting.com/atomic-commits/
atomic, so that:
1. changes are self-standing and can be reverted individually (or
similarly cherry-picked to other branch)
2. all changes are documented, not "included" into some other commit. in
this case the second change is not even mentioned in commit message.
in this specific commit, it's even uncertain, is the rpm macros bump
needed for locale change, or for the macro change. this should have been
two commits.
hints:
1. "git add -p" is your friend for staging changes by line, don't use
"git commit -a"
2. review your commits before pushing, use "git rebase -i origin/master"
3. use git interactive rebase tool, making rebase even more smoother
4. use git aliases (git up, git sq), mine shared below
5. git fixup and git fixup tool are also useful if your changes are a
bit bigger than release bump
- https://github.com/MitMaro/git-interactive-rebase-tool
- https://github.com/keis/git-fixup
```
[alias]
st = status
ci = commit -v
co = checkout
up = pull --rebase
pushf = push --force-with-lease
## git config merge.upstream upstream/master
upstream = "!f() { echo ${1:-$(git config --get rebase.upstream ||
echo origin/master)}; }; f"
autosquash = !sh -c 'git rebase -i --autosquash $(git upstream
${1:-})' "$@"
sq = autosquash
sw = switch
lsf = ls-files
```
_______________________________________________
pld-devel-en mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
