[eclipse-linuxtools] Properly package PolicyKit for Eclipse OProfile.

[Roland Grunberg]

commit 1b39c356f92a7300e210b94c64286b4a0a9ad6ee
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Jan 24 20:31:39 2013 -0500

    Properly package PolicyKit for Eclipse OProfile.

 eclipse-linuxtools.spec |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 8d1875e..4af73af 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -2,7 +2,7 @@
 
 Name:           eclipse-linuxtools
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux specific Eclipse plugins
 
 License:        EPL
@@ -207,22 +207,23 @@ OPROFILECOREVERSION=$(ls . | grep org.eclipse.linuxtools.oprofile.core_ | sed 's
 unzip org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION.jar -d ./org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION
 rm -fr org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION.jar
 %global corepath %{buildroot}%{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION
+
 #create opcontrol wrapper
-ln -s %{_bindir}/consolehelper \
-  %{corepath}/natives/linux/scripts/opcontrol
+pushd %{corepath}/natives/linux/scripts
+rm -f .svnignore
+echo '#!/bin/sh' > opcontrol
+echo 'exec pkexec /usr/bin/opcontrol ${1+"$@"}' >> opcontrol
+popd
 
 #install opcontrol wrapper permission files
-install -d -m 755 %{buildroot}%{_sysconfdir}/security/console.apps
-install -D -m 644 org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/opcontrol-wrapper.security \
-  %{buildroot}%{_sysconfdir}/security/console.apps/opcontrol
-install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
+install -d -m 755 %{buildroot}%{_datadir}/polkit-1/actions
 install -D -m 644 \
-  org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/opcontrol-wrapper.pamd \
-  %{buildroot}%{_sysconfdir}/pam.d/opcontrol
+ org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy \
+%{buildroot}%{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
+
+#remove installed files
+rm -f org.eclipse.linuxtools.oprofile.core_$OPROFILECOREVERSION/natives/linux/scripts/org.eclipse.linuxtools.oprofile.policy
 
-#remove install/uninstall script (used in update site only)
-rm -f %{corepath}/natives/linux/scripts/install{,-noconsolehelper}.sh
-rm -f %{corepath}/natives/linux/scripts/uninstall{,-noconsolehelper}.sh
 popd
 
 
@@ -263,8 +264,8 @@ popd
 
 %files -n eclipse-oprofile
 %{eclipse_dropin}/oprofile
-%{_sysconfdir}/security/console.apps/opcontrol
-%{_sysconfdir}/pam.d/opcontrol
+%attr(755, root, root) %{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_*/natives/linux/scripts/opcontrol
+%{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
 %doc oprofile/org.eclipse.linuxtools.oprofile-feature/license.html
 %doc oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
 
@@ -284,6 +285,9 @@ popd
 %doc systemtap/org.eclipse.linuxtools.systemtap-feature/epl-v10.html
 
 %changelog
+* Thu Jan 24 2013 <rgrunber at redhat.com> 1.2.0-2
+- Properly package PolicyKit for Eclipse OProfile.
+
 * Mon Jan 7 2013 <swagiaal at redhat.com> 1.2.0-2
 - Add 'Requires' to systemtap on kernel-debuginfo.