update for beta universally

diff --git a/packaging/curl.spec b/packaging/curl.spec
index 0217ba4..9f976a6 100644 (file)
--- a/packaging/curl.spec
+++ b/packaging/curl.spec
@@ -7,14 +7,7 @@ License:    MIT
 URL:        http://curl.haxx.se/
 Source0:    http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 
-Patch0: no_com_err.patch
-Patch1: runtests_gdb.patch
-Patch2: art_http_scripting.patch
-Patch3: versioned.patch
-Patch4: curl_links_with_rt.patch
-#Patch5: gnutls.patch
-#Patch6: nss.patch
-
+BuildRequires: pkgconfig(libcares)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(nss)
@@ -62,22 +55,8 @@ use cURL's capabilities internally.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-
 %build
-
-export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
-
-%reconfigure --without-nss --without-gnutls --enable-ipv6 \
---with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
---with-libidn \
---disable-static
+%reconfigure --disable-dependency-tracking --disable-ipv6 --with-lber-lib=lber --enable-manual --enable-versioned-symbols --enable-ares --with-ca-path=/etc/ssl/certs --without-gnutls --without-nss --with-openssl
 
 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
@@ -89,20 +68,16 @@ sed -i \
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+%make_install
 
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
-
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
 
 
 # don't need curl's copy of the certs; use openssl's
 find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
-rm -rf ${RPM_BUILD_ROOT}/usr/share/man
+
+%remove_docs
 
 %post -n libcurl -p /sbin/ldconfig