This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 7e0b185 x2godesktopsharing.spec: completely rename to x2goserver-desktopsharing, drop name overrides. new bf32771 x2godesktopsharing.spec: keep x2godesktopsharing name in most locations. new 44d3f10 x2godesktopsharing.spec: install system-wide configuration file, akin to Debian packages. The 2 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 | 2 ++ x2godesktopsharing.spec | 50 +++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 22 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 bf32771e72ed2a118559b0cf214f0edecc943412 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Nov 14 04:41:39 2018 +0100 x2godesktopsharing.spec: keep x2godesktopsharing name in most locations. --- debian/changelog | 1 + x2godesktopsharing.spec | 45 +++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index bca62a9..91cafec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Fix typo in %pre scriptlet package name. + Really fix the typo. + Completely rename to x2goserver-desktopsharing, drop name overrides. + + Keep x2godesktopsharing name in most locations. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index dadcea7..30a9e2b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,3 +1,4 @@ +%global my_name x2godesktopsharing Name: x2goserver-desktopsharing Version: 3.2.0.0 Release: 0.0x2go1%{?dist} @@ -11,8 +12,8 @@ Group: Applications/Communications License: GPLv2+ %endif URL: http://www.x2go.org -Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}-rpmlintrc +Source0: http://code.x2go.org/releases/source/%{my_name}/%{my_name}-%{version}.tar.gz +Source1: %{my_name}-rpmlintrc %if 0%{?suse_version} && 0%{?suse_version} <= 1130 BuildRequires: update-desktop-files @@ -74,7 +75,7 @@ Requires: procps-ng %endif %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{my_name}-%{version}-build Obsoletes: x2godesktopsharing Provides: x2godesktopsharing = %{version}-%{release} @@ -110,20 +111,20 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} -cp -p %{name} %{buildroot}%{_bindir}/ -desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop -mkdir -p %{buildroot}%{_datadir}/%{name}/icons -install -p -m 644 icons/%{name}.xpm %{buildroot}%{_datadir}/%{name}/icons/%{name}.xpm +cp -p %{my_name} %{buildroot}%{_bindir}/ +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{my_name}.desktop +mkdir -p %{buildroot}%{_datadir}/%{my_name}/icons +install -p -m 644 icons/%{my_name}.xpm %{buildroot}%{_datadir}/%{my_name}/icons/%{my_name}.xpm mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps -install -p -m 644 icons/128x128/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -install -p -m 644 icons/16x16/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -install -p -m 644 icons/64x64/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png -install -p -m 644 icons/32x32/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +install -p -m 644 icons/128x128/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{my_name}.png +install -p -m 644 icons/16x16/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{my_name}.png +install -p -m 644 icons/64x64/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png +install -p -m 644 icons/32x32/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png 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 +%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{my_name}.desktop %endif @@ -148,13 +149,13 @@ fi %defattr(-,root,root) %doc debian/changelog %doc debian/copyright -%{_bindir}/%{name} +%{_bindir}/%{my_name} %{_bindir}/x2goresume-desktopsharing %{_bindir}/x2gosuspend-desktopsharing %{_bindir}/x2goterminate-desktopsharing -%{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/%{name}/ -%{_datadir}/%{name}/ +%{_datadir}/applications/%{my_name}.desktop +%dir %{_datadir}/%{my_name}/ +%{_datadir}/%{my_name}/ %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/128x128 %dir %{_datadir}/icons/hicolor/128x128/apps @@ -166,12 +167,12 @@ fi %dir %{_datadir}/icons/hicolor/64x64/apps %dir %{_datadir}/x2go %dir %{_datadir}/x2go/x2gofeature.d -%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/icons/hicolor/64x64/apps/%{name}.png -%{_datadir}/x2go/x2gofeature.d/%{name}.features -%{_mandir}/man1/%{name}.1.gz +%{_datadir}/icons/hicolor/128x128/apps/%{my_name}.png +%{_datadir}/icons/hicolor/16x16/apps/%{my_name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png +%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png +%{_datadir}/x2go/x2gofeature.d/%{my_name}.features +%{_mandir}/man1/%{my_name}.1.gz %{_mandir}/man8/x2goresume-desktopsharing.8.gz %{_mandir}/man8/x2gosuspend-desktopsharing.8.gz %{_mandir}/man8/x2goterminate-desktopsharing.8.gz -- Alioth's /home/x2go-admin/maintenancescripts/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 44d3f10b486091e1bce9e7cc3474e545984030e1 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Nov 14 04:50:05 2018 +0100 x2godesktopsharing.spec: install system-wide configuration file, akin to Debian packages. --- debian/changelog | 1 + x2godesktopsharing.spec | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 91cafec..e1b650a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Really fix the typo. + Completely rename to x2goserver-desktopsharing, drop name overrides. + Keep x2godesktopsharing name in most locations. + + Install system-wide configuration file, akin to Debian packages. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 30a9e2b..5b864ab 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -121,6 +121,8 @@ install -p -m 644 icons/16x16/%{my_name}.png %{buildroot}%{_datadir}/icons/hicol install -p -m 644 icons/64x64/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png install -p -m 644 icons/32x32/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png install -p -m 755 bin/* %{buildroot}%{_bindir}/ +install -d -m 755 %{buildroot}%{_sysconfdir}/x2go/desktopsharing +install -p -m 644 debian/settings %{buildroot}%{_sysconfdir}/x2go/desktopsharing cp -rp share/* %{buildroot}%{_datadir}/x2go/ cp -rp man %{buildroot}%{_datadir}/ %if 0%{?suse_version} && 0%{?suse_version} <= 1130 @@ -176,6 +178,9 @@ fi %{_mandir}/man8/x2goresume-desktopsharing.8.gz %{_mandir}/man8/x2gosuspend-desktopsharing.8.gz %{_mandir}/man8/x2goterminate-desktopsharing.8.gz +%dir %{_sysconfdir}/x2go/ +%dir %{_sysconfdir}/x2go/desktopsharing +%config(noreplace) %{_sysconfdir}/x2go/desktopsharing/settings %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org