rpms/polkit-qt/F-12 macros.polkit-qt, NONE, 1.1 polkit-qt-0.95.1-install-cmake-find.patch, NONE, 1.1 polkit-qt.spec, 1.6, 1.7

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/polkit-qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14885

Modified Files:
	polkit-qt.spec 
Added Files:
	macros.polkit-qt polkit-qt-0.95.1-install-cmake-find.patch 
Log Message:
sync w/devel



--- NEW FILE macros.polkit-qt ---
%_polkit_qt 1
%_polkit_qt_policydir %{_datadir}/polkit-1/actions

polkit-qt-0.95.1-install-cmake-find.patch:
 CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE polkit-qt-0.95.1-install-cmake-find.patch ---
diff -up polkit-qt-1-0.95.1/cmake/modules/CMakeLists.txt.install-cmake-find polkit-qt-1-0.95.1/cmake/modules/CMakeLists.txt
--- polkit-qt-1-0.95.1/cmake/modules/CMakeLists.txt.install-cmake-find	2009-12-23 12:31:13.000000000 +0100
+++ polkit-qt-1-0.95.1/cmake/modules/CMakeLists.txt	2010-01-14 15:22:30.100520720 +0100
@@ -1,9 +1,9 @@
  
 ## install the cmake files
 
-#file( GLOB cmakeFiles FindPolkitQt.cmake )
-#set(module_install_dir ${CMAKE_ROOT}/Modules )
+file( GLOB cmakeFiles FindPolkitQt-1.cmake )
+set(module_install_dir ${CMAKE_ROOT}/Modules )
 
-#install( FILES ${cmakeFiles} 
-#         DESTINATION ${module_install_dir}  )
+install( FILES ${cmakeFiles} 
+         DESTINATION ${module_install_dir}  )
 


Index: polkit-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-qt/F-12/polkit-qt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- polkit-qt.spec	7 Jan 2010 14:43:34 -0000	1.6
+++ polkit-qt.spec	19 Jan 2010 15:01:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:            polkit-qt
 Version:         0.95.1
-Release:         1%{?dist}
+Release:         3%{?dist}
 Summary:         Qt bindings for PolicyKit
 
 Group:           System Environment/Libraries
@@ -9,8 +9,13 @@ URL:             http://websvn.kde.org/b
 
 Source0:         %{name}-1-%{version}.tar.bz2
 Source1:         Doxyfile
+
+Patch0:          polkit-qt-0.95.1-install-cmake-find.patch
+
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source10: macros.polkit-qt
+
 BuildRequires:   automoc4
 BuildRequires:   cmake
 BuildRequires:   polkit-devel >= 0.95
@@ -46,6 +51,9 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-1-%{version}
 
+# temporary patch - installs FindPolkitQt-1.cmake until we decide how to deal with cmake 
+# module installation
+%patch0 -p1 -b .install-cmake-find
 
 %build
 mkdir -p %{_target_platform}
@@ -63,6 +71,7 @@ rm html/installdox
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/rpm/macros.polkit-qt
 
 %clean
 rm -rf %{buildroot}
@@ -82,6 +91,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.polkit-qt
 %{_includedir}/polkit-qt-1/
 %{_libdir}/libpolkit-qt-core-1.so
 %{_libdir}/libpolkit-qt-gui-1.so
@@ -90,12 +100,19 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/polkit-qt-core-1.pc
 %{_libdir}/pkgconfig/polkit-qt-gui-1.pc
 %{_libdir}/pkgconfig/polkit-qt-agent-1.pc
+%{_datadir}/cmake/Modules/*.cmake
 
 %files doc
 %defattr(-,root,root,-)
 %doc html/*
 
 %changelog
+* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.95.1-3
+- macros.polkit-qt : %%_polkit_qt_policydir, %%_polkit_qt
+
+* Thu Jan 14 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.95.1-2
+- Installs FindPolkitQt-1.cmake
+
 * Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.95.1-1
 - Update to release version