[521] | 1 | Summary: A GNU collection of diff utilities. |
---|
| 2 | Summary(ja): GNU diff ユーティリティ集 |
---|
| 3 | Name: diffutils |
---|
[7176] | 4 | Version: 3.2 |
---|
| 5 | Release: 1%{?_dist_release} |
---|
[521] | 6 | Group: Applications/Text |
---|
| 7 | URL: http://www.gnu.org/software/diffutils/diffutils.html |
---|
[7176] | 8 | License: GPLv3+ |
---|
[521] | 9 | |
---|
[7176] | 10 | Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz |
---|
| 11 | # For 'cmp -s', compare file sizes only if both non-zero (bug #563618). |
---|
| 12 | Patch1: diffutils-cmp-s-empty.patch |
---|
| 13 | # Applied upstream gnulib fix for float test on ppc (bug #733536). |
---|
| 14 | Patch2: diffutils-ppc-float.patch |
---|
| 15 | # Fixed build failure. |
---|
| 16 | Patch3: diffutils-stdio-gets.patch |
---|
| 17 | Patch4: diffutils-3.2-i18n.patch |
---|
| 18 | |
---|
[521] | 19 | Requires(post): /sbin/install-info |
---|
| 20 | Requires(preun): /sbin/install-info |
---|
| 21 | Buildroot: %{_tmppath}/%{name}-%{version}-root |
---|
| 22 | BuildRequires: coreutils |
---|
| 23 | |
---|
| 24 | %description |
---|
| 25 | Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff |
---|
| 26 | compares two files and shows the differences, line by line. The cmp |
---|
| 27 | command shows the offset and line numbers where two files differ, or |
---|
| 28 | cmp can show the characters that differ between the two files. The |
---|
| 29 | diff3 command shows the differences between three files. Diff3 can be |
---|
| 30 | used when two people have made independent changes to a common |
---|
| 31 | original; diff3 can produce a merged file that contains both sets of |
---|
| 32 | changes and warnings about conflicts. The sdiff command can be used |
---|
| 33 | to merge two files interactively. |
---|
| 34 | |
---|
| 35 | Install diffutils if you need to compare text files. |
---|
| 36 | |
---|
| 37 | %description -l ja |
---|
| 38 | diffutils には diff, cmp, diff3, sdiff の 4つのユーティリティが |
---|
| 39 | 収められています.diff は 2つのファイルを行単位で比較し相違点を |
---|
| 40 | 出力します.cmp コマンドは 2つのファイルの相違点をオフセットと行番号で |
---|
| 41 | 表示できますし,どの文字が異なるかを表示することも出来ます. |
---|
| 42 | diff3 コマンドは 3つのファイルの相違点を出力します.diff3 は |
---|
| 43 | 1つのオリジナルファイルを2人が変更した場合等に良く使われます. |
---|
| 44 | diff3 を使って,2つの変更をマージした変更ファイルを出力することが |
---|
| 45 | 出来ますし,コンフリクトした変更点を出力することも出来ます. |
---|
| 46 | sdiff コマンドは2つのファイルを対話的にマージするのに使います. |
---|
| 47 | |
---|
| 48 | テキストファイルを比較したい場合は diffutils をインストールして下さい. |
---|
| 49 | |
---|
| 50 | |
---|
| 51 | %prep |
---|
| 52 | %setup -q |
---|
[7176] | 53 | %patch1 -p1 -b .cmp-s-empty |
---|
| 54 | %patch2 -p1 -b .ppc-float |
---|
| 55 | %patch3 -p1 -b .stdio-gets |
---|
| 56 | %patch4 -p1 -b .i18n |
---|
[521] | 57 | |
---|
| 58 | %build |
---|
| 59 | %configure |
---|
| 60 | make PR_PROGRAM=%{_bindir}/pr |
---|
| 61 | |
---|
| 62 | %install |
---|
| 63 | rm -rf $RPM_BUILD_ROOT |
---|
[7176] | 64 | %__make DESTDIR=$RPM_BUILD_ROOT install |
---|
[521] | 65 | |
---|
| 66 | rm -f $RPM_BUILD_ROOT%{_infodir}/dir |
---|
| 67 | %find_lang %{name} |
---|
| 68 | |
---|
| 69 | |
---|
| 70 | %post |
---|
[7176] | 71 | /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : |
---|
[521] | 72 | |
---|
| 73 | %preun |
---|
| 74 | if [ $1 = 0 ]; then |
---|
[7176] | 75 | /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : |
---|
[521] | 76 | fi |
---|
| 77 | |
---|
| 78 | %clean |
---|
| 79 | rm -rf $RPM_BUILD_ROOT |
---|
| 80 | |
---|
| 81 | %files -f %{name}.lang |
---|
| 82 | %defattr(-,root,root) |
---|
[7176] | 83 | %doc COPYING NEWS README |
---|
[521] | 84 | %{_bindir}/* |
---|
| 85 | %{_mandir}/*/* |
---|
[7176] | 86 | %{_infodir}/diffutils.info*gz |
---|
[521] | 87 | |
---|
| 88 | |
---|
| 89 | %changelog |
---|
[7176] | 90 | * Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-1 |
---|
| 91 | - new upstream reelase |
---|
| 92 | - update patches |
---|
| 93 | |
---|
[521] | 94 | * Tue Mar 31 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.1-13 |
---|
| 95 | - spec in utf-8 |
---|
| 96 | |
---|
| 97 | * Mon May 12 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.1-12 |
---|
| 98 | - applied new versioning policy |
---|
| 99 | - added BuildRequires: coreutils |
---|
| 100 | |
---|
| 101 | * Fri Sep 22 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.1-11vl2 |
---|
| 102 | - rebuild to add gpg sign |
---|
| 103 | |
---|
| 104 | * Fri Mar 26 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.1-11vl1 |
---|
| 105 | - added Patch1 from Fedora 2.8.1-11 |
---|
| 106 | * Thu Jan 8 2004 Tim Waugh <twaugh@redhat.com> 2.8.1-10 |
---|
| 107 | - Fix mistaken use of '|' instead of '||'. |
---|
| 108 | - fixed typo at description(ja) |
---|
| 109 | |
---|
| 110 | * Wed Dec 04 2002 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 2.8.1-5vl1 |
---|
| 111 | - merge Rawhide's 2.8.1-5 and Vine's 2.8.1-0vl1: |
---|
| 112 | |
---|
| 113 | - Sun Sep 29 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.1-0vl1 |
---|
| 114 | - new upstream release 2.8.1 |
---|
| 115 | - drop old unneeded patches. |
---|
| 116 | |
---|
| 117 | - Mon Jun 18 2001 <sagami@vinelinux.org> |
---|
| 118 | - 2.7.2-0vl3: patch taken from RH's 2.7.2-2 (not in sync, actually) |
---|
| 119 | - Install diff.1, since it's no longer in man-pages. |
---|
| 120 | |
---|
| 121 | - Tue Jan 09 2001 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rhythmaning.org> |
---|
| 122 | - 2.7.2-0vl2 |
---|
| 123 | - use better macros (%%{_localedir}) |
---|
| 124 | - %%makeinstall was here again |
---|
| 125 | - added Japanese summary and description |
---|
| 126 | |
---|
| 127 | - Mon Jul 3 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> |
---|
| 128 | - updated to 2.7.2 (NLS support version) |
---|
| 129 | - added poor gettext_fix patch |
---|
| 130 | - added ja.po from fj.sources |
---|
| 131 | - remove %%makeinstall and use "make install prefix..." for rpm 3.x |
---|
| 132 | |
---|
| 133 | * Tue Nov 19 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-5 |
---|
| 134 | - i18n patch. |
---|
| 135 | |
---|
| 136 | * Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-4 |
---|
| 137 | - Ship translations. |
---|
| 138 | |
---|
| 139 | * Fri Jun 21 2002 Tim Powers <timp@redhat.com> |
---|
| 140 | - automated rebuild |
---|
| 141 | |
---|
| 142 | * Thu May 23 2002 Tim Powers <timp@redhat.com> |
---|
| 143 | - automated rebuild |
---|
| 144 | |
---|
| 145 | * Mon Apr 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-1 |
---|
| 146 | - 2.8.1. |
---|
| 147 | - No longer need immunix-owl-tmp patch. |
---|
| 148 | |
---|
| 149 | * Wed Feb 27 2002 Tim Waugh <twaugh@redhat.com> 2.7.2-5 |
---|
| 150 | - Rebuild in new environment. |
---|
| 151 | |
---|
| 152 | * Wed Jan 09 2002 Tim Powers <timp@redhat.com> |
---|
| 153 | - automated rebuild |
---|
| 154 | |
---|
| 155 | * Fri Nov 02 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-3 |
---|
| 156 | - Make sure %%post scriplet doesn't fail if --excludedocs is used. |
---|
| 157 | |
---|
| 158 | * Fri Jun 01 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-2 |
---|
| 159 | - Install diff.1, since it's no longer in man-pages. |
---|
| 160 | |
---|
| 161 | * Fri Mar 30 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-1 |
---|
| 162 | - 2.7.2. |
---|
| 163 | |
---|
| 164 | * Wed Jul 12 2000 Prospector <bugzilla@redhat.com> |
---|
| 165 | - automatic rebuild |
---|
| 166 | |
---|
| 167 | * Thu Jul 06 2000 Trond Eivind Glomsr <teg@redhat.com> |
---|
| 168 | - fix %%changelog entries (escape them) |
---|
| 169 | - update source location |
---|
| 170 | - remove manual stripping |
---|
| 171 | - add URL |
---|
| 172 | |
---|
| 173 | * Tue Jun 06 2000 Than Ngo <than@redhat.de> |
---|
| 174 | - add %%defattr |
---|
| 175 | - use rpm macros |
---|
| 176 | |
---|
| 177 | * Wed May 31 2000 Ngo Than <than@redhat.de> |
---|
| 178 | - put man pages and info files in correct place |
---|
| 179 | - cleanup specfile |
---|
| 180 | |
---|
| 181 | * Thu Feb 03 2000 Preston Brown <pbrown@redhat.com> |
---|
| 182 | - rebuild to gzip man pages. |
---|
| 183 | |
---|
| 184 | * Mon Apr 19 1999 Jeff Johnson <jbj@redhat.com> |
---|
| 185 | - man pages not in %%files. |
---|
| 186 | - but avoid conflict for diff.1 |
---|
| 187 | |
---|
| 188 | * Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> |
---|
| 189 | - auto rebuild in the new build environment (release 14) |
---|
| 190 | |
---|
| 191 | * Sun Mar 14 1999 Jeff Johnson <jbj@redhat.com> |
---|
| 192 | - add man pages (#831). |
---|
| 193 | - add %%configure and Prefix. |
---|
| 194 | |
---|
| 195 | * Thu Dec 17 1998 Cristian Gafton <gafton@redhat.com> |
---|
| 196 | - build for glibc 2.1 |
---|
| 197 | |
---|
| 198 | * Tue Jul 14 1998 Bill Kawakami <billk@home.com> |
---|
| 199 | - included the four man pages stolen from Slackware |
---|
| 200 | |
---|
| 201 | * Tue May 05 1998 Prospector System <bugs@redhat.com> |
---|
| 202 | - translations modified for de, fr, tr |
---|
| 203 | |
---|
| 204 | * Sun May 03 1998 Cristian Gafton <gafton@redhat.com> |
---|
| 205 | - fixed spec file to reference/use the $RPM_BUILD_ROOT always |
---|
| 206 | |
---|
| 207 | * Wed Dec 31 1997 Otto Hammersmith <otto@redhat.com> |
---|
| 208 | - fixed where it looks for 'pr' (/usr/bin, rather than /bin) |
---|
| 209 | |
---|
| 210 | * Fri Oct 17 1997 Donnie Barnes <djb@redhat.com> |
---|
| 211 | - added BuildRoot |
---|
| 212 | |
---|
| 213 | * Sun Sep 14 1997 Erik Troan <ewt@redhat.com> |
---|
| 214 | - uses install-info |
---|
| 215 | |
---|
| 216 | * Mon Jun 02 1997 Erik Troan <ewt@redhat.com> |
---|
| 217 | - built against glibc |
---|