Пакет git-merge-changelog: Specfile
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | Name: git-merge-changelog Version: %{get_version gnulib} Release: alt1 Summary: git merge driver for GNU style ChangeLog files License: GPLv2+ Group: Text tools Url: https://www.gnu.org/software/gnulib/ BuildRequires(pre): gnulib %description The default merge driver of 'git' *always* produces conflicts when pulling public modifications into a privately modified ChangeLog file. This is because ChangeLog files are always modified at the top; the default merge driver has no clue how to deal with this. Furthermore the conflicts are presented with more <<<< ==== >>>> markers than necessary; this is because the default merge driver makes pointless efforts to look at the individual line changes inside a ChangeLog entry. git-merge-changelog program serves as a 'git' merge driver that avoids these problems. 1. It produces no conflict when ChangeLog entries have been inserted at the top both in the public and in the private modification. It puts the privately added entries above the publicly added entries. 2. It respects the structure of ChangeLog files: entries are not split into lines but kept together. 3. It also handles the case of small modifications of past ChangeLog entries, or of removed ChangeLog entries: they are merged as one would expect it. 4. Conflicts are presented at the top of the file, rather than where they occurred, so that the user will see them immediately. (Unlike for source code written in some programming language, conflict markers that are located several hundreds lines from the top will not cause any syntax error and therefore would be likely to remain unnoticed.) %prep %setup -cT %build gnulib-tool --create-testdir --dir=$PWD %name %configure %make_build %install %makeinstall_std %check %make_build -k check %files %_bindir/* %changelog * Sat Feb 02 2019 Dmitry V. Levin <ldv@altlinux.org> %version-%release - Rebuilt with the latest gnulib snapshot. * Wed Jan 02 2019 Dmitry V. Levin <ldv@altlinux.org> 0.1.2313.4652c-alt1 - Rebuilt with gnulib snapshot v0.1-2313-g4652c7baf. * Fri Dec 21 2018 Dmitry V. Levin <ldv@altlinux.org> 0.1.2305.95c96-alt1 - Rebuilt with gnulib snapshot v0.1-2305-g95c96b6dd. * Thu Aug 10 2017 Aleksei Nikiforov <darktemplar@altlinux.org> 0.1.1213.683b6-alt1 - Rebuilt with gnulib snapshot v0.1-1213-g683b607. * Mon Mar 20 2017 Dmitry V. Levin <ldv@altlinux.org> 0.1.1209.24b32-alt1 - Rebuilt with gnulib snapshot v0.1-1209-g24b3216. * Tue Oct 06 2015 Dmitry V. Levin <ldv@altlinux.org> 0.1.585.2fda85-alt1 - Rebuilt with gnulib snapshot v0.1-585-g2fda85e. * Mon May 25 2015 Dmitry V. Levin <ldv@altlinux.org> 0.1.443.875ec93-alt1 - Rebuilt with gnulib snapshot v0.1-443-g875ec93. * Fri Feb 21 2014 Dmitry V. Levin <ldv@altlinux.org> 0.1.114.caf1b31-alt2 - Enabled test suite. * Wed Feb 19 2014 Dmitry V. Levin <ldv@altlinux.org> 0.1.114.caf1b31-alt1 - Rebuilt with gnulib snapshot v0.1-114-gcaf1b31. * Sat Jan 04 2014 Dmitry V. Levin <ldv@altlinux.org> 0.1.58.0f3a662-alt1 - Rebuilt with gnulib snapshot v0.1-58-g0f3a662. * Mon Oct 28 2013 Dmitry V. Levin <ldv@altlinux.org> 0.0.8061.5191b35-alt1 - Rebuilt with gnulib snapshot v0.0-8061-g5191b35. * Fri Apr 12 2013 Dmitry V. Levin <ldv@altlinux.org> 0.0.7902.92f3a4c-alt1 - Rebuilt with gnulib snapshot v0.0-7902-g92f3a4c. * Sun Apr 07 2013 Dmitry V. Levin <ldv@altlinux.org> 0.0.7901.076ac82-alt1 - Rebuilt with gnulib snapshot v0.0-7901-g076ac82. * Tue Nov 20 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7696.fd9f1ac-alt1 - Rebuilt with gnulib snapshot v0.0-7696-gfd9f1ac. * Mon Oct 29 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7677.4027785-alt2 - Rebuilt with gnulib snapshot v0.0-7677-g4027785. * Mon Aug 20 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7591.898f143-alt1 - Rebuilt with gnulib snapshot v0.0-7591-g898f143. * Mon Aug 13 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7575.d22f151-alt1 - Rebuilt with gnulib snapshot v0.0-7575-gd22f151. * Fri Aug 03 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7557.ee60576-alt1 - Rebuilt with gnulib snapshot v0.0-7557-gee60576. * Wed Apr 11 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.7312.7995834-alt1 - Rebuilt with gnulib snapshot v0.0-7312-g7995834. * Wed Jan 11 2012 Dmitry V. Levin <ldv@altlinux.org> 0.0.6780.bfacc22-alt1 - Rebuilt with gnulib snapshot v0.0-6780-gbfacc22. * Thu Sep 15 2011 Dmitry V. Levin <ldv@altlinux.org> 0.0.6125.da1717b-alt1 - Rebuilt with gnulib snapshot v0.0-6125-gda1717b. * Tue Jun 28 2011 Dmitry V. Levin <ldv@altlinux.org> 0.0.5864.0f247f9-alt1 - Rebuilt with gnulib snapshot v0.0-5864-g0f247f9. * Fri Jan 07 2011 Dmitry V. Levin <ldv@altlinux.org> 0.0.4800.a036b76-alt1 - Gnulib snapshot v0.0-4800-ga036b76. |