[eg] fix-use-false-detection
Tom Callaway
spot at fedoraproject.org
Tue Apr 30 15:22:56 UTC 2013
commit 7fa9b74dd7a1db1c82d687b8cefa54682557a4da
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Apr 30 11:22:22 2013 -0400
fix-use-false-detection
eg-1.7.5.2-fix-use-false-detection.patch | 49 ++++++++++++++++++++++++++++++
eg.spec | 20 ++++--------
2 files changed, 56 insertions(+), 13 deletions(-)
---
diff --git a/eg-1.7.5.2-fix-use-false-detection.patch b/eg-1.7.5.2-fix-use-false-detection.patch
new file mode 100644
index 0000000..5ea5292
--- /dev/null
+++ b/eg-1.7.5.2-fix-use-false-detection.patch
@@ -0,0 +1,49 @@
+diff -up eg-1.7.5.2/eg.false eg-1.7.5.2/eg
+--- eg-1.7.5.2/eg.false 2013-04-30 11:16:02.524748253 -0400
++++ eg-1.7.5.2/eg 2013-04-30 11:18:01.716757063 -0400
+@@ -1466,8 +1466,8 @@ Options:
+ Reasons for this change:
+ * New users automatically get sane behavior, and use either eg diff A B
+ or eg diff A..B, each doing what one would expect. They do not ever
+- realize that A...B is a bit weird because they have no need to try to
+- use it; eg diff A B covers their needs.
++ realize that A...B is a bit weird because they have no need to try
++ to use it; eg diff A B covers their needs.
+ * Users worried about switching between eg and git without having to
+ modify their command lines can always use either diff A B or
+ diff A...B, but never any other form; using this subset ensures that
+@@ -2267,9 +2267,10 @@ Cryptographic checksums
+ (in particular, a sha1sum) identifying it. This cryptographic checksum
+ is a sequence of 40 letters and numbers from 0-9 and a-f. For example,
+ dae86e1950b1277e545cee180551750029cfe735
+- In addition to using these sha1sums to refer to revisions, one can also
+- use an abbreviation of a sha1sum so long as enough characters are used to
+- uniquely identify the revision (typically 6-8 characters are enough).
++ In addition to using these sha1sums to refer to revisions, one can
++ also use an abbreviation of a sha1sum so long as enough characters are
++ used to uniquely identify the revision (typically 6-8 characters are
++ enough).
+
+ Special Names
+ There are a few special revision names.
+@@ -2755,13 +2756,13 @@ Description:
+ pull' and 'eg help push' first.
+
+ Current branch
+- All development is done on a branch, though smaller projects may only
+- use one branch per repository (thus making the repository effectively
+- serve as a branch). In contrast to cvs and svn which refer to
+- mainline development as \"HEAD\" and \"TRUNK\", respectively, eg
+- calls the mainline development a branch as well, with the default
+- name of \"master\"). See 'eg help branch' and 'eg help topic
+- storage' for more details.
++ All development is done on a branch, though smaller projects may
++ only use one branch per repository (thus making the repository
++ effectively serve as a branch). In contrast to cvs and svn which
++ refer to mainline development as \"HEAD\" and \"TRUNK\",
++ respectively, eg calls the mainline development a branch as well,
++ with the default name of \"master\"). See 'eg help branch' and 'eg
++ help topic storage' for more details.
+
+ Cryptographic checksum
+ Each revision has an associated cryptographic checksum of both its
diff --git a/eg.spec b/eg.spec
index b5ff3ca..794a6ef 100644
--- a/eg.spec
+++ b/eg.spec
@@ -1,32 +1,28 @@
Name: eg
Version: 1.7.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Git for mere mortals
-
Group: Development/Tools
License: GPLv2
URL: http://www.gnome.org/~newren/eg/
Source0: %{name}-%{version}.tar.gz
-
+Patch0: eg-1.7.5.2-fix-use-false-detection.patch
# To reproduce, run:
# git clone git://gitorious.org/eg/mainline.git eg
# cd eg
# git archive --format=tar --prefix=eg-1.7.5.2/ v1.7.5.2 | gzip > eg-1.7.5.2.tar.gz
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Requires: perl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch
Requires: git
-
%description
Easy Git (eg) is a wrapper for git, designed to make git easy to learn and use.
-
%prep
%setup -q
+%patch0 -p1 -b .false
# Filter unwanted Requires:
cat << \EOF > %{name}-prov
@@ -38,10 +34,8 @@ EOF
%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_requires}
-
%build
-
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}/
@@ -51,20 +45,20 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/
install -m 644 bash-completion-eg.sh \
$RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/eg
-
%clean
rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/eg
-
%{_sysconfdir}/bash_completion.d
-
%changelog
+* Tue Apr 30 2013 Tom Callaway <spot at fedoraproject.org> - 1.7.5.2-5
+- patch out false "use " cases, where the word "use" appears at the beginning
+ of a block of documentation text (we strip these out anyways, but this patch can go upstream)
+
* Tue Apr 23 2013 Luis Bazan <lbazan at fedoraproject.org> - 1.7.5.2-4
- add other one requires
More information about the scm-commits
mailing list