Merge branch 'master' into f18

Conflicts:
	PackageKit-Qt.spec

PackageKit-Qt.spec

@@ -1,14 +1,14 @@
 Summary:   Qt support library for PackageKit
 Name:      PackageKit-Qt
 Version:   0.8.6
-Release:   2%{?dist}
+Release:   3%{?dist}
+
 License:   LGPLv2+
-URL:       http://www.packagekit.org
+URL:       http://www.packagekit.org/
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 
 BuildRequires: cmake
-BuildRequires: libtool
+BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql)
-BuildRequires: qt-devel
 
 Obsoletes: PackageKit-qt < 0.8.6
 Provides:  PackageKit-qt = %{version}-%{release}
@@ -22,7 +22,7 @@ PackageKit-qt is a Qt support library for PackageKit
 
 %package devel
 Summary: Development headers for PackageKit-Qt
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 Obsoletes: PackageKit-qt-devel < 0.8.6
 Provides:  PackageKit-qt-devel = %{version}-%{release}
@@ -30,40 +30,49 @@ Provides:  PackageKit-qt-devel = %{version}-%{release}
 %description devel
 Development headers and libraries for PackageKit-Qt.
 
+
 %prep
 %setup -q
 
+
 %build
-# cannot do in-tree build
+mkdir -p %{_target_platform}
-mkdir build
+pushd %{_target_platform}
-cd build
+%{cmake} \
-%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir} ../
+  -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-make %{?_smp_mflags}
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
 
 %install
-cd build
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-make install DESTDIR=$RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS NEWS COPYING
-%{_libdir}/*libpackagekit-qt2.so.*
+%{_libdir}/libpackagekit-qt2.so.%{version}
+%{_libdir}/libpackagekit-qt2.so.5*
 
 %files devel
-%defattr(-,root,root,-)
-%doc AUTHORS NEWS COPYING
 %{_libdir}/libpackagekit-qt2.so
 %{_libdir}/pkgconfig/packagekit-qt2.pc
-%dir %{_includedir}/PackageKit/packagekit-qt2
+%dir %{_includedir}/PackageKit
-%{_includedir}/PackageKit/packagekit-qt2/*
+%{_includedir}/PackageKit/packagekit-qt2/
-%dir %{_libdir}/cmake/packagekit-qt2
+%dir %{_libdir}/cmake
-%{_libdir}/cmake/packagekit-qt2/*.cmake
+%{_libdir}/cmake/packagekit-qt2/
+
 
 %changelog
+* Mon Nov 26 2012 Rex Dieter <rdieter@fedoraproject.org> 0.8.6-3
+- fixup dir ownership
+- use pkgconfig-style deps
+- tighten subpkg dep via %%?_isa
+
 * Mon Nov 26 2012 Richard Hughes <richard@hughsie.com> 0.8.6-2
 - Added obsoletes/provides as required for the Fedora package review