[qca2] pkgconfig-style deps tighten subpkg dep tighten %files use %_qt4 macros Requires: ca-certificates, -

[Rex Dieter]

commit 1a5f8a1a9a36ac67c0d2a4b89fe59ff09f80fba6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Nov 9 09:45:21 2011 -0600

    pkgconfig-style deps
    tighten subpkg dep
    tighten %files
    use %_qt4 macros
    Requires: ca-certificates, --certstore-path=/etc/ssl/certs/ca-bundle.crt

 qca2.spec |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/qca2.spec b/qca2.spec
index 79aeac3..61f053e 100644
--- a/qca2.spec
+++ b/qca2.spec
@@ -1,6 +1,6 @@
 Name:           qca2
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -10,7 +10,11 @@ URL:            http://delta.affinix.com/qca
 Source0:        http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel
+BuildRequires: pkgconfig(QtCore) 
+
+# owner of /etc/ssl/certs/ca-bundle.crt
+Requires: ca-certificates
+%{?_qt4:Requires: %{_qt4}%{?_isa} >= %{_qt4_version}}
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -25,23 +29,22 @@ application!
 %package        devel
 Summary:        Qt Cryptographic Architecture development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    devel
-This packages contains the development files for QCA
+This packages contains the development files for QCA.
 
 %prep
 %setup -q -n qca-%{version}
 
 %build
-unset QTDIR
+export PATH=%{_qt4_bindir}:$PATH
 ./configure \
   --prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
+  --includedir=%{_qt4_headerdir} \
+  --libdir=%{_qt4_libdir} \
   --datadir=%{_datadir} \
   --no-separate-debug-info \
+  --certstore-path=%{_sysconfdir}/ssl/certs/ca-bundle.crt \
   --verbose
 
 sed -i -e /strip/d Makefile
@@ -53,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
 
+%check
+# FIXME: lots of failures. :( don't enable by default yet  -- rex
+#make test ||:
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,24 +68,30 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
+%{_qt4_libdir}/libqca.so.2*
 %{_bindir}/qcatool2
-%{_libdir}/*.so.*
 %{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/QtCrypto
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/qca2.pc
-%{_libdir}/libqca.prl
-%{_libdir}/qt4/mkspecs/features/crypto.prf
+%{_qt4_headerdir}/QtCrypto/
+%{_qt4_libdir}/libqca.prl
+%{_qt4_libdir}/libqca.so
+%{_qt4_libdir}/pkgconfig/qca2.pc
+%{_qt4_libdir}/qt4/mkspecs/features/crypto.prf
 
 
 %changelog
+* Wed Nov 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.0.3-3
+- pkgconfig-style deps
+- tighten subpkg dep
+- tighten %files
+- use %%_qt4 macros
+- Requires: ca-certificates, --certstore-path=/etc/ssl/certs/ca-bundle.crt
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild