[packages/vivaldi] install desktop file

glen glen at pld-linux.org
Sun Sep 6 00:09:06 CEST 2015


commit 5f61973900b00cc0e30dae963b1a3397ed73b16c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 6 00:54:56 2015 +0300

    install desktop file

 vivaldi.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/vivaldi.spec b/vivaldi.spec
index 928dd04..a69f090 100644
--- a/vivaldi.spec
+++ b/vivaldi.spec
@@ -50,13 +50,15 @@ tar xf data.tar.xz && rm data.tar.xz
 version=$(awk '/Version:/{print $2}' control)
 test $version = %{version}-1
 
-mv opt/%{name}-snapshot %{name}
-mv %{name}/%{name}{-snapshot,}
+mv opt/%{name}-snapshot/* .
+mv %{name}{-snapshot,}
 
 sed -e 's|vivaldi-snapshot|vivaldi|g' \
 		usr/share/applications/%{name}-snapshot.desktop \
 		usr/share/xfce4/helpers/%{name}-snapshot.desktop
 
+mv usr/share/applications/vivaldi-snapshot.desktop %{name}.desktop
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
@@ -64,7 +66,6 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
 	$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{native-messaging-hosts,policies/managed}
 
-cd %{name}
 cp -a locales resources $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -p *.pak *.bin *.dat $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s %{_datadir}/%{name}/locales $RPM_BUILD_ROOT%{_libdir}/%{name}/locales
@@ -72,6 +73,7 @@ ln -s %{_datadir}/%{name}/resources $RPM_BUILD_ROOT%{_libdir}/%{name}/resources
 install -p %{name} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
 install -p %{name}-sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
+cp -p %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
 install_icons() {
 	set +x
@@ -105,6 +107,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
+%{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/apps/%{name}.png
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/resources
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vivaldi.git/commitdiff/a0a6d2fb1a6adabd9aa3f35bf28b398a9016d6d4



More information about the pld-cvs-commit mailing list