From 7b6e78f733d44d8ce69f4868a775c81ca3ac6c33da358a2f5d8eaafaa9568250 Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Wed, 30 Nov 2011 18:41:35 +0000 Subject: [PATCH 1/2] Accepting request 94537 from home:coolo:removeautomake add automake to buildrequires OBS-URL: https://build.opensuse.org/request/show/94537 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=9 --- xlockmore.changes | 5 +++++ xlockmore.spec | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xlockmore.changes b/xlockmore.changes index c6ebfe3..4240c9c 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 30 14:06:45 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Tue Aug 30 12:49:59 UTC 2011 - pgajdos@suse.com diff --git a/xlockmore.spec b/xlockmore.spec index 432d14a..aea4a96 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ # -# spec file for package xlockmore (Version 5.32) +# spec file for package xlockmore # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: xlockmore -BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ libdrm-devel pkg-config -License: GPLv2+ ; MIT License (or similar) +BuildRequires: automake bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ libdrm-devel pkg-config +License: GPL-2.0+; MIT Group: System/X11/Utilities Provides: xlock Obsoletes: xlock -AutoReqProv: on Version: 5.34 -Release: 1 +Release: 0 Summary: Screen Saver and Locker for the X Window System Url: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 From d1481e9fd448a878f52910719485749a1086f26ea1618484f5216b81ffed6716 Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Wed, 21 Dec 2011 19:02:28 +0000 Subject: [PATCH 2/2] Accepting request 97748 from home:coolo:removeautoconf - remove call to suse_update_config (very old work around) OBS-URL: https://build.opensuse.org/request/show/97748 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=10 --- xlockmore.changes | 5 +++++ xlockmore.spec | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/xlockmore.changes b/xlockmore.changes index 4240c9c..c73089c 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 10:31:55 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config (very old work around) + ------------------------------------------------------------------- Wed Nov 30 14:06:45 UTC 2011 - coolo@suse.com diff --git a/xlockmore.spec b/xlockmore.spec index aea4a96..401302b 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -15,15 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xlockmore -BuildRequires: automake bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ libdrm-devel pkg-config -License: GPL-2.0+; MIT -Group: System/X11/Utilities +BuildRequires: automake +BuildRequires: bc +BuildRequires: esound-devel +BuildRequires: fdupes +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel +BuildRequires: ftgl-devel +BuildRequires: gcc-c++ +BuildRequires: libdrm-devel +BuildRequires: pkg-config Provides: xlock Obsoletes: xlock Version: 5.34 Release: 0 Summary: Screen Saver and Locker for the X Window System +License: GPL-2.0+ ; MIT +Group: System/X11/Utilities Url: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 Source1: xlock.pamd @@ -63,7 +73,6 @@ chmod -x README docs/Revisions %patch8 -p1 %build -%{?suse_update_config:%{suse_update_config -f}} aclocal autoconf export CPPFLAGS="-I/usr/include/FTGL"