This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 1a4e3b1164c89737ce40469529034aff5b466593 Author: X2Go Release Manager <git-admin@x2go.org> Date: Tue Feb 10 21:36:19 2015 +0100 Revert "pinentry-x2go.spec: Forceful B-R on SLE 11.2: glib2-branding-SLED." This reverts commit 0843a9392cc55509abbb125d968cf46b3a446fc5. Conflicts: pinentry-x2go.spec --- debian/changelog | 1 - pinentry-x2go.spec | 4 ---- 2 files changed, 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1b4cb0..309e79a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,6 @@ pinentry-x2go (0.7.5.8-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * pinentry-x2go.spec: + Always set BuildRoot: parameter. - + Forceful B-R on SLE 11.2: glib2-branding-SLED. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 23 Aug 2014 21:47:12 +0200 diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index 7698c3b..ef356c7 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -7,10 +7,6 @@ License: GPL-2.0 URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz -%if 0%{?suse_version} && 0%{?suse_version} <= 1120 -BuildRequires: glib2-branding-SLED -%endif - %if 0%{?el5} # For compatibility with EPEL5 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git