Attachment 304760 Details for Bug 225671 – Patch against devel cvs for minor spec issues

[patch] Patch against devel cvs for minor spec issues

curl.spec.patch (text/plain), 1.56 KB, created by Paul Howarth on 2008-05-07 12:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Howarth

Created: 2008-05-07 12:48:34 UTC

Size: 1.56 KB

patch

obsolete

>? curl-7.18.0.tar.bz2
>? curl-7.18.1-1.fc10.src.rpm
>? curl.spec.patch
>Index: curl.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
>retrieving revision 1.74
>diff -u -r1.74 curl.spec
>--- curl.spec	31 Mar 2008 07:50:41 -0000	1.74
>+++ curl.spec	7 May 2008 12:31:53 -0000
>@@ -11,7 +11,7 @@
> Provides: webclient
> URL: http://curl.haxx.se/
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
>+BuildRequires: pkgconfig, libidn-devel, zlib-devel
> BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
> 
> %description
>@@ -49,14 +49,25 @@
> %patch2 -p1 -b .privlibs
> %patch3 -p1 -b .badsocket
> 
>+# Convert docs to UTF-8
>+for f in CHANGES README; do
>+	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
>+	mv -f ${f}.utf8 ${f}
>+done
>+
> %build
>-export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT -D_GNU_SOURCE=1"
>+export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
> %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
> 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
> 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
> 	--enable-ldaps --disable-static
> sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
> 	Makefile libcurl.pc
>+# Remove bogus rpath
>+sed -i \
>+	-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
>+	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
>+
> make %{?_smp_mflags}
> 
> %install

Actions: View | Diff

Attachments on bug 225671: 304760