Attachment 8796 Details for Bug 19968 – Patch for draklive-install package spec file

Patch for draklive-install package spec file

draklive-install-svn.patch (text/plain), 1.91 KB, created by Martin Whitaker on 2016-12-17 15:50:13 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2016-12-17 15:50:13 CET

Size: 1.91 KB

patch

obsolete

>Index: draklive-install.spec
>===================================================================
>--- draklive-install.spec	(revision 1075101)
>+++ draklive-install.spec	(working copy)
>@@ -2,7 +2,7 @@
> 
> Summary:	Live installer
> Name:		draklive-install
>-Version:	2.7
>+Version:	2.8
> Release:	%mkrel 1
> Source0:	%{name}-%{version}.tar.xz
> License:	GPL
>@@ -32,18 +32,10 @@
> done
> install -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
> install -m 0755 %{name}-lock-storage %{buildroot}%{_sbindir}/
>+install -D -m 0755 %{name}.wrapper %{buildroot}%{_bindir}/%{name}
> 
>-mkdir -p %{buildroot}%_bindir
>-ln -sf consolehelper %{buildroot}%_bindir/%{name}-lock-storage
>-mkdir -p %{buildroot}%{_sysconfdir}/pam.d
>-ln -sf %_real_vendor-console-auth %{buildroot}%{_sysconfdir}/pam.d/%{name}-lock-storage
>-mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
>-cat > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-lock-storage <<EOF
>-USER=<user>
>-PROGRAM=/usr/sbin/%{name}-lock-storage
>-FALLBACK=false
>-SESSION=true
>-EOF
>+install -D -m 0644 org.mageia.%{name}.policy %{buildroot}%{_datadir}/polkit-1/actions/org.mageia.%{name}.policy
>+install -m 0644 org.mageia.%{name}-lock-storage.policy %{buildroot}%{_datadir}/polkit-1/actions/org.mageia.%{name}-lock-storage.policy
> 
> mkdir -p %{buildroot}{%_miconsdir,%_iconsdir,%_liconsdir,%_menudir,%_datadir/libDrakX/pixmaps/,%_datadir/applications,%_datadir/icons/hicolor/{16x16,32x32,48x48,64x64}/apps}
> install data/icons/IC-installLive-48.png %{buildroot}%_liconsdir/%name.png
>@@ -62,9 +54,8 @@
> %files -f %{name}.lang
> %{_sbindir}/%{name}
> %{_sbindir}/%{name}-lock-storage
>-%{_bindir}/%{name}-lock-storage
>-%{_sysconfdir}/pam.d/%{name}-lock-storage
>-%{_sysconfdir}/security/console.apps/%{name}-lock-storage
>+%{_bindir}/%{name}
>+%{_datadir}/polkit-1/actions/*.policy
> %{_datadir}/dist/desktop-files/*/*.desktop
> %{_datadir}/applications/%{_real_vendor}-draklive-install.desktop
> %{_iconsdir}/%{name}.png

Index: draklive-install.spec
===================================================================
--- draklive-install.spec	(revision 1075101)
+++ draklive-install.spec	(working copy)
@@ -2,7 +2,7 @@
 
 Summary:	Live installer
 Name:		draklive-install
-Version:	2.7
+Version:	2.8
 Release:	%mkrel 1
 Source0:	%{name}-%{version}.tar.xz
 License:	GPL
@@ -32,18 +32,10 @@
 done
 install -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
 install -m 0755 %{name}-lock-storage %{buildroot}%{_sbindir}/
+install -D -m 0755 %{name}.wrapper %{buildroot}%{_bindir}/%{name}
 
-mkdir -p %{buildroot}%_bindir
-ln -sf consolehelper %{buildroot}%_bindir/%{name}-lock-storage
-mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-ln -sf %_real_vendor-console-auth %{buildroot}%{_sysconfdir}/pam.d/%{name}-lock-storage
-mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
-cat > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-lock-storage <<EOF
-USER=<user>
-PROGRAM=/usr/sbin/%{name}-lock-storage
-FALLBACK=false
-SESSION=true
-EOF
+install -D -m 0644 org.mageia.%{name}.policy %{buildroot}%{_datadir}/polkit-1/actions/org.mageia.%{name}.policy
+install -m 0644 org.mageia.%{name}-lock-storage.policy %{buildroot}%{_datadir}/polkit-1/actions/org.mageia.%{name}-lock-storage.policy
 
 mkdir -p %{buildroot}{%_miconsdir,%_iconsdir,%_liconsdir,%_menudir,%_datadir/libDrakX/pixmaps/,%_datadir/applications,%_datadir/icons/hicolor/{16x16,32x32,48x48,64x64}/apps}
 install data/icons/IC-installLive-48.png %{buildroot}%_liconsdir/%name.png
@@ -62,9 +54,8 @@
 %files -f %{name}.lang
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}-lock-storage
-%{_bindir}/%{name}-lock-storage
-%{_sysconfdir}/pam.d/%{name}-lock-storage
-%{_sysconfdir}/security/console.apps/%{name}-lock-storage
+%{_bindir}/%{name}
+%{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/dist/desktop-files/*/*.desktop
 %{_datadir}/applications/%{_real_vendor}-draklive-install.desktop
 %{_iconsdir}/%{name}.png

Actions: View

Attachments on bug 19968: 8795 | 8796