P R Schaffner updated this to work for 7.11.0

1 files changed, 25 insertions, 19 deletions

diff --git a/packages/Linux/RPM/curl-ssl.spec.in b/packages/Linux/RPM/curl-ssl.spec.in
index 15713bed8..066eb49a7 100644
--- a/packages/Linux/RPM/curl-ssl.spec.in
+++ b/packages/Linux/RPM/curl-ssl.spec.in
@@ -1,22 +1,23 @@
 %define name curl-ssl
 %define tarball curl
-%define version @VERSION@
+%define version 7.11.0
 %define release 1
-%define prefix /usr
 
-%define builddir $RPM_BUILD_DIR/%{tarball}-%{version}
+%define curlroot %{_builddir}/%{tarball}-%{version}
 
 Summary: get a file from a FTP, GOPHER or HTTP server.
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Copyright: MPL
+Copyright: MIT/X derivate
 Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se>
-Packager: Loic Dachary <loic@senga.org>
+Packager: Troy Engel <tengel@sonic.net>
 Group: Utilities/Console
 Source: %{tarball}-%{version}.tar.gz
 URL: http://curl.haxx.se/
-BuildRoot: /tmp/%{tarball}-%{version}-root
+Provides: curl
+Obsoletes: curl
+BuildRoot: %{_tmppath}/%{tarball}-%{version}-root
 Requires: openssl >= 0.9.5
 
 %description
@@ -31,27 +32,29 @@ authentication, ftp upload, HTTP post, file transfer resume and more.
 Summary:	The includes, libs, and man pages to develop with libcurl
 Group:		Development/Libraries
 Requires:	openssl-devel >= 0.9.5
+Provides:	curl-devel
 
 %description devel
 libcurl is the core engine of curl; this packages contains all the libs,
 headers, and manual pages to develop applications using libcurl.
 
 %prep
-rm -rf %{builddir}
 
-%setup -n %{tarball}-%{version} 
+%setup -q -n %{tarball}-%{version} 
 
 %build
-%configure --prefix=%{prefix} --with-ssl
+cd %{curlroot} && (if [ -f configure.in ]; then mv -f configure.in configure.in.rpm; fi)
+%configure
+cd %{curlroot} && (if [ -f configure.in.rpm ]; then mv -f configure.in.rpm configure.in; fi)
 make 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install-strip
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install-strip
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf %{builddir}
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+[ "%{curlroot}" != "/" ] && rm -rf %{curlroot}
 
 %post
 /sbin/ldconfig
@@ -62,17 +65,20 @@ rm -rf %{builddir}
 %files
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/curl
-%attr(0644,root,root) %{_mandir}/man1/*
+%attr(0644,root,root) %{_mandir}/man1/curl.1*
 %{_libdir}/libcurl.so*
-%doc CHANGES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS
-%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS
-%doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO
-%doc docs/TheArtOfHttpScripting
+%{_datadir}/curl/curl-ca-bundle.crt
+%doc CHANGES COPYING README testcurl.sh docs/BUGS docs/SSLCERTS
+%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY docs/INSTALL
+%doc docs/KNOWN_BUGS docs/MANUAL docs/RESOURCES docs/THANKS
+%doc docs/TODO docs/VERSIONS docs/TheArtOfHttpScripting tests
 
 %files devel
 %defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/curl-config
+%attr(0644,root,root) %{_mandir}/man1/curl-config.1*
 %attr(0644,root,root) %{_mandir}/man3/*
 %attr(0644,root,root) %{_includedir}/curl/*
 %{_libdir}/libcurl.a
 %{_libdir}/libcurl.la
-%doc docs/examples/*
+%doc docs/BINDINGS docs/INTERNALS docs/examples/* docs/libcurl-the-guide