rpms/cvsps/EL-5 cvsps-2.2b1-diff-opts.patch, NONE, 1.1 cvsps.spec, 1.6, 1.7
Ville Skyttä
scop at fedoraproject.org
Wed Dec 23 15:25:44 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/cvsps/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3666
Modified Files:
cvsps.spec
Added Files:
cvsps-2.2b1-diff-opts.patch
Log Message:
* Wed Dec 23 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.1-7
- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
- Fix typo in man page.
cvsps-2.2b1-diff-opts.patch:
cvsps.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cvsps-2.2b1-diff-opts.patch ---
diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
--- cvsps-2.2b1/cvsps.1.orig 2009-12-22 21:16:20.000000000 +0200
+++ cvsps-2.2b1/cvsps.1 2009-12-22 21:16:25.000000000 +0200
@@ -83,7 +83,7 @@ some hacks which are not generally appli
disable the use of rlog internally. Note: rlog is
required for stable PatchSet numbering. Use with care.
.TP
-.B \-\-diffs\-opts <option string>
+.B \-\-diff\-opts <option string>
send a custom set of options to diff, for example to increase
the number of context lines, or change the diff format.
.TP
Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/EL-5/cvsps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cvsps.spec 27 Aug 2007 18:04:50 -0000 1.6
+++ cvsps.spec 23 Dec 2009 15:25:44 -0000 1.7
@@ -1,17 +1,19 @@
Name: cvsps
Version: 2.1
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: Patchset tool for CVS
Group: Development/Tools
License: GPL+
URL: http://www.cobite.com/cvsps/
Source0: http://www.cobite.com/cvsps/%{name}-%{version}.tar.gz
+Patch1: %{name}-2.2b1-diff-opts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
-# Requires cvs only with --no-cvs-direct, but I cannot imagine this dep
-# being a problem on systems where cvsps will be installed...
+# Strictly speaking, requires cvs only with --no-cvs-direct (which is
+# the default as of 2.1), but this shouldn't be a problem on systems
+# where cvsps will be installed.
Requires: cvs
%description
@@ -26,16 +28,16 @@ changes were committed 'atomically' to t
%prep
%setup -q
+%patch1 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS -DLINUX" make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 cvsps $RPM_BUILD_ROOT%{_bindir}/cvsps
-install -Dpm 644 cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1/cvsps.1
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
%clean
@@ -50,23 +52,27 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.1-5
+* Wed Dec 23 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.1-7
+- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
+- Fix typo in man page.
+
+* Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.1-5
- License: GPL+
-* Tue Aug 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.1-4
+* Tue Aug 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.1-4
- Rebuild.
-* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.1-3
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.1-3
- Rebuild.
-* Fri May 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.1-2
+* Fri May 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.1-2
- 2.1.
-* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.0-0.2.rc1
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.0-0.2.rc1
- Drop 0.fdr and Epoch: 0.
-* Sun Sep 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
+* Sun Sep 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
- Remove #---- section markers.
-* Fri Jul 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
+* Fri Jul 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
- First build.
More information about the fedora-extras-commits
mailing list