This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 62b1004 fix permissions file(3) new 6a2ea90 Revert "SUSE-branding fix" new 5048137 Revert "Forceful BR on glib2-branding-SLE for SUSE <= 11.2." 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 | 1 - x2goserver.spec | 4 ---- 2 files changed, 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6a2ea90a685d973c625a533e7f75d38545ab27b4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 1 08:50:18 2015 +0100 Revert "SUSE-branding fix" This reverts commit 092b84f8487ac5bd8a2d95bcb427e6184599b022. --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index c3515b4..d3b4469 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -24,7 +24,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1130 +%if 0%{?suse_version} && 0%{?suse_version} <= 1120 BuildRequires: glib2-branding-SLED %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 5048137658e13c7fd934bf39667e1692fb51b940 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 1 08:51:49 2015 +0100 Revert "Forceful BR on glib2-branding-SLE for SUSE <= 11.2." This reverts commit 174ee1d46b61b6be932659436f6f51ae50136694. Conflicts: debian/changelog x2goserver.spec --- debian/changelog | 1 - x2goserver.spec | 4 ---- 2 files changed, 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2bae5a7..eea041e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -256,7 +256,6 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + rpmlint requires shared-mime-info at build time on SLE <= 11.3. + "%set_permissions" / "%verify_permissions" macros are not know in SLE <= 11.3. Using "%run permissions" and "%verify permissions" instead. - + Forceful BR on glib2-branding-SLES for SUSE <= 11.2. + On SUSE, add permissions.d/x2goserver. [ Matthew L. Dailey ] diff --git a/x2goserver.spec b/x2goserver.spec index d3b4469..7875764 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -24,10 +24,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1120 -BuildRequires: glib2-branding-SLED -%endif - BuildRequires: findutils %if 0%{?suse_version} || 0%{?suse_version} <= 1130 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org