This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 8eb2d9f SLE (<= 11.3) builds: Use %suse_update_desktop_file -nu <desktop-file> to mark .desktop file non-translatable and unimportant to SuSE. new 3468e1d SLE (<= 11.3) builds: Use %suse_update_desktop_file -n <desktop-file> to mark .desktop file non-translatable. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- x2godesktopsharing.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 3468e1df65ace58306cccc880c8ad4a806ab54e4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 12:23:10 2015 +0100 SLE (<= 11.3) builds: Use %suse_update_desktop_file -n <desktop-file> to mark .desktop file non-translatable. --- debian/changelog | 4 ++-- x2godesktopsharing.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ece361d..76dc121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,8 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low + Add x2godesktopsharing-rpmlintrc. + Own directories that we put files in. + Always set BuildRoot: parameter. - + SLE (<= 11.3) builds: Use %suse_update_desktop_file -nu <desktop-file> - to mark .desktop file non-translatable and unimportant to SuSE. + + SLE (<= 11.3) builds: Use %suse_update_desktop_file -n <desktop-file> + to mark .desktop file non-translatable. [ Mark Pedersen-Cook ] * New upstream version (3.1.1.2): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index b406e0d..da7b44d 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -80,9 +80,6 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} cp -p %{name} %{buildroot}%{_bindir}/ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop -%if 0%{?suse_version} && 0%{?suse_version} <= 1130 -%suse_update_desktop_file -nu %{buildroot}%{_datadir}/applications/%{name}.desktop -%endif mkdir -p %{buildroot}%{_datadir}/%{name}/icons install -p -m 644 icons/%{name}.xpm %{buildroot}%{_datadir}/%{name}/icons/%{name}.xpm mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps @@ -93,6 +90,9 @@ install -p -m 644 icons/32x32/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/ install -p -m 755 bin/* %{buildroot}%{_bindir}/ cp -rp share/* %{buildroot}%{_datadir}/x2go/ cp -rp man %{buildroot}%{_datadir}/ +%if 0%{?suse_version} && 0%{?suse_version} <= 1130 +%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop +%endif %pre -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org