[X2Go-Commits] [x2godesktopsharing] 04/13: Revert "x2godesktopsharing.spec: keep x2godesktopsharing name in most locations."

git-admin at x2go.org git-admin at x2go.org
Wed Nov 14 10:08:51 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit 52a9f44d6594886f1dedd3bbb4cc5be2b7eb52f4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 10:06:04 2018 +0100

    Revert "x2godesktopsharing.spec: keep x2godesktopsharing name in most locations."
    
    This reverts commit bf32771e72ed2a118559b0cf214f0edecc943412.
---
 debian/changelog        |  1 -
 x2godesktopsharing.spec | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91cafec..bca62a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,6 @@ 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 30a9e2b..dadcea7 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -1,4 +1,3 @@
-%global my_name x2godesktopsharing
 Name:           x2goserver-desktopsharing
 Version:        3.2.0.0
 Release:        0.0x2go1%{?dist}
@@ -12,8 +11,8 @@ Group:          Applications/Communications
 License:        GPLv2+
 %endif
 URL:            http://www.x2go.org
-Source0:        http://code.x2go.org/releases/source/%{my_name}/%{my_name}-%{version}.tar.gz
-Source1:        %{my_name}-rpmlintrc
+Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
+Source1:        %{name}-rpmlintrc
 
 %if 0%{?suse_version} && 0%{?suse_version} <= 1130
 BuildRequires:  update-desktop-files
@@ -75,7 +74,7 @@ Requires:       procps-ng
 %endif
 %endif
 
-BuildRoot:      %{_tmppath}/%{my_name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 Obsoletes:      x2godesktopsharing
 Provides:       x2godesktopsharing = %{version}-%{release}
@@ -111,20 +110,20 @@ make %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go}
-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
+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
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps
-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 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 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/%{my_name}.desktop
+%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop
 %endif
 
 
@@ -149,13 +148,13 @@ fi
 %defattr(-,root,root)
 %doc debian/changelog
 %doc debian/copyright
-%{_bindir}/%{my_name}
+%{_bindir}/%{name}
 %{_bindir}/x2goresume-desktopsharing
 %{_bindir}/x2gosuspend-desktopsharing
 %{_bindir}/x2goterminate-desktopsharing
-%{_datadir}/applications/%{my_name}.desktop
-%dir %{_datadir}/%{my_name}/
-%{_datadir}/%{my_name}/
+%{_datadir}/applications/%{name}.desktop
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/128x128
 %dir %{_datadir}/icons/hicolor/128x128/apps
@@ -167,12 +166,12 @@ fi
 %dir %{_datadir}/icons/hicolor/64x64/apps
 %dir %{_datadir}/x2go
 %dir %{_datadir}/x2go/x2gofeature.d
-%{_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
+%{_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
 %{_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


More information about the x2go-commits mailing list