diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index 8d1875e..9c74eb9 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -2,7 +2,7 @@ Name: eclipse-linuxtools Version: 1.2.0 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Linux specific Eclipse plugins License: EPL @@ -35,7 +35,7 @@ best practices and tools related to packaging. %package -n eclipse-changelog Version: 2.8.0 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Eclipse ChangeLog plug-in Epoch: 2 @@ -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,12 @@ popd %doc systemtap/org.eclipse.linuxtools.systemtap-feature/epl-v10.html %changelog +* Wed Jan 30 2013 1.2.0-4 +- Remove 'Requires: kernel-debuginfo' from systemtap. + +* Thu Jan 24 2013 1.2.0-3 +- Properly package PolicyKit for Eclipse OProfile. + * Mon Jan 7 2013 1.2.0-2 - Add 'Requires' to systemtap on kernel-debuginfo.