Packaging cleanups

- Fix whitespace
- Package license for libcurl
- Fix RPM group tags
- Add the upstream URL

Change-Id: I101c1d0272da282dced66d439058d84ead13bd39

diff --git a/packaging/curl.changes b/packaging/curl.changes
index 9133baa..e05b821 100644 (file)
--- a/packaging/curl.changes
+++ b/packaging/curl.changes
@@ -1,3 +1,7 @@
+* Wed Sep 4 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 71d6fee
+- Packaging cleanups (fix RPM group tags, whitespace)
+- Update to 7.32.0 (addresses multiple CVEs)
+
 * Fri Feb 15 2013 Anas Nashif <anas.nashif@intel.com> upstream/7.21.3@96b84bd
 - Add baselibs
 

diff --git a/packaging/curl.spec b/packaging/curl.spec
index 6ad8364..9ef85e2 100644 (file)
--- a/packaging/curl.spec
+++ b/packaging/curl.spec
@@ -1,19 +1,18 @@
-Name:       curl
-Summary:    A utility for getting files from remote servers (FTP, HTTP, and others)
-Version:    7.32.0
-Release:    0
-Group:      Applications/Internet
-License:    MIT
-Source0:    %{name}-%{version}.tar.bz2
-Source1001:    curl.manifest
-
-BuildRequires:  pkgconfig(openssl)
+Name:           curl
+Version:        7.32.0
+Release:        0
+License:        MIT
+Summary:        A utility for getting files from remote servers (FTP, HTTP, and others)
+Url:            http://curl.haxx.se/
+Group:          Base/Utilities
+Source0:        %{name}-%{version}.tar.bz2
+Source1001:     %{name}.manifest
+BuildRequires:  pkgconfig(libcares)
 BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(nss)
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libcares)
-Provides:   webclient
-
+Provides:       webclient
 
 %description
 cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS,
@@ -22,24 +21,21 @@ cURL is designed to work without user interaction or any kind of
 interactivity. cURL offers many useful capabilities, like proxy support,
 user authentication, FTP upload, HTTP post, and file transfer resume.
 
-
-
 %package -n libcurl
-Summary:    A library for getting files from web servers
-Group:      System/Libraries
+Summary:        A library for getting files from web servers
+Group:          Base/Libraries
 
 %description -n libcurl
 This package provides a way for applications to use FTP, HTTP, Gopher and
 other servers for getting files.
 
-
 %package -n libcurl-devel
-Summary:    Files needed for building applications with libcurl
-Group:      Development/Libraries
-Requires:   libcurl = %{version}-%{release}
-Requires:   libidn-devel
-Provides:   curl-devel = %{version}-%{release}
-Obsoletes:   curl-devel < %{version}-%{release}
+Summary:        Files needed for building applications with libcurl
+Group:          Base/Development
+Requires:       libcurl = %{version}
+Requires:       libidn-devel
+Provides:       curl-devel = %{version}
+Obsoletes:      curl-devel < %{version}
 
 %description -n libcurl-devel
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -47,28 +43,30 @@ Dict servers, using any of the supported protocols. The libcurl-devel
 package includes files needed for developing applications which can
 use cURL's capabilities internally.
 
-
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
 
-%reconfigure --without-nss --without-gnutls --with-openssl --disable-ipv6 \
---with-ca-path=/etc/ssl/certs \
---with-libidn \
---with-lber-lib=lber \
---enable-manual --enable-versioned-symbols --enable-ares --enable-debug --enable-curldebug \
---disable-static
-
-#--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt 
+%reconfigure --without-nss \
+        --without-gnutls \
+        --with-openssl \
+        --disable-ipv6 \
+        --with-ca-path=/etc/ssl/certs \
+        --with-libidn \
+        --with-lber-lib=lber \
+        --enable-manual \
+        --enable-versioned-symbols \
+        --enable-ares \
+        --enable-debug \
+        --enable-curldebug \
+        --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' \
@@ -77,20 +75,15 @@ sed -i \
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
-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
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
+rm -f %{buildroot}%{_libdir}/libcurl.la
+install -d %{buildroot}/%{_datadir}/aclocal
+install -m 644 docs/libcurl/libcurl.m4 %{buildroot}/%{_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
+find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \;
+rm -rf %{buildroot}%{_datadir}/man
 
 %post -n libcurl -p /sbin/ldconfig
 
@@ -103,6 +96,7 @@ rm -rf ${RPM_BUILD_ROOT}/usr/share/man
 
 %files -n libcurl
 %manifest %{name}.manifest
+%license COPYING
 %{_libdir}/libcurl.so.*
 
 %files -n libcurl-devel
@@ -112,5 +106,3 @@ rm -rf ${RPM_BUILD_ROOT}/usr/share/man
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/libcurl.m4
-
-