Changeset 1925 for trunk/server

Timestamp:

Jul 1, 2011, 4:33:35 PM (13 years ago)

Author:

geofft

Message:

It helps to edit curl.spec instead of curl.spec.orig

File:

• trunk/server/fedora/specs/curl.spec.patch (modified) (2 diffs)

trunk/server/fedora/specs/curl.spec.patch

@@ -1 @@
---- curl.spec.orig      2011-07-01 16:14:46.000000000 -0400
-+++ curl.spec   2011-07-01 10:50:46.000000000 -0400
+--- curl.spec.orig      2011-07-01 16:31:16.000000000 -0400
++++ curl.spec   2011-07-01 16:30:24.000000000 -0400
 @@ -1,7 +1,7 @@
  Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
@@ -28 +28 @@
  # other patches
  %patch15 -p1
-@@ -225,6 +229,16 @@
+@@ -225,16 +229,6 @@
  
  make %{?_smp_mflags}
  
-+%check
-+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-+export LD_LIBRARY_PATH
-+cd tests
-+make %{?_smp_mflags}
-+
-+# use different port range for 32bit and 64bit build, thus make it possible
-+# to run both in parallel on the same machine
-+./runtests.pl -a -b%{?__isa_bits}90 -p -v
-+
+-%check
+-LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+-export LD_LIBRARY_PATH
+-cd tests
+-make %{?_smp_mflags}
+-
+-# use different port range for 32bit and 64bit build, thus make it possible
+-# to run both in parallel on the same machine
+-./runtests.pl -a -b%{?__isa_bits}90 -p -v
+-
  %install
  rm -rf $RPM_BUILD_ROOT
  
-@@ -279,6 +293,10 @@
+@@ -289,6 +283,10 @@
  %{_datadir}/aclocal/libcurl.m4
  
  %changelog
-+* Fri Jul 01 2011 Geoffrey Thomas <geofft@mit.edu> 7.20.1-5.scripts.r1924
++* Fri Jul 01 2011 Geoffrey Thomas <geofft@mit.edu> 7.20.1-5.scripts
 +- disable credential delegation over Negotiate (CVE-2011-2192)
 +  Patch from upstream: http://curl.haxx.se/docs/adv_20110623.html