[X2Go-Commits] [x2goserver] 02/02: Revert "Forceful BR on glib2-branding-SLE for SUSE <= 11.2."

git-admin at x2go.org git-admin at x2go.org
Sun Feb 1 08:51:55 CET 2015


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 at 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


More information about the x2go-commits mailing list